about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-08-18 11:24:44 +0200
committerGitHub <noreply@github.com>2017-08-18 11:24:44 +0200
commitc7d2619ab1eeb096cea4bde0c35a45eea794c5b0 (patch)
tree1088525c7330834eccde5c4f88df3950378cf07f /app
parent2edfdab6e6d70598a19d59f8a2f47ecae8add243 (diff)
Parse OStatus tag URIs in ActivityPub handlers when those are local (#4631)
Diffstat (limited to 'app')
-rw-r--r--app/lib/activitypub/tag_manager.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index 3d7f08cd3..855881612 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -90,6 +90,8 @@ class ActivityPub::TagManager
       else
         klass.find_by(id: uri_to_local_id(uri))
       end
+    elsif ::TagManager.instance.local_id?(uri)
+      klass.find_by(id: ::TagManager.instance.unique_tag_to_local_id(uri, klass.to_s))
     else
       klass.find_by(uri: uri)
     end