about summary refs log tree commit diff
path: root/app/services/activitypub
diff options
context:
space:
mode:
authorunarist <m.unarist@gmail.com>2017-08-23 01:30:15 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-08-22 18:30:15 +0200
commitd63de55ef84eea883b72a121d680b8841af8e2c0 (patch)
treeb14c60fb4827f5cffa84cd9c54397e019023a717 /app/services/activitypub
parent72bb3e03fdf4d8c886d41f3459000b336a3a362b (diff)
Fix bugs which OStatus accounts may detected as ActivityPub ready (#4662)
* Fallback to OStatus in FetchAtomService

* Skip activity+json link if that activity is Person without inbox
* If unsupported activity was detected and all other URLs failed, retry with ActivityPub-less Accept header

* Allow mention to OStatus account in ActivityPub

* Don't update profile with inbox-less Person object
Diffstat (limited to 'app/services/activitypub')
-rw-r--r--app/services/activitypub/process_account_service.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index 2f2dfd330..99f9dbdc2 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -6,6 +6,8 @@ class ActivityPub::ProcessAccountService < BaseService
   # Should be called with confirmed valid JSON
   # and WebFinger-resolved username and domain
   def call(username, domain, json)
+    return unless json['inbox'].present?
+
     @json     = json
     @uri      = @json['id']
     @username = username