'); + favThreadNode.append(id); + favThreadNode.append(' '); + favThreadNode.append(title); + + if (newPostCount > 0) { + favThreadNode.append(' (+' + newPostCount + ")"); + } + + favoriteThreadPanel.append(favThreadNode); + } + }); + + var newPostCountNode = $('#new-fav-post-count'); + if (allNewPostCount > 0) { + newPostCountNode.text('(+' + allNewPostCount + ')'); + newPostCountNode.show(); + } else { + newPostCountNode.hide(); + } + } + ); +} + +function initFavPanel() { + updateFavPosts(); + setInterval(updateFavPosts, FAV_POST_UPDATE_PERIOD); + $('#fav-panel-btn').click(function() { + $('#fav-panel').toggle(); + updateFavPosts(); + + return false; + }); + + $(document).on('keyup.removepic', function(e) { + if(e.which === 27) { + $('#fav-panel').hide(); + } + }); +} + $( document ).ready(function() { hideEmailFromForm(); @@ -53,4 +121,6 @@ function highlightCode(node) { addRefLinkPreview(); highlightCode($(document)); + + initFavPanel(); }); diff --git a/boards/static/js/thread_update.js b/boards/static/js/thread_update.js --- a/boards/static/js/thread_update.js +++ b/boards/static/js/thread_update.js @@ -113,7 +113,7 @@ function getThreadDiff() { var data = { uids: uids, thread: threadId - } + }; var diffUrl = '/api/diff_thread/'; diff --git a/boards/templates/boards/base.html b/boards/templates/boards/base.html --- a/boards/templates/boards/base.html +++ b/boards/templates/boards/base.html @@ -39,7 +39,10 @@ {% trans "tags" %}, {% trans 'search' %}, {% trans 'feed' %}, - {% trans 'random' %} + {% trans 'random' %}{% if has_fav_threads %}, + + {% trans 'favorites' %} + {% endif %} {% if username %} @@ -53,17 +56,7 @@ {% trans 'Settings' %} - {% if fav_threads %} -

- ★ - {% for thread in fav_threads %} - {% comment %} - If there are new posts in the thread, show their count. - {% endcomment %} - {{ thread.post.get_link_view|safe }}{% if thread.count %} (+{{ thread.count }}){% endif %}{% if not forloop.last %}, {% endif %} - {% endfor %} -

- {% endif %} +

{% trans "Loading..." %}

{% block content %}{% endblock %} diff --git a/boards/urls.py b/boards/urls.py --- a/boards/urls.py +++ b/boards/urls.py @@ -69,6 +69,7 @@ urlpatterns = patterns('', url(r'^api/notifications/(?P\w+)/$', api.api_get_notifications, name='api_notifications'), url(r'^api/preview/$', api.api_get_preview, name='preview'), + url(r'^api/new_posts/$', api.api_get_new_posts, name='new_posts'), # Search url(r'^search/$', BoardSearchView.as_view(), name='search'), diff --git a/boards/views/api.py b/boards/views/api.py --- a/boards/views/api.py +++ b/boards/views/api.py @@ -1,3 +1,4 @@ +from collections import OrderedDict import json import logging @@ -58,8 +59,8 @@ def api_get_threaddiff(request): diff_type = request.GET.get(PARAMETER_DIFF_TYPE, DIFF_TYPE_HTML) for post in posts: - json_data[PARAMETER_UPDATED].append(get_post_data(post.id, diff_type, - request)) + json_data[PARAMETER_UPDATED].append(post.get_post_data( + format_type=diff_type, request=request)) json_data[PARAMETER_LAST_UPDATE] = str(thread.last_edit_time) # If the tag is favorite, update the counter @@ -151,7 +152,7 @@ def api_get_threads(request, count): opening_post = thread.get_opening_post() # TODO Add tags, replies and images count - post_data = get_post_data(opening_post.id, include_last_update=True) + post_data = opening_post.get_post_data(include_last_update=True) post_data['bumpable'] = thread.can_bump() post_data['archived'] = thread.archived @@ -197,7 +198,7 @@ def api_get_thread_posts(request, openin json_post_list = [] for post in posts: - json_post_list.append(get_post_data(post.id)) + json_post_list.append(post.get_post_data()) json_data['last_update'] = datetime_to_epoch(thread.last_edit_time) json_data['posts'] = json_post_list @@ -213,7 +214,7 @@ def api_get_notifications(request, usern json_post_list = [] for post in posts: - json_post_list.append(get_post_data(post.id)) + json_post_list.append(post.get_post_data()) return HttpResponse(content=json.dumps(json_post_list)) @@ -233,16 +234,41 @@ def api_get_post(request, post_id): return HttpResponse(content=json) -# TODO Remove this method and use post method directly -def get_post_data(post_id, format_type=DIFF_TYPE_JSON, request=None, - include_last_update=False): - post = get_object_or_404(Post, id=post_id) - return post.get_post_data(format_type=format_type, request=request, - include_last_update=include_last_update) - - def api_get_preview(request): raw_text = request.POST['raw_text'] parser = Parser() return HttpResponse(content=parser.parse(parser.preparse(raw_text))) + + +def api_get_new_posts(request): + """ + Gets favorite threads and unread posts count. + """ + posts = list() + + include_posts = 'include_posts' in request.GET + + settings_manager = get_settings_manager(request) + fav_threads = settings_manager.get_fav_threads() + fav_thread_ops = Post.objects.filter(id__in=fav_threads.keys())\ + .order_by('-pub_time').prefetch_related('thread') + + for op in fav_thread_ops: + last_read_post = fav_threads[str(op.id)] + new_posts = op.get_thread().get_replies_newer(last_read_post) + new_post_count = new_posts.count() + fav_thread_dict = dict() + fav_thread_dict['id'] = op.id + fav_thread_dict['new_post_count'] = new_post_count + + if include_posts: + fav_thread_dict['post'] = op.get_post_data( + format_type=DIFF_TYPE_HTML) + if new_post_count > 0: + fav_thread_dict['newest_post_link'] = new_posts.first()\ + .get_absolute_url() + + posts.append(fav_thread_dict) + + return HttpResponse(content=json.dumps(posts))