]> cat aescling's git repositories - mastodon.git/commitdiff
Parse OStatus tag URIs in ActivityPub handlers when those are local (#4631)
authorEugen Rochko <eugen@zeonfederated.com>
Fri, 18 Aug 2017 09:24:44 +0000 (11:24 +0200)
committerGitHub <noreply@github.com>
Fri, 18 Aug 2017 09:24:44 +0000 (11:24 +0200)
app/lib/activitypub/tag_manager.rb

index 3d7f08cd38224d817fd6d61941774376e410c715..855881612e43c39127c341b25721a5eb93148652 100644 (file)
@@ -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