summaryrefslogtreecommitdiffstats
path: root/app/lib/activitypub/activity.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-08-10 22:33:12 +0200
committerGitHub <noreply@github.com>2017-08-10 22:33:12 +0200
commit81c1303cd6137c8c90794cc0bfdc1a0479eb2153 (patch)
treeb4b5a2f1036fab1b56ad2409f247f3e0dbdecaac /app/lib/activitypub/activity.rb
parent4b8e4dca26666c7c0709bf5aa765764023da3bdf (diff)
Handle ActivityPub follows correctly (#4571)
* Handle ActivityPub follows correctly ActivityPub follows are follow-requests. Always require an Accept. If account is not locked, auto-accept. * Handle ActivityPub Accept/Reject-Follow * Fix wrong method * Fix wrong class
Diffstat (limited to 'app/lib/activitypub/activity.rb')
-rw-r--r--app/lib/activitypub/activity.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index d1b81a58274..5debe023a33 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -39,6 +39,10 @@ class ActivityPub::Activity
ActivityPub::Activity::Update
when 'Undo'
ActivityPub::Activity::Undo
+ when 'Accept'
+ ActivityPub::Activity::Accept
+ when 'Reject'
+ ActivityPub::Activity::Reject
end
end
end