Apply review suggestions

bookwyrm/views/feed.py

@@ -7,10 +7,10 @@ from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
 from django.utils import timezone
 from django.utils.decorators import method_decorator
-from django.utils.translation import gettext_lazy as _
 from django.views import View
 
 from bookwyrm import activitystreams, forms, models
+from bookwyrm.models.user import FeedFilterChoices
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH, STREAMS
 from bookwyrm.suggested_users import suggested_users
@@ -58,12 +58,7 @@ class Feed(View):
                 "tab": tab,
                 "streams": STREAMS,
                 "goal_form": forms.GoalForm(),
-                "feed_status_types_options": [
-                    ("review", _("Reviews")),
-                    ("comment", _("Comments")),
-                    ("quotation", _("Quotations")),
-                    ("everything", _("Everything else")),
-                ],
+                "feed_status_types_options": FeedFilterChoices,
                 "settings_saved": settings_saved,
                 "path": f"/{tab['key']}",
             },
@@ -260,12 +255,21 @@ def filter_stream_by_status_type(activities, allowed_types=None):
         allowed_types = []
 
     if "review" not in allowed_types:
-        activities = activities.filter(Q(review__isnull=True))
+        activities = activities.filter(
+            Q(review__isnull=True) | Q(boost__boosted_status__review__isnull=True)
+        )
     if "comment" not in allowed_types:
-        activities = activities.filter(Q(comment__isnull=True))
+        activities = activities.filter(
+            Q(comment__isnull=True) | Q(boost__boosted_status__comment__isnull=True)
+        )
     if "quotation" not in allowed_types:
-        activities = activities.filter(Q(quotation__isnull=True))
+        activities = activities.filter(
+            Q(quotation__isnull=True) | Q(boost__boosted_status__quotation__isnull=True)
+        )
     if "everything" not in allowed_types:
-        activities = activities.filter(Q(generatednote__isnull=True))
+        activities = activities.filter(
+            Q(generatednote__isnull=True)
+            | Q(boost__boosted_status__generatednote__isnull=True)
+        )
 
     return activities