move acts_as_federails_actor out of concern so we can configure indep…

…dendently
manyfold3d · Aug 10, 2024 · f709ef8 · f709ef8
1 parent 29d5b8a
commit f709ef8
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 2 deletions.
diff --git a/app/models/collection.rb b/app/models/collection.rb
@@ -1,5 +1,6 @@
 class Collection < ApplicationRecord
   include Followable
+  acts_as_federails_actor username_field: :slug, name_field: :name, profile_url_method: :url_for, actor_type: "Collection"
 
   has_many :models, dependent: :nullify
   has_many :collections, dependent: :nullify

diff --git a/app/models/concerns/followable.rb b/app/models/concerns/followable.rb
@@ -3,7 +3,6 @@ module Followable
   include FederailsCommon
 
   included do
-    acts_as_federails_actor username_field: :id, name_field: :name, profile_url_method: :url_for
     delegate :following_followers, to: :actor
     after_create :post_creation_activity
     after_update :post_update_activity

diff --git a/app/models/concerns/follower.rb b/app/models/concerns/follower.rb
@@ -3,7 +3,6 @@ module Follower
   include FederailsCommon
 
   included do
-    acts_as_federails_actor username_field: :username, name_field: :name
     delegate :activities, to: :actor
     delegate :following_follows, to: :actor
   end

diff --git a/app/models/creator.rb b/app/models/creator.rb
@@ -1,5 +1,6 @@
 class Creator < ApplicationRecord
   include Followable
+  acts_as_federails_actor username_field: :slug, name_field: :name, profile_url_method: :url_for
 
   has_many :models, dependent: :nullify
   has_many :links, as: :linkable, dependent: :destroy

diff --git a/app/models/model.rb b/app/models/model.rb
@@ -4,6 +4,8 @@ class Model < ApplicationRecord
   include PathParser
   include Followable
 
+  acts_as_federails_actor username_field: :slug, name_field: :name, profile_url_method: :url_for, actor_type: "Document"
+
   scope :recent, -> { order(created_at: :desc) }
 
   belongs_to :library

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -4,6 +4,8 @@ class User < ApplicationRecord
   include Lister
   include Follower
 
+  acts_as_federails_actor username_field: :username, name_field: :username
+
   rolify
   devise :database_authenticatable,
     :registerable, :zxcvbnable,