Fix not updating a status when newer version is fetched manually (#17745)

2022-03-12 09:11:36 +01:00
parent 883099f3c9
commit ddbe906c25
6 changed files with 72 additions and 30 deletions
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -71,15 +71,7 @@ class ActivityPub::Activity
  end

  def object_uri
-    @object_uri ||= begin
-      str = value_or_id(@object)
-
-      if str&.start_with?('bear:')
-        Addressable::URI.parse(str).query_values['u']
-      else
-        str
-      end
-    end
+    @object_uri ||= uri_from_bearcap(value_or_id(@object))
  end

  def unsupported_object_type?