Comment page speed

judge/comments.py

@@ -168,7 +168,7 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View):
         )
 
     def _get_queryset(self, target_comment):
-        if target_comment != None:
+        if target_comment:
             queryset = target_comment.get_descendants(include_self=True)
             queryset = (
                 queryset.select_related("author__user")
@@ -217,11 +217,11 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View):
 
         context["has_comments"] = queryset.exists()
         context["comment_lock"] = self.is_comment_locked()
-        context["comment_list"] = queryset
+        context["comment_list"] = list(queryset)
 
         context["vote_hide_threshold"] = settings.DMOJ_COMMENT_VOTE_HIDE_THRESHOLD
         if queryset.exists():
-            context["comment_root_id"] = queryset[0].id
+            context["comment_root_id"] = context["comment_list"][0].id
         else:
             context["comment_root_id"] = 0
         context["comment_parent_none"] = 1
@@ -234,4 +234,5 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View):
 
         context["limit"] = DEFAULT_OFFSET
         context["comment_count"] = comment_count
+        context["profile"] = self.request.profile
         return context

judge/views/comment.py

@@ -15,12 +15,11 @@ from django.http import (
     HttpResponseBadRequest,
     HttpResponseForbidden,
 )
-from django.shortcuts import get_object_or_404
+from django.shortcuts import get_object_or_404, render
 from django.utils.translation import gettext as _
 from django.views.decorators.http import require_POST
 from django.views.generic import DetailView, UpdateView
 from django.urls import reverse_lazy
-from django.template import loader
 from reversion import revisions
 from reversion.models import Version
 
@@ -42,11 +41,6 @@ __all__ = [
 
 
 @login_required
-
-# def get_more_reply(request, id):
-#     queryset = Comment.get_pk(id)
-
-
 def vote_comment(request, delta):
     if abs(delta) != 1:
         return HttpResponseBadRequest(
@@ -164,10 +158,11 @@ def get_comments(request, limit=10):
 
     new_offset = offset + min(len(queryset), limit)
 
-    comment_html = loader.render_to_string(
+    return render(
+        request,
         "comments/content-list.html",
         {
-            "request": request,
+            "profile": profile,
             "comment_root_id": comment_root_id,
             "comment_list": queryset,
             "vote_hide_threshold": settings.DMOJ_COMMENT_VOTE_HIDE_THRESHOLD,
@@ -181,8 +176,6 @@ def get_comments(request, limit=10):
         },
     )
 
-    return HttpResponse(comment_html)
-
 
 def get_show_more(request):
     return get_comments(request)