From c7d2619ab1eeb096cea4bde0c35a45eea794c5b0 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 18 Aug 2017 11:24:44 +0200
Subject: [PATCH] Parse OStatus tag URIs in ActivityPub handlers when those are
local (#4631)
---
app/lib/activitypub/tag_manager.rb | 2 ++
1 file changed, 2 insertions(+)
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
--
GitLab