Exclude posts published over a week before we received them in federa…

…ted and hashtag timelines
avaraline · May 4, 2024 · c3f532c · c3f532c
1 parent f63a121
commit c3f532c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/activities/services/post.py b/activities/services/post.py
@@ -1,6 +1,8 @@
 import logging
+from datetime import timedelta
 
 from django.db.models import OuterRef
+from django.db.models.expressions import F
 
 from activities.models import (
     Post,
@@ -20,7 +22,7 @@ class PostService:
     """
 
     @classmethod
-    def queryset(cls, include_reply_to_author=False):
+    def queryset(cls, include_reply_to_author=False, exclude_threshold=None):
         """
         Returns the base queryset to use for fetching posts efficiently.
         """
@@ -36,6 +38,10 @@ def queryset(cls, include_reply_to_author=False):
                 "author__domain",
             )
         )
+        if exclude_threshold is not None:
+            qs = qs.filter(
+                published__gte=F("created") - timedelta(days=exclude_threshold)
+            )
         if include_reply_to_author:
             qs = qs.annotate(
                 in_reply_to_author_id=Post.objects.filter(

diff --git a/activities/services/timeline.py b/activities/services/timeline.py
@@ -62,19 +62,19 @@ def local(self, domain: Domain | None = None) -> models.QuerySet[Post]:
 
     def federated(self) -> models.QuerySet[Post]:
         return (
-            PostService.queryset()
+            PostService.queryset(exclude_threshold=7)
             .public()
             .filter(author__restriction=Identity.Restriction.none)
             .order_by("-id")
         )
 
     def hashtag(self, hashtag: str | Hashtag) -> models.QuerySet[Post]:
         return (
-            PostService.queryset()
+            PostService.queryset(exclude_threshold=7)
             .public()
             .filter(author__restriction=Identity.Restriction.none)
             .tagged_with(hashtag)
-            .order_by("-published")
+            .order_by("-id")
         )
 
     def notifications(self, types: list[str]) -> models.QuerySet[TimelineEvent]: