jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

saved searches: rearrange macros.

Browse Source 
Move macros to the top of file, as they should be.
This commit is contained in:
evazion
2020-08-27 21:39:49 -05:00
parent b9d904ac76
commit 7770c38d0d
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/models/saved_search.rb
View File

@@ -2,6 +2,17 @@ class SavedSearch < ApplicationRecord
REDIS_EXPIRY = 1.hour REDIS_EXPIRY = 1.hour
QUERY_LIMIT = 1000 QUERY_LIMIT = 1000
attr_reader :disable_labels
belongs_to :user
before_validation :normalize_query
before_validation :normalize_labels
validates :query, presence: true
validate :validate_count
scope :labeled, ->(label) { where_array_includes_any_lower(:labels, [normalize_label(label)]) }
scope :has_tag, ->(name) { where_regex(:query, "(^| )[~-]?#{Regexp.escape(name)}( |$)", flags: "i") }
concerning :Redis do concerning :Redis do
extend Memoist extend Memoist
@@ -161,15 +172,6 @@ class SavedSearch < ApplicationRecord
end end
end end
attr_reader :disable_labels
belongs_to :user
validates :query, presence: true
validate :validate_count
before_validation :normalize_query
before_validation :normalize_labels
scope :labeled, ->(label) { where_array_includes_any_lower(:labels, [normalize_label(label)]) }
scope :has_tag, ->(name) { where_regex(:query, "(^| )[~-]?#{Regexp.escape(name)}( |$)", flags: "i") }
def validate_count def validate_count
if user.saved_searches.count + 1 > user.max_saved_searches if user.saved_searches.count + 1 > user.max_saved_searches
self.errors[:user] << "can only have up to #{user.max_saved_searches} " + "saved search".pluralize(user.max_saved_searches) self.errors[:user] << "can only have up to #{user.max_saved_searches} " + "saved search".pluralize(user.max_saved_searches)