Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Make "unfollow" undo pending outgoing follow request too (#4781)

Browse source 
* Make "unfollow" undo pending outgoing follow request too

* Add cancel button to web UI when awaiting follow request approval

* Make the hourglass button do the cancelling
This commit is contained in:
Eugen Rochko 2017-09-02 20:44:41 +02:00 • committed by GitHub
parent 2a5d1d5a1b
commit d3b6746173
8 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/lib/activitypub/activity/undo.rb
View file

@ -33,6 +33,8 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
if @account.following?(target_account)
@account.unfollow!(target_account)
elsif @account.requested?(target_account)
FollowRequest.find_by(account: @account, target_account: target_account)&.destroy
else
delete_later!(object_uri)
end