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

Fix #4586: Wrong paginator for status:unmoderated

Browse Source 
Don't cache the page count for status:unmoderated, status:modqueue, status:pending, status:flagged,
or status:appealed searches. Before the page count was cached for 5 minutes, which could quickly
become out of date as a user went through the modqueue. After bd21b4a86, they're now fast enough
that we no longer need to cache them.
This commit is contained in:
evazion
2022-09-27 21:57:55 -05:00
parent f49b3c439f
commit 04b004d2a4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/logical/post_query.rb
View File

@@ -216,19 +216,21 @@ class PostQuery
# @return [Integer, nil] The number of posts, or nil on timeout. # @return [Integer, nil] The number of posts, or nil on timeout.
def fast_count(timeout: 1_000, estimate_count: true, skip_cache: false) def fast_count(timeout: 1_000, estimate_count: true, skip_cache: false)
count = nil count = nil
count = estimated_count if estimate_count count = estimated_count(timeout) if estimate_count
count = cached_count(timeout) if count.nil? && !skip_cache count = cached_count(timeout) if count.nil? && !skip_cache
count = exact_count(timeout) if count.nil? && skip_cache count = exact_count(timeout) if count.nil? && skip_cache
count count
end end
def estimated_count def estimated_count(timeout = 1_000)
if is_empty_search? if is_empty_search?
estimated_row_count estimated_row_count
elsif is_simple_tag? elsif is_simple_tag?
tag.try(:post_count) tag.try(:post_count)
elsif is_metatag?(:rating) elsif is_metatag?(:rating)
estimated_row_count estimated_row_count
elsif (is_metatag?(:status) || is_metatag?(:is)) && metatags.sole.value.in?(%w[pending flagged appealed modqueue unmoderated])
exact_count(timeout)
elsif is_metatag?(:pool) || is_metatag?(:ordpool) elsif is_metatag?(:pool) || is_metatag?(:ordpool)
name = find_metatag(:pool, :ordpool) name = find_metatag(:pool, :ordpool)
Pool.find_by_name(name)&.post_count || 0 Pool.find_by_name(name)&.post_count || 0