mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-26 19:41:11 +00:00
Code Issues Projects Releases Wiki Activity

tweaks follow handling

Browse source
This commit is contained in:
Mouse Reeve 2020-10-16 12:24:29 -07:00
parent 43c6b9880a
commit b32fce25d9
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bookwyrm/incoming.py
View file

@ -134,10 +134,8 @@ def handle_follow(activity):
except django.db.utils.IntegrityError as err: except django.db.utils.IntegrityError as err:
if err.__cause__.diag.constraint_name != 'userfollowrequest_unique': if err.__cause__.diag.constraint_name != 'userfollowrequest_unique':
raise raise
# Duplicate follow request. Not sure what the correct behaviour is, but relationship = models.UserFollowRequest.objects.get(remote_id=activity['id'])
# just dropping it works for now. We should perhaps generate the # send the accept normally for a duplicate request
# Accept, but then do we need to match the activity id?
return
if not to_follow.manually_approves_followers: if not to_follow.manually_approves_followers:
status_builder.create_notification( status_builder.create_notification(

4
bookwyrm/outgoing.py
View file

@ -66,7 +66,7 @@ def handle_follow(user, to_follow):
user_object=to_follow, user_object=to_follow,
) )
activity = relationship.to_activity() activity = relationship.to_activity()
broadcast(user, activity, direct_recipients=[to_follow]) broadcast(user, activity, privacy='direct', direct_recipients=[to_follow])
def handle_unfollow(user, to_unfollow): def handle_unfollow(user, to_unfollow):
@ -76,7 +76,7 @@ def handle_unfollow(user, to_unfollow):
user_object=to_unfollow user_object=to_unfollow
) )
activity = relationship.to_undo_activity(user) activity = relationship.to_undo_activity(user)
broadcast(user, activity, direct_recipients=[to_unfollow]) broadcast(user, activity, privacy='direct', direct_recipients=[to_unfollow])
to_unfollow.followers.remove(user) to_unfollow.followers.remove(user)