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

Made recommended changes to moderator reports (see #4267)

Browse Source
This commit is contained in:
BrokenEagle
2020-01-21 01:26:52 +00:00
parent 29e8b89c93
commit 5f746c1a34
13 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/moderation_reports_controller.rb
View File

@@ -17,7 +17,6 @@ class ModerationReportsController < ApplicationController
def create
check_privilege
@moderation_report = ModerationReport.create(moderation_report_params)
@moderation_report.create_forum_post!
respond_with(@moderation_report)
end

6
app/javascript/src/styles/base/040_colors.css
View File

@@ -67,6 +67,9 @@
--forum-vote-meh-color: goldenrod;
--forum-vote-down-color: red;
--moderation-report-text-color: red;
--moderation-report-border: 2px solid red;
--comment-sticky-background-color: var(--subnav-menu-background-color);
--post-tooltip-background-color: var(--body-background-color);
@@ -333,6 +336,9 @@ body[data-current-user-theme="dark"] {
--forum-vote-meh-color: var(--yellow-1);
--forum-vote-down-color: var(--red-1);
--moderation-report-text-color: var(--red-1);
--moderation-report-border: 2px solid var(--red-1);
--jquery-ui-widget-content-text-color: var(--text-color);
--jquery-ui-widget-content-background: var(--grey-2);
--jquery-ui-dialog-box-shadow: 0 0 8px var(--grey-1);

4
app/javascript/src/styles/specific/comments.scss
View File

@@ -4,7 +4,7 @@ div.comments-for-post {
div.moderation-comments-notice {
margin: 1em 0;
font-weight: bold;
color: red;
color: var(--moderation-report-text-color);
}
div.hidden-comments-notice {
@@ -20,7 +20,7 @@ div.comments-for-post {
}
&[data-is-reported="true"] {
border: solid red;
border: var(--moderation-report-border);
}
&[data-is-voted="true"] {

4
app/javascript/src/styles/specific/forum.scss
View File

@@ -1,12 +1,12 @@
div.list-of-forum-posts {
div.moderation-forums-notice {
font-weight: bold;
color: red;
color: var(--moderation-report-text-color);
}
article.forum-post {
&[data-is-reported="true"] {
border: solid red;
border: var(--moderation-report-border);
}
a.voted {

2
app/javascript/src/styles/specific/users.scss
View File

@@ -3,7 +3,7 @@ div#c-users {
div.moderation-users-notice {
margin: 1em 0;
font-weight: bold;
color: red;
color: var(--moderation-report-text-color);
}
div.box {

1
app/logical/danbooru_maintenance.rb
View File

@@ -17,7 +17,6 @@ module DanbooruMaintenance
safely { TagChangeRequestPruner.warn_all }
safely { TagChangeRequestPruner.reject_all }
safely { Ban.prune! }
safely { ModerationReport.prune! }
safely { CuratedPoolUpdater.update_pool! }
safely { ActiveRecord::Base.connection.execute("vacuum analyze") unless Rails.env.test? }
end

2
app/models/forum_topic.rb
View File

@@ -184,6 +184,6 @@ class ForumTopic < ApplicationRecord
end
def viewable_moderation_reports
CurrentUser.is_moderator? ? moderation_reports : []
CurrentUser.is_moderator? ? moderation_reports.recent : []
end
end

8
app/models/moderation_report.rb
View File

@@ -2,9 +2,13 @@ class ModerationReport < ApplicationRecord
belongs_to :model, polymorphic: true
belongs_to_creator
validates :reason, presence: true
after_create :create_forum_post!
scope :user, -> { where(model_type: "User") }
scope :comment, -> { where(model_type: "Comment") }
scope :forum_post, -> { where(model_type: "ForumPost") }
scope :recent, -> { where("moderation_reports.created_at >= ?", 1.week.ago) }
def forum_topic_title
"Reports requiring moderation"
@@ -54,8 +58,4 @@ class ModerationReport < ApplicationRecord
q.apply_default_order(params)
end
def self.prune!
where("created_at < ?", 1.week.ago).delete_all
end
end

2
app/models/post.rb
View File

@@ -1814,6 +1814,6 @@ class Post < ApplicationRecord
end
def viewable_moderation_reports
CurrentUser.is_moderator? ? moderation_reports : []
CurrentUser.is_moderator? ? moderation_reports.recent : []
end
end

2
app/models/user.rb
View File

@@ -814,6 +814,6 @@ class User < ApplicationRecord
end
def viewable_moderation_reports
!is_moderator? && CurrentUser.is_moderator? ? moderation_reports : []
CurrentUser.is_moderator? ? moderation_reports.recent : []
end
end

2
app/views/comments/partials/index/_list.html.erb
View File

@@ -6,7 +6,7 @@
<% if post.viewable_moderation_reports.present? %>
<div class="row moderation-comments-notice">
<span class="info" id="moderation-comments-notice-for-<%= post.id %>">
This post has comments reported for moderation! (<%= post.moderation_reports.length %> <%= (post.moderation_reports.length == 1 ? "report" : "reports") %>)
This post has comments reported for moderation! (<%= pluralize(post.viewable_moderation_reports.length, "report") %>)
</span>
</div>
<% end %>

2
app/views/forum_posts/_listing.html.erb
View File

@@ -7,7 +7,7 @@
<% if moderation_reports.present? %>
<div class="row moderation-forums-notice">
<span class="info" id="moderation-forums-notice-for-topic">
This topic has forum posts reported for moderation! (<%= moderation_reports.length %> <%= (moderation_reports.length == 1 ? "report" : "reports") %>)
This topic has forum posts reported for moderation! (<%= pluralize(moderation_reports.length, "report") %>)
</span>
</div>
<% end %>

2
app/views/users/show.html.erb
View File

@@ -5,7 +5,7 @@
<% if @user.viewable_moderation_reports.present? %>
<div class="moderation-users-notice">
<span class="info" id="moderation-users-notice-for-<%= @user.id %>">
This user has been reported for moderation! (<%= @user.moderation_reports.length %> <%= (@user.moderation_reports.length == 1 ? "report" : "reports") %>)
This user has been reported for moderation! (<%= pluralize(@user.viewable_moderation_reports.length, "report") %>)
</span>
</div>
<% end %>