Merge 065f9c5976 into 549ab089ee

app/lib/activitypub/tag_manager.rb

@@ -58,7 +58,7 @@ class ActivityPub::TagManager
     account_url(username: username)
   end
 
-  def generate_uri_for(_target)
+  def generate_activity_uri
     URI.join(root_url, 'payloads', SecureRandom.uuid)
   end
 

app/models/block.rb

@@ -13,6 +13,7 @@
 #
 
 class Block < ApplicationRecord
+  include ActivityPub::Identifier
   include Paginable
   include RelationshipCacheable
 
@@ -25,7 +26,6 @@ class Block < ApplicationRecord
     false # Force uri_for to use uri attribute
   end
 
-  before_validation :set_uri, only: :create
   after_commit :invalidate_blocking_cache
   after_commit :invalidate_follow_recommendations_cache
 
@@ -39,8 +39,4 @@ class Block < ApplicationRecord
   def invalidate_follow_recommendations_cache
     Rails.cache.delete("follow_recommendations/#{account_id}")
   end
-
-  def set_uri
-    self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil?
-  end
 end

app/models/concerns/activity_pub/identifier.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module ActivityPub
+  module Identifier
+    extend ActiveSupport::Concern
+
+    included do
+      before_validation :generate_global_identifier,
+                        only: :create,
+                        unless: :uri?
+    end
+
+    private
+
+    def generate_global_identifier
+      self.uri = ActivityPub::TagManager
+                 .instance
+                 .generate_activity_uri
+    end
+  end
+end

app/models/follow.rb

@@ -16,6 +16,7 @@
 #
 
 class Follow < ApplicationRecord
+  include ActivityPub::Identifier
   include Paginable
   include RelationshipCacheable
   include RateLimitable
@@ -42,7 +43,6 @@ class Follow < ApplicationRecord
     destroy!
   end
 
-  before_validation :set_uri, only: :create
   after_create :increment_cache_counters
   after_destroy :remove_endorsements
   after_destroy :decrement_cache_counters
@@ -51,10 +51,6 @@ class Follow < ApplicationRecord
 
   private
 
-  def set_uri
-    self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil?
-  end
-
   def remove_endorsements
     AccountPin.where(target_account_id: target_account_id, account_id: account_id).delete_all
   end

app/models/follow_request.rb

@@ -16,6 +16,7 @@
 #
 
 class FollowRequest < ApplicationRecord
+  include ActivityPub::Identifier
   include Paginable
   include RelationshipCacheable
   include RateLimitable
@@ -44,15 +45,10 @@ class FollowRequest < ApplicationRecord
     false # Force uri_for to use uri attribute
   end
 
-  before_validation :set_uri, only: :create
   after_commit :invalidate_follow_recommendations_cache
 
   private
 
-  def set_uri
-    self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil?
-  end
-
   def invalidate_follow_recommendations_cache
     Rails.cache.delete("follow_recommendations/#{account_id}")
   end

app/models/relay.rb

@@ -26,7 +26,7 @@ class Relay < ApplicationRecord
   alias enabled? accepted?
 
   def enable!
-    activity_id = ActivityPub::TagManager.instance.generate_uri_for(nil)
+    activity_id = ActivityPub::TagManager.instance.generate_activity_uri
     payload     = Oj.dump(follow_activity(activity_id))
 
     update!(state: :pending, follow_activity_id: activity_id)
@@ -35,7 +35,7 @@ class Relay < ApplicationRecord
   end
 
   def disable!
-    activity_id = ActivityPub::TagManager.instance.generate_uri_for(nil)
+    activity_id = ActivityPub::TagManager.instance.generate_activity_uri
     payload     = Oj.dump(unfollow_activity(activity_id))
 
     update!(state: :idle, follow_activity_id: nil)

app/models/report.rb

@@ -162,7 +162,7 @@ class Report < ApplicationRecord
   private
 
   def set_uri
-    self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil? && account.local?
+    self.uri = ActivityPub::TagManager.instance.generate_activity_uri if uri.nil? && account.local?
   end
 
   def validate_rule_ids

app/presenters/activitypub/activity_presenter.rb

@@ -29,7 +29,7 @@ class ActivityPub::ActivityPresenter < ActiveModelSerializers::Model
 
     def from_encrypted_message(encrypted_message)
       new.tap do |presenter|
-        presenter.id = ActivityPub::TagManager.instance.generate_uri_for(nil)
+        presenter.id = ActivityPub::TagManager.instance.generate_activity_uri
         presenter.type = 'Create'
         presenter.actor = ActivityPub::TagManager.instance.uri_for(encrypted_message.source_account)
         presenter.published = Time.now.utc