WIP redo redirects

Author: rafalp

misago/categories/tests/test_redirect_to_post.py

@@ -4,7 +4,7 @@
 from django.http import HttpRequest
 from django.utils.translation import pgettext
 
-from ..posts.views import redirect_to_post
+from ..posts.redirect import redirect_to_post
 from .enums import NotificationVerb
 from .exceptions import NotificationVerbError
 

misago/notifications/registry.py

@@ -1,3 +1,3 @@
 from .redirect_to_post import redirect_to_post_hook
 
-__all__ = ["redirect_to_post_hook"]
+__all__ = ["redirect_to_post_hook"]

misago/posts/hooks/__init__.py

@@ -1,4 +1,33 @@
-from ..categories.tree
+from django.http import HttpRequest, HttpResponse
 
+from ..categories.treeid import get_category_tree_id
+from .models import Post
 
-def redirect_to_post
+
+class RedirectView:
+    def __call__(
+        self, request: HttpRequest, *, thread_id: int, slug: str, post: int
+    ) -> HttpResponse: ...
+
+
+class PostRedirect:
+    views: dict[int, RedirectView]
+
+    def __init__(self):
+        self.views = {}
+
+    def view(self, tree_id: int, view: RedirectView):
+        self.views[tree_id] = view
+
+    def __call__(self, request: HttpRequest, post: Post) -> HttpResponse:
+        tree_id = get_category_tree_id(post.category_id)
+
+        try:
+            view = self.views[tree_id]
+        except KeyError as error:
+            raise ValueError(f"Unknown 'Category' type: {tree_id}") from error
+
+        return view(request, id=post.thread_id, slug="", post=post.id)
+
+
+redirect_to_post = PostRedirect()

misago/posts/redirect.py

@@ -1,9 +1,7 @@
 from ..paginator import PostPaginator
 
 
-def test_post_paginator_counts_pages_without_orphans(
-    thread_reply_factory, thread
-):
+def test_post_paginator_counts_pages_without_orphans(thread_reply_factory, thread):
     paginator = PostPaginator(thread.post_set, 5, 0)
     assert paginator.count == 1
     assert paginator.num_pages == 1
@@ -42,9 +40,7 @@ def test_post_paginator_counts_pages_without_orphans(
     assert paginator.num_pages == 3
 
 
-def test_post_paginator_counts_pages_with_orphans(
-    thread_reply_factory, thread
-):
+def test_post_paginator_counts_pages_with_orphans(thread_reply_factory, thread):
     paginator = PostPaginator(thread.post_set, 5, 2)
     assert paginator.count == 1
     assert paginator.num_pages == 1
@@ -245,9 +241,7 @@ def test_post_paginator_without_orphans_calculates_item_page(
     assert paginator.num_pages == 3
 
 
-def test_post_paginator_with_orphans_calculates_item_page(
-    thread_reply_factory, thread
-):
+def test_post_paginator_with_orphans_calculates_item_page(thread_reply_factory, thread):
     # First item page
     paginator = PostPaginator(thread.post_set, 5, 2)
     assert paginator.get_item_page(0) == 1

misago/posts/tests/test_post_paginator.py

@@ -1,12 +1,12 @@
 from django.urls import path
 
-from .views import PostRedirectView
+from .views.redirect import PostView
 
 
 urlpatterns = [
     path(
         "post/<int:id>/",
-        PostRedirectView.as_view(),
+        PostView.as_view(),
         name="post",
     ),
-]
+]

misago/posts/urls.py

@@ -5,12 +5,10 @@
 from django.utils.translation import pgettext
 from django.views import View
 
-from ...categories.enums import CategoryTree
 from ...posts.models import Post
 from ...readtracker.readtime import get_default_read_time
-from ..hooks import get_redirect_to_post_response_hook
-from ..models import Thread
-from .generic import PrivateThreadView, ThreadView
+from ...threads.models import Thread
+from ..redirect import redirect_to_post
 
 
 class RedirectView(View):
@@ -80,49 +78,30 @@ class UnapprovedPostRedirectView(RedirectView):
     def raise_permission_denied_error(self):
         raise PermissionDenied(
             pgettext(
-                "unaproved post redirect",
+                "unapproved post redirect",
                 "You must be a moderator to view unapproved posts.",
             )
         )
 
 
-def _get_redirect_to_post_response_action(
-    request: HttpRequest, post: Post
-) -> HttpResponse:
-    if post.category.tree_id == CategoryTree.THREADS:
-        return thread_post_redirect(request, post.thread_id, "t", post=post.id)
-
-    if post.category.tree_id == CategoryTree.PRIVATE_THREADS:
-        return private_thread_post_redirect(request, post.thread_id, "t", post=post.id)
-
-    raise Http404()
-
-
-class GetPostRedirectView(RedirectView):
+class PostRedirectView(RedirectView):
     def get_post(
         self, request: HttpRequest, thread: Thread, queryset: QuerySet, kwargs: dict
     ) -> Post | None:
         return get_object_or_404(queryset, id=kwargs["post"])
 
 
-class PostRedirectView(View):
+class PostView(View):
     def get(self, request: HttpRequest, id: int) -> HttpResponse:
         return self.real_dispatch(request, id)
 
     def post(self, request: HttpRequest, id: int) -> HttpResponse:
         return self.real_dispatch(request, id)
 
     def real_dispatch(self, request: HttpRequest, id: int) -> HttpResponse:
-        queryset = Post.objects.select_related("category")
-        post = get_object_or_404(queryset, id=id)
-        return get_redirect_to_post_response(request, post)
-
-
-def get_redirect_to_post_response(request: HttpRequest, post: Post) -> HttpResponse:
-    try:
-        return get_redirect_to_post_response_hook(
-            _get_redirect_to_post_response_action, request, post
-        )
-    except PermissionDenied:
-        raise Http404()
+        try:
+            post = Post.objects.get(id=id)
+        except Post.DoesNotExist as error:
+            raise Http404("Post not found") from error
 
+        return redirect_to_post(request, post)

misago/posts/views.py

@@ -0,0 +1,32 @@
+from django.http import HttpRequest, HttpResponse
+from django.shortcuts import redirect
+from django.urls import reverse
+
+from ..permissions.privatethreads import filter_private_thread_posts_queryset
+from ..posts.models import Post
+from ..posts.paginator import PostPaginator
+from ..threads.models import Thread
+
+
+def redirect_to_private_thread_post(
+    request: HttpRequest, thread: Thread, post: Post
+) -> HttpResponse:
+    queryset = filter_private_thread_posts_queryset(
+        request.user_permissions, thread, thread.post_set.order_by("id")
+    )
+    paginator = PostPaginator(
+        queryset,
+        request.settings.posts_per_page,
+        request.settings.posts_per_page_orphans,
+    )
+
+    offset = queryset.filter(id__lt=post.id).count()
+    page = paginator.get_item_page(offset)
+
+    url_kwargs = {"id": thread.id, "slug": thread.slug}
+    if page > 1:
+        url_kwargs["page"] = page
+
+    url = reverse("misago:private-thread", kwargs=url_kwargs) + f"#post-{post.id}"
+
+    return redirect(url)

misago/posts/views/redirect.py

@@ -9,7 +9,9 @@
 
 @pytest.fixture
 def mock_notify_on_new_private_thread(mocker):
-    return mocker.patch("misago.privatethreads.views.members.notify_on_new_private_thread")
+    return mocker.patch(
+        "misago.privatethreads.views.members.notify_on_new_private_thread"
+    )
 
 
 def test_private_thread_members_add_view_renders_form(user_client, user_private_thread):