Revert "Change comment style (#67)" (#68)

This reverts commit 411f3da45e.

dmoj/settings.py

@@ -219,7 +219,6 @@ else:
     }
 
 INSTALLED_APPS += (
-    "debug_toolbar",
     "django.contrib.admin",
     "judge",
     "django.contrib.auth",
@@ -249,7 +248,6 @@ INSTALLED_APPS += (
 )
 
 MIDDLEWARE = (
-    "debug_toolbar.middleware.DebugToolbarMiddleware",
     "judge.middleware.SlowRequestMiddleware",
     "judge.middleware.ShortCircuitMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
@@ -423,12 +421,7 @@ STATICFILES_DIRS = [
 STATIC_URL = "/static/"
 
 # Define a cache
-CACHES = {
+CACHES = {}
-    "default": {
-        "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
-        "LOCATION": "127.0.0.1:11211",
-    }
-}
 
 # Authentication
 AUTHENTICATION_BACKENDS = (
@@ -488,9 +481,3 @@ except IOError:
     pass
 
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
-
-INTERNAL_IPS = [
-    # ...
-    "127.0.0.1",
-    # ...
-]

dmoj/urls.py

@@ -1,6 +1,5 @@
 import chat_box.views as chat
 
-from django.urls import include, path
 from django.conf import settings
 from django.conf.urls import include, url
 from django.contrib import admin
@@ -207,7 +206,6 @@ def paged_list_view(view, name, **kwargs):
 
 
 urlpatterns = [
-    path('__debug__/', include('debug_toolbar.urls')),
     url("", include("pagedown.urls")),
     url(
         r"^$",
@@ -470,8 +468,6 @@ urlpatterns = [
     url(r"^comments/upvote/$", comment.upvote_comment, name="comment_upvote"),
     url(r"^comments/downvote/$", comment.downvote_comment, name="comment_downvote"),
     url(r"^comments/hide/$", comment.comment_hide, name="comment_hide"),
-    url(r"^comments/get_replies/$", comment.get_replies, name="comment_get_replies"),
-    url(r"^comments/show_more/$", comment.get_show_more, name="comment_show_more"),
     url(
         r"^comments/(?P<id>\d+)/",
         include(

judge/comments.py

@@ -11,7 +11,6 @@ from django.http import (
     HttpResponseForbidden,
     HttpResponseNotFound,
     HttpResponseRedirect,
-    Http404,
 )
 from django.urls import reverse_lazy
 from django.utils.decorators import method_decorator
@@ -152,92 +151,40 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View):
         return self.render_to_response(context)
 
     def get(self, request, *args, **kwargs):
-        pre_query = None
-        if "comment-id" in  request.GET:
-            comment_id = int(request.GET["comment-id"])
-            try:
-                comment_obj = Comment.objects.get(pk=comment_id)
-            except Comment.DoesNotExist:
-                raise Http404
-            pre_query = comment_obj
-            while comment_obj is not None:
-                pre_query = comment_obj
-                comment_obj = comment_obj.parent                        
         self.object = self.get_object()
         return self.render_to_response(
             self.get_context_data(
                 object=self.object,
-                pre_query=pre_query,
                 comment_form=CommentForm(request, initial={"parent": None}),
             )
         )
 
-    def get_context_data(self, pre_query=None, **kwargs):
+    def get_context_data(self, **kwargs):
         context = super(CommentedDetailView, self).get_context_data(**kwargs)
         queryset = self.object.comments
-        queryset = queryset.filter(parent=None, hidden=False)
+        context["has_comments"] = queryset.exists()
-        queryset_all = None
+        context["comment_lock"] = self.is_comment_locked()
-        comment_count = len(queryset)
+        queryset = (
-        context["comment_remove"] = -1
+            queryset.select_related("author__user")
-        if (pre_query != None):
+            .filter(hidden=False)
-            comment_remove = pre_query.id
+            .defer("author__about")
-            queryset_all = pre_query.get_descendants(include_self=True)
+            .annotate(revisions=Count("versions"))
-            queryset_all = (
+        )
-                queryset_all.select_related("author__user")
+
-                .filter(hidden=False)
-                .defer("author__about")
-                .annotate(revisions=Count("versions", distinct=True))
-            )
-            context["comment_remove"] = comment_remove
-        else:
-            queryset = (
-                queryset.select_related("author__user")
-                .defer("author__about")
-                .filter(hidden=False)
-                .annotate(
-                    count_replies=Count("replies", distinct=True), 
-                    revisions=Count("versions", distinct=True),
-                )[:10]
-            )
-            
         if self.request.user.is_authenticated:
             profile = self.request.profile
-            if (pre_query != None):
+            queryset = queryset.annotate(
-                queryset_all = queryset_all.annotate(
+                my_vote=FilteredRelation(
-                    my_vote=FilteredRelation(
+                    "votes", condition=Q(votes__voter_id=profile.id)
-                        "votes", condition=Q(votes__voter_id=profile.id)
+                ),
-                    ),
+            ).annotate(vote_score=Coalesce(F("my_vote__score"), Value(0)))
-                ).annotate(vote_score=Coalesce(F("my_vote__score"), Value(0)))
-            else:
-                queryset = queryset.annotate(
-                    my_vote=FilteredRelation(
-                        "votes", condition=Q(votes__voter_id=profile.id)
-                    ),
-                ).annotate(vote_score=Coalesce(F("my_vote__score"), Value(0)))
-            
             context["is_new_user"] = (
                 not self.request.user.is_staff
                 and not profile.submission_set.filter(
                     points=F("problem__points")
                 ).exists()
             )
-        
-        context["has_comments"] = queryset.exists()
-        context["comment_lock"] = self.is_comment_locked()
         context["comment_list"] = queryset
-        context["comment_all_list"] = queryset_all
+        context["comment_count"] = len(queryset)
-
         context["vote_hide_threshold"] = settings.DMOJ_COMMENT_VOTE_HIDE_THRESHOLD
-        if queryset.exists():
-            context["comment_root_id"] = queryset[0].id
-        else: 
-            context["comment_root_id"] = 0
-        context["comment_parrent_none"] = 1
-        if (pre_query != None):
-            context["offset"] = 1
-        else:
-            context["offset"] = 10
-        
-        context["limit"] = 10
-        context["comment_count"] = comment_count
         return context