yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #725 from mouse-reeve/incoming-unshelve

Browse Source 
Fixes handling incoming unshelve activities
This commit is contained in:
Mouse Reeve
2021-03-13 08:53:37 -08:00
committed by GitHub
parent 40ab84bc15 e1a8c4d260
commit a1d95d5010
3 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bookwyrm/models/activitypub_mixin.py
View File

@ -362,14 +362,15 @@ class CollectionItemMixin(ActivitypubMixin):
""" broadcast a remove activity """
activity = self.to_remove_activity()
super().delete(*args, **kwargs)
self.broadcast(activity, self.user)
if self.user.local:
self.broadcast(activity, self.user)
def to_add_activity(self):
""" AP for shelving a book"""
object_field = getattr(self, self.object_field)
collection_field = getattr(self, self.collection_field)
return activitypub.Add(
id="%s#add" % self.remote_id,
id=self.remote_id,
actor=self.user.remote_id,
object=object_field,
target=collection_field.remote_id,
@ -380,7 +381,7 @@ class CollectionItemMixin(ActivitypubMixin):
object_field = getattr(self, self.object_field)
collection_field = getattr(self, self.collection_field)
return activitypub.Remove(
id="%s#remove" % self.remote_id,
id=self.remote_id,
actor=self.user.remote_id,
object=object_field,
target=collection_field.remote_id,