From 768d36b08fcb035822f67d7ede8d2cd3e6b211ce Mon Sep 17 00:00:00 2001
From: Bobby <bobbyskhs@gmail.com>
Date: Mon, 10 Oct 2022 12:33:41 -0400
Subject: Revert "Revert "Scroll to comment on any comment action""

This reverts commit 04590ac145dd63a09b02d774ef1b53d8f8a24f7c.
---
 blog/views.py            | 12 ++++++------
 templates/blog/post.html |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/blog/views.py b/blog/views.py
index ff1566de..9fa95801 100644
--- a/blog/views.py
+++ b/blog/views.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from django.shortcuts import render, redirect
+from django.shortcuts import render, redirect, reverse
 from django.http import HttpResponse
 from users.models import UserProfile, CaptchaStore
 from urllib.parse import urlparse
@@ -117,12 +117,12 @@ def comment(request, slug):
             try:
                 post = Post.objects.get(slug=slug)
                 if post.is_public:
-                    Comment.objects.create(user=request.user, post=post, body=request.POST.get('comment'))
-                    return redirect('blog:post', slug=slug)
+                    comment = Comment.objects.create(user=request.user, post=post, body=request.POST.get('comment'))
+                    return redirect(reverse('blog:post', kwargs={'slug': slug}) + '#comment-' + str(comment.id))
                 else:
                     if request.user.is_authenticated and request.user.is_superuser or request.user.is_staff:
                         Comment.objects.create(user=request.user, post=post, body=request.POST.get('comment'))
-                        return redirect('blog:post', slug=slug)
+                        return redirect(reverse('blog:post', kwargs={'slug': slug}) + '#comment-' + str(comment.id))
                     else:
                         return HttpResponse('Post not found!', status=404)
             except Post.DoesNotExist:
@@ -143,7 +143,7 @@ def edit_comment(request, slug):
                     comment.edited = True
                     comment.edited_at = datetime.now()
                     comment.save()
-                    return redirect('blog:post', slug=slug)
+                    return redirect(reverse('blog:post', kwargs={'slug': slug}) + '#comment-' + str(comment.id))
                 else:
                     return HttpResponse('Unauthorized!', status=401)
             except Comment.DoesNotExist:
@@ -159,7 +159,7 @@ def delete_comment(request, slug, comment_id):
             comment = Comment.objects.get(id=comment_id)
             if comment.user == request.user:
                 comment.delete()
-                return redirect('blog:post', slug=slug)
+                return redirect(reverse('blog:post', kwargs={'slug': slug}) + '#comments')
             else:
                 return HttpResponse('Unauthorized!', status=401)
         except Comment.DoesNotExist:
diff --git a/templates/blog/post.html b/templates/blog/post.html
index f7984107..f10445a2 100644
--- a/templates/blog/post.html
+++ b/templates/blog/post.html
@@ -21,7 +21,7 @@
     <div id="comments" style="margin-top: 3rem;">
         <h3>Comments</h3>
         {% for comment in comments %}
-            <div class="comment">
+            <div class="comment" id="comment-{{ comment.id }}">
                 <div class="profile-picture">
                     <img src="https://www.gravatar.com/avatar/{{ comment.avatar }}?s=100" alt="Profile Picture">
                 </div>
-- 
cgit v1.2.3