Add a followed threads entry to the topic dropdown in the discussion sidebar.

Also fixed up some random bugs with content_info, and changed pagination code a little. Needs comments service update for the subscribed threads API call.

lms/djangoapps/django_comment_client/forum/urls.py

@@ -2,6 +2,7 @@ from django.conf.urls.defaults import url, patterns
 import django_comment_client.forum.views
 
 urlpatterns = patterns('django_comment_client.forum.views',
+    url(r'users/(?P<user_id>\w+)/following$', 'following_threads', name='following_threads'),
     url(r'users/(?P<user_id>\w+)$', 'user_profile', name='user_profile'),
     url(r'(?P<discussion_id>[\w\-]+)/threads/(?P<thread_id>\w+)$', 'single_thread', name='single_thread'),
     url(r'(?P<discussion_id>[\w\-]+)/inline$', 'inline_discussion', name='inline_discussion'),

lms/djangoapps/django_comment_client/forum/views.py

@@ -83,10 +83,7 @@ def inline_discussion(request, course_id, discussion_id):
         # checking for errors on request.  Check and fix as needed.
         raise Http404
 
-    def infogetter(thread):
-        return utils.get_annotated_content_infos(course_id, thread, request.user, user_info)
-
-    annotated_content_info = reduce(merge_dict, map(infogetter, threads), {})
+    annotated_content_info = utils.get_metadata_for_threads(course_id, threads, request.user, user_info)
 
     allow_anonymous = course.metadata.get("allow_anonymous", True)
     allow_anonymous_to_peers = course.metadata.get("allow_anonymous_to_peers", False)
@@ -118,10 +115,8 @@ def forum_form_discussion(request, course_id):
 
     user_info = cc.User.from_django_user(request.user).to_dict()
 
-    def infogetter(thread):
-        return utils.get_annotated_content_infos(course_id, thread, request.user, user_info)
+    annotated_content_info = utils.get_metadata_for_threads(course_id, threads, request.user, user_info)
 
-    annotated_content_info = reduce(merge_dict, map(infogetter, threads), {})
     for thread in threads:
         courseware_context = get_courseware_context(thread, course)
         if courseware_context:
@@ -218,10 +213,7 @@ def single_thread(request, course_id, discussion_id, thread_id):
 
         user_info = cc.User.from_django_user(request.user).to_dict()
 
-        def infogetter(thread):
-            return utils.get_annotated_content_infos(course_id, thread, request.user, user_info)
-
-        annotated_content_info = reduce(merge_dict, map(infogetter, threads), {})
+        annotated_content_info = utils.get_metadata_for_threads(course_id, threads, request.user, user_info)
 
         context = {
             'discussion_id': discussion_id,
@@ -244,7 +236,7 @@ def single_thread(request, course_id, discussion_id, thread_id):
 
 @login_required
 def user_profile(request, course_id, user_id):
-
+    #TODO: Allow sorting?
     course = get_course_with_access(request.user, course_id, 'load')
     try:
         profiled_user = cc.User(id=user_id, course_id=course_id)
@@ -260,16 +252,13 @@ def user_profile(request, course_id, user_id):
 
         if request.is_ajax():
             return utils.JsonResponse({
-                'html': content,
                 'discussion_data': map(utils.safe_content, threads),
             })
         else:
             user_info = cc.User.from_django_user(request.user).to_dict()
 
-            def infogetter(thread):
-                return utils.get_annotated_content_infos(course_id, thread, request.user, user_info)
+            annotated_content_info = utils.get_metadata_for_threads(course_id, threads, request.user, user_info)
 
-            annotated_content_info = reduce(merge_dict, map(infogetter, threads), {})
             context = {
                 'course': course,
                 'user': request.user,
@@ -284,3 +273,44 @@ def user_profile(request, course_id, user_id):
             return render_to_response('discussion/user_profile.html', context)
     except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError) as err:
         raise Http404
+
+
+def following_threads(request, course_id, user_id):
+    course = get_course_with_access(request.user, course_id, 'load')
+    try:
+        profiled_user = cc.User(id=user_id, course_id=course_id)
+
+        query_params = {
+            'page': request.GET.get('page', 1),
+            'per_page': THREADS_PER_PAGE, # more than threads_per_page to show more activities
+            'sort_key': 'date',#TODO: Allow custom sorting?
+            'sort_order': 'desc',
+        }
+        print user_id
+        threads, page, num_pages = profiled_user.subscribed_threads(query_params)
+        query_params['page'] = page
+        query_params['num_pages'] = num_pages
+        user_info = cc.User.from_django_user(request.user).to_dict()
+
+        annotated_content_info = utils.get_metadata_for_threads(course_id, threads, request.user, user_info)
+        if request.is_ajax():
+            return utils.JsonResponse({
+                'annotated_content_info': annotated_content_info,
+                'discussion_data': map(utils.safe_content, threads),
+                })
+        else:
+
+            context = {
+                'course': course,
+                'user': request.user,
+                'django_user': User.objects.get(id=user_id),
+                'profiled_user': profiled_user.to_dict(),
+                'threads': saxutils.escape(json.dumps(threads), escapedict),
+                'user_info': saxutils.escape(json.dumps(user_info),escapedict),
+                'annotated_content_info': saxutils.escape(json.dumps(annotated_content_info),escapedict),
+                #                'content': content,
+            }
+
+            return render_to_response('discussion/user_profile.html', context)
+    except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError) as err:
+        raise Http404

lms/djangoapps/django_comment_client/utils.py

@@ -259,7 +259,11 @@ def get_ability(course_id, content, user):
             'can_vote': check_permissions_by_view(user, course_id, content, "vote_for_thread" if content['type'] == 'thread' else "vote_for_comment"),
     }
 
+#TODO: RENAME
 def get_annotated_content_info(course_id, content, user, user_info):
+    """
+    Get metadata for an individual content (thread or comment)
+    """
     voted = ''
     if content['id'] in user_info['upvoted_ids']:
         voted = 'up'
@@ -271,7 +275,11 @@ def get_annotated_content_info(course_id, content, user, user_info):
         'ability': get_ability(course_id, content, user),
     }
 
+#TODO: RENAME
 def get_annotated_content_infos(course_id, thread, user, user_info):
+    """
+    Get metadata for a thread and its children
+    """
     infos = {}
     def annotate(content):
         infos[str(content['id'])] = get_annotated_content_info(course_id, content, user, user_info)
@@ -280,6 +288,13 @@ def get_annotated_content_infos(course_id, thread, user, user_info):
     annotate(thread)
     return infos
 
+def get_metadata_for_threads(course_id, threads, user, user_info):
+    def infogetter(thread):
+        return get_annotated_content_infos(course_id, thread, user, user_info)
+
+    metadata = reduce(merge_dict, map(infogetter, threads), {})
+    return metadata
+
 # put this method in utils.py to avoid circular import dependency between helpers and mustache_helpers
 def url_for_tags(course_id, tags):
     return reverse('django_comment_client.forum.views.forum_form_discussion', args=[course_id]) + '?' + urllib.urlencode({'tags': tags})
@@ -304,7 +319,7 @@ def extend_content(content):
             roles = dict(('name', role.name.lower()) for role in user.roles.filter(course_id=content['course_id']))
         except user.DoesNotExist:
             logging.error('User ID {0} in comment content {1} but not in our DB.'.format(content.get('user_id'), content.get('id')))
-        
+
     content_info = {
         'displayed_title': content.get('highlighted_title') or content.get('title', ''),
         'displayed_body': content.get('highlighted_body') or content.get('body', ''),
@@ -323,9 +338,9 @@ def get_courseware_context(content, course):
         location = id_map[id]["location"].url()
         title = id_map[id]["title"]
         (course_id, chapter, section, position) = path_to_location(modulestore(), course.id, location)
-        url = reverse('courseware_position', kwargs={"course_id":course_id, 
-                                                     "chapter":chapter, 
-                                                     "section":section, 
+        url = reverse('courseware_position', kwargs={"course_id":course_id,
+                                                     "chapter":chapter,
+                                                     "section":section,
                                                      "position":position})
         content_info = {"courseware_url": url, "courseware_title": title}
     return content_info