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

moderation: extract 3 day modqueue length to config.

Browse Source
This commit is contained in:
evazion
2020-08-12 11:22:57 -05:00
parent 3d3b5262cc
commit 0297b631fb
8 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/upload_limit.rb
View File

@@ -38,7 +38,7 @@ class UploadLimit
def used_upload_slots
pending_count = user.posts.pending.count
appealed_count = user.post_appeals.pending.count
early_deleted_count = user.posts.deleted.where("created_at >= ?", 3.days.ago).count
early_deleted_count = user.posts.deleted.where("created_at >= ?", Danbooru.config.moderation_period.ago).count
pending_count + early_deleted_count + (appealed_count * APPEAL_COST)
end

2
app/models/post.rb
View File

@@ -65,7 +65,7 @@ class Post < ApplicationRecord
scope :active, -> { where(is_pending: false, is_deleted: false, is_flagged: false).where.not(id: PostAppeal.pending) }
scope :appealed, -> { where(id: PostAppeal.pending.select(:post_id)) }
scope :in_modqueue, -> { pending.or(flagged).or(appealed) }
scope :expired, -> { where("posts.created_at < ?", 3.days.ago) }
scope :expired, -> { pending.where("posts.created_at < ?", Danbooru.config.moderation_period.ago) }
scope :unflagged, -> { where(is_flagged: false) }
scope :has_notes, -> { where.not(last_noted_at: nil) }

3
app/models/post_appeal.rb
View File

@@ -13,8 +13,7 @@ class PostAppeal < ApplicationRecord
rejected: 2
}
scope :recent, -> { where("post_appeals.created_at >= ?", 1.day.ago) }
scope :expired, -> { pending.where("post_appeals.created_at <= ?", 3.days.ago) }
scope :expired, -> { pending.where("post_appeals.created_at < ?", Danbooru.config.moderation_period.ago) }
module SearchMethods
def search(params)

8
app/models/post_flag.rb
View File

@@ -6,8 +6,6 @@ class PostFlag < ApplicationRecord
REJECTED = "Unapproved in three days after returning to moderation queue%"
end
COOLDOWN_PERIOD = 3.days
belongs_to :creator, class_name: "User"
belongs_to :post
validates :reason, presence: true, length: { in: 1..140 }
@@ -25,8 +23,8 @@ class PostFlag < ApplicationRecord
scope :by_users, -> { where.not(creator: User.system) }
scope :by_system, -> { where(creator: User.system) }
scope :in_cooldown, -> { by_users.where("created_at >= ?", COOLDOWN_PERIOD.ago) }
scope :expired, -> { pending.where("post_flags.created_at <= ?", 3.days.ago) }
scope :in_cooldown, -> { by_users.where("created_at >= ?", Danbooru.config.moderation_period.ago) }
scope :expired, -> { pending.where("post_flags.created_at < ?", Danbooru.config.moderation_period.ago) }
module SearchMethods
def creator_matches(creator, searcher)
@@ -106,7 +104,7 @@ class PostFlag < ApplicationRecord
flag = post.flags.in_cooldown.last
if !is_deletion && flag.present?
errors[:post] << "cannot be flagged more than once every #{COOLDOWN_PERIOD.inspect} (last flagged: #{flag.created_at.to_s(:long)})"
errors[:post] << "cannot be flagged more than once every #{Danbooru.config.moderation_period.inspect} (last flagged: #{flag.created_at.to_s(:long)})"
end
end

2
app/views/post_disapprovals/_compact_counts.html.erb
View File

@@ -1,4 +1,4 @@
<% if (CurrentUser.can_approve_posts? || post.created_at < 3.days.ago) && disapprovals.length > 0 %>
<% if (CurrentUser.can_approve_posts? || post.created_at < Danbooru.config.moderation_period.ago) && disapprovals.length > 0 %>
<% if disapprovals.map(&:reason).grep("breaks_rules").count > 0 %>
(breaks rules: <%= disapprovals.map(&:reason).grep("breaks_rules").count %>)
<% end %>

2
app/views/post_disapprovals/_counts.html.erb
View File

@@ -1,4 +1,4 @@
<% if (CurrentUser.can_approve_posts? || post.created_at < 3.days.ago) && disapprovals.length > 0 %>
<% if (CurrentUser.can_approve_posts? || post.created_at < Danbooru.config.moderation_period.ago) && disapprovals.length > 0 %>
<p>
It has been reviewed by <%= pluralize disapprovals.length, "approver" %>.