Revert "fix: legacy forum issues (openedx#36470)"

This reverts commit f05a718.

Author: Asespinel

lms/djangoapps/discussion/django_comment_client/base/views.py

@@ -584,7 +584,7 @@ def create_thread(request, course_id, commentable_id):
 
     if follow:
         cc_user = cc.User.from_django_user(user)
-        cc_user.follow(thread, course_id)
+        cc_user.follow(thread)
         thread_followed.send(sender=None, user=user, post=thread)
 
     data = thread.to_dict()

lms/djangoapps/discussion/views.py

@@ -4,7 +4,6 @@
 
 import logging
 from functools import wraps
-from urllib.parse import urljoin
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
@@ -147,7 +146,7 @@ def get_threads(request, course, user_info, discussion_id=None, per_page=THREADS
         # If the user clicked a sort key, update their default sort key
         cc_user = cc.User.from_django_user(request.user)
         cc_user.default_sort_key = request.GET.get('sort_key')
-        cc_user.save(params={"course_id": str(course.id)})
+        cc_user.save()
 
     #there are 2 dimensions to consider when executing a search with respect to group id
     #is user a moderator
@@ -219,7 +218,7 @@ def inline_discussion(request, course_key, discussion_id):
     with function_trace('get_course_and_user_info'):
         course = get_course_with_access(request.user, 'load', course_key, check_if_enrolled=True)
         cc_user = cc.User.from_django_user(request.user)
-        user_info = cc_user.to_dict(course_key=str(course_key))
+        user_info = cc_user.to_dict()
 
     try:
         with function_trace('get_threads'):
@@ -357,7 +356,7 @@ def single_thread(request, course_key, discussion_id, thread_id):
 
     if request.headers.get('x-requested-with') == 'XMLHttpRequest':
         cc_user = cc.User.from_django_user(request.user)
-        user_info = cc_user.to_dict(course_key=str(course_key))
+        user_info = cc_user.to_dict()
         is_staff = has_permission(request.user, 'openclose_thread', course.id)
 
         try:
@@ -472,7 +471,7 @@ def _create_base_discussion_view_context(request, course_key):
     """
     user = request.user
     cc_user = cc.User.from_django_user(user)
-    user_info = cc_user.to_dict(course_key=str(course_key))
+    user_info = cc_user.to_dict()
     course = get_course_with_access(user, 'load', course_key, check_if_enrolled=True)
     course_settings = make_course_settings(course, user)
     return {
@@ -630,7 +629,7 @@ def create_user_profile_context(request, course_key, user_id):
             'page': query_params['page'],
             'num_pages': query_params['num_pages'],
             'sort_preference': user.default_sort_key,
-            'learner_profile_page_url': urljoin(settings.PROFILE_MICROFRONTEND_URL, f'/u/{django_user.username}'),
+            'learner_profile_page_url': reverse('learner_profile', kwargs={'username': django_user.username}),
         })
         return context
 

openedx/core/djangoapps/django_comment_common/comment_client/models.py

@@ -61,8 +61,8 @@ def items(self, *args, **kwargs):
     def get(self, *args, **kwargs):
         return self.attributes.get(*args, **kwargs)
 
-    def to_dict(self, course_key=None):
-        self.retrieve(course_key=course_key)
+    def to_dict(self):
+        self.retrieve()
         return self.attributes
 
     def retrieve(self, *args, **kwargs):
@@ -72,7 +72,7 @@ def retrieve(self, *args, **kwargs):
         return self
 
     def _retrieve(self, *args, **kwargs):
-        course_id = self.attributes.get("course_id") or kwargs.get("course_key")
+        course_id = self.attributes.get("course_id") or kwargs.get("course_id")
         if course_id:
             course_key = get_course_key(course_id)
             use_forumv2 = is_forum_v2_enabled(course_key)