logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: c7d2619ab1eeb096cea4bde0c35a45eea794c5b0
parent: 2edfdab6e6d70598a19d59f8a2f47ecae8add243
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Fri, 18 Aug 2017 11:24:44 +0200

Parse OStatus tag URIs in ActivityPub handlers when those are local (#4631)


Diffstat:

Mapp/lib/activitypub/tag_manager.rb2++
1 file changed, 2 insertions(+), 0 deletions(-)

diff --git 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