mirror of https://github.com/tootsuite/mastodon
Fix random `NoMethodError` errors on cached `CustomFilter` objects (#28521)
parent
3599622b5b
commit
fcfdeadc04
|
@ -17,8 +17,23 @@
|
|||
class CustomFilter < ApplicationRecord
|
||||
self.ignored_columns += %w(whole_word irreversible)
|
||||
|
||||
alias_attribute :title, :phrase
|
||||
alias_attribute :filter_action, :action
|
||||
# NOTE: We previously used `alias_attribute` but this does not play nicely
|
||||
# with cache
|
||||
def title
|
||||
phrase
|
||||
end
|
||||
|
||||
def title=(value)
|
||||
self.phrase = value
|
||||
end
|
||||
|
||||
def filter_action
|
||||
action
|
||||
end
|
||||
|
||||
def filter_action=(value)
|
||||
self.action = value
|
||||
end
|
||||
|
||||
VALID_CONTEXTS = %w(
|
||||
home
|
||||
|
|
|
@ -17,7 +17,15 @@ class CustomFilterKeyword < ApplicationRecord
|
|||
|
||||
validates :keyword, presence: true
|
||||
|
||||
alias_attribute :phrase, :keyword
|
||||
# NOTE: We previously used `alias_attribute` but this does not play nicely
|
||||
# with cache
|
||||
def phrase
|
||||
keyword
|
||||
end
|
||||
|
||||
def phrase=(value)
|
||||
self.keyword = value
|
||||
end
|
||||
|
||||
before_save :prepare_cache_invalidation!
|
||||
before_destroy :prepare_cache_invalidation!
|
||||
|
|
Loading…
Reference in New Issue