Rename ActivityPubPayloadGeneration to ActivityPub::Identifier

app/models/block.rb

@@ -13,7 +13,7 @@
 #
 
 class Block < ApplicationRecord
-  include ActivityPubPayloadGeneration
+  include ActivityPub::Identifier
   include Paginable
   include RelationshipCacheable
 

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/concerns/activitypub_payload_generation.rb

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

app/models/follow.rb

@@ -16,7 +16,7 @@
 #
 
 class Follow < ApplicationRecord
-  include ActivityPubPayloadGeneration
+  include ActivityPub::Identifier
   include Paginable
   include RelationshipCacheable
   include RateLimitable

app/models/follow_request.rb

@@ -16,7 +16,7 @@
 #
 
 class FollowRequest < ApplicationRecord
-  include ActivityPubPayloadGeneration
+  include ActivityPub::Identifier
   include Paginable
   include RelationshipCacheable
   include RateLimitable