tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect only option in before_validation filters (#38704)

Browse Source
This commit is contained in:
Shlee 2026-04-17 23:06:38 +09:30 committed by GitHub
parent 475e6833ff
commit 9afaa23e78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/block.rb
View File

@ -25,7 +25,7 @@ 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 before_validation :set_uri, on: :create
after_commit :invalidate_blocking_cache after_commit :invalidate_blocking_cache
after_commit :invalidate_follow_recommendations_cache after_commit :invalidate_follow_recommendations_cache

2
app/models/collection_item.rb
View File

@ -36,7 +36,7 @@ class CollectionItem < ApplicationRecord
validates :uri, presence: true, if: :remote_item_with_remote_account? validates :uri, presence: true, if: :remote_item_with_remote_account?
before_validation :set_position, on: :create before_validation :set_position, on: :create
before_validation :set_activity_uri, only: :create, if: :local_item_with_remote_account? before_validation :set_activity_uri, on: :create, if: :local_item_with_remote_account?
scope :ordered, -> { order(position: :asc) } scope :ordered, -> { order(position: :asc) }
scope :with_accounts, -> { includes(account: [:account_stat, :user]) } scope :with_accounts, -> { includes(account: [:account_stat, :user]) }

2
app/models/follow.rb
View File

@ -42,7 +42,7 @@ class Follow < ApplicationRecord
destroy! destroy!
end end
before_validation :set_uri, only: :create before_validation :set_uri, on: :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

2
app/models/follow_request.rb
View File

@ -51,7 +51,7 @@ 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 before_validation :set_uri, on: :create
after_commit :invalidate_follow_recommendations_cache after_commit :invalidate_follow_recommendations_cache
private private

2
app/models/quote.rb
View File

@ -35,7 +35,7 @@ class Quote < ApplicationRecord
belongs_to :quoted_account, class_name: 'Account', optional: true belongs_to :quoted_account, class_name: 'Account', optional: true
before_validation :set_accounts before_validation :set_accounts
before_validation :set_activity_uri, only: :create, if: -> { account.local? && quoted_account&.remote? } before_validation :set_activity_uri, on: :create, if: -> { account.local? && quoted_account&.remote? }
validates :activity_uri, presence: true, if: -> { account.local? && quoted_account&.remote? } validates :activity_uri, presence: true, if: -> { account.local? && quoted_account&.remote? }
validates :approval_uri, absence: true, if: -> { quoted_account&.local? } validates :approval_uri, absence: true, if: -> { quoted_account&.local? }
validate :validate_visibility validate :validate_visibility

2
app/models/report.rb
View File

@ -68,7 +68,7 @@ class Report < ApplicationRecord
violation: 2_000, violation: 2_000,
} }
before_validation :set_uri, only: :create before_validation :set_uri, on: :create
after_create_commit :trigger_create_webhooks after_create_commit :trigger_create_webhooks
after_update_commit :trigger_update_webhooks after_update_commit :trigger_update_webhooks