Merge branch 'main' into follow-remote-ids

bookwyrm/views.py

@@ -130,7 +130,7 @@ def get_activity_feed(user, filter_level, model=models.Status):
         activities = model.objects
 
     activities = activities.filter(
-        deleted=False
+        deleted=False,
     ).order_by(
         '-published_date'
     )
@@ -159,6 +159,11 @@ def get_activity_feed(user, filter_level, model=models.Status):
             Q(user__in=following, privacy='followers') | Q(privacy='public')
         )
 
+    try:
+        activities = activities.filter(~Q(boosters__in=activities))
+    except ValueError:
+        pass
+
     return activities
 
 
@@ -234,7 +239,6 @@ def login_page(request):
     # send user to the login page
     data = {
         'title': 'Login',
-        'site_settings': models.SiteSettings.get(),
         'login_form': forms.LoginForm(),
         'register_form': forms.RegisterForm(),
     }
@@ -246,7 +250,6 @@ def about_page(request):
     ''' more information about the instance '''
     data = {
         'title': 'About',
-        'site_settings': models.SiteSettings.get(),
     }
     return TemplateResponse(request, 'about.html', data)
 
@@ -294,7 +297,6 @@ def invite_page(request, code):
 
     data = {
         'title': 'Join',
-        'site_settings': models.SiteSettings.get(),
         'register_form': forms.RegisterForm(),
         'invite': invite,
     }