Merge pull request #594 from mouse-reeve/broadcast-fixes

Refactors broadcasting

bookwyrm/views/list.py

@@ -11,7 +11,6 @@ from django.views.decorators.http import require_POST
 
 from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
-from bookwyrm.broadcast import broadcast
 from bookwyrm.connectors import connector_manager
 from .helpers import is_api_request, object_visible_to_user, privacy_filter
 from .helpers import get_user_from_username
@@ -55,13 +54,6 @@ class Lists(View):
             return redirect('lists')
         book_list = form.save()
 
-        # let the world know
-        broadcast(
-            request.user,
-            book_list.to_create_activity(request.user),
-            privacy=book_list.privacy,
-            software='bookwyrm'
-        )
         return redirect(book_list.local_path)
 
 class UserLists(View):
@@ -136,19 +128,12 @@ class List(View):
     @method_decorator(login_required, name='dispatch')
     # pylint: disable=unused-argument
     def post(self, request, list_id):
-        ''' edit a book_list '''
+        ''' edit a list '''
         book_list = get_object_or_404(models.List, id=list_id)
         form = forms.ListForm(request.POST, instance=book_list)
         if not form.is_valid():
             return redirect('list', book_list.id)
         book_list = form.save()
-        # let the world know
-        broadcast(
-            request.user,
-            book_list.to_update_activity(request.user),
-            privacy=book_list.privacy,
-            software='bookwyrm'
-        )
         return redirect(book_list.local_path)
 
 
@@ -182,13 +167,6 @@ class Curate(View):
         if approved:
             suggestion.approved = True
             suggestion.save()
-            # let the world know
-            broadcast(
-                request.user,
-                suggestion.to_add_activity(request.user),
-                privacy=book_list.privacy,
-                software='bookwyrm'
-            )
         else:
             suggestion.delete()
         return redirect('list-curate', book_list.id)
@@ -205,17 +183,10 @@ def add_book(request, list_id):
     # do you have permission to add to the list?
     if request.user == book_list.user or book_list.curation == 'open':
         # go ahead and add it
-        item = models.ListItem.objects.create(
+        models.ListItem.objects.create(
             book=book,
             book_list=book_list,
-            added_by=request.user,
-        )
-        # let the world know
-        broadcast(
-            request.user,
-            item.to_add_activity(request.user),
-            privacy=book_list.privacy,
-            software='bookwyrm'
+            user=request.user,
         )
     elif book_list.curation == 'curated':
         # make a pending entry
@@ -223,7 +194,7 @@ def add_book(request, list_id):
             approved=False,
             book=book,
             book_list=book_list,
-            added_by=request.user,
+            user=request.user,
         )
     else:
         # you can't add to this list, what were you THINKING
@@ -238,16 +209,8 @@ def remove_book(request, list_id):
     book_list = get_object_or_404(models.List, id=list_id)
     item = get_object_or_404(models.ListItem, id=request.POST.get('item'))
 
-    if not book_list.user == request.user and not item.added_by == request.user:
+    if not book_list.user == request.user and not item.user == request.user:
         return HttpResponseNotFound()
 
-    activity = item.to_remove_activity(request.user)
     item.delete()
-    # let the world know
-    broadcast(
-        request.user,
-        activity,
-        privacy=book_list.privacy,
-        software='bookwyrm'
-    )
     return redirect('list', list_id)