erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Extract ActivityPubPayloadGeneration model concern

Browse source
This commit is contained in:
Matt Jankowski 2024-04-25 12:22:00 -04:00
parent aa4d8987a0
commit d8c9755445
4 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/block.rb
View file

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

19
app/models/concerns/activitypub_payload_generation.rb Normal file
View file

@ -0,0 +1,19 @@
# 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_uri_for(self)
end
end

6
app/models/follow.rb
View file

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

6
app/models/follow_request.rb
View file

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