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

Fix #4669: Track moderation report status.

Browse Source 
* Add ability to mark moderation reports as 'handled' or 'rejected'.
* Automatically mark reports as handled when the comment or forum post
  is deleted.
* Send a dmail to the reporter when their report is handled.
* Don't show the report notice on comments or forum posts when all
  reports against it have been handled or rejected.
* Add a fix script to mark all existing reports for deleted comments,
  forum posts, or dmails as handled.
This commit is contained in:
evazion
2022-01-20 17:41:05 -06:00
parent 98aee048f2
commit c8d27c2719
20 changed files with 160 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/components/forum_post_component.rb
View File

@@ -1,9 +1,9 @@
# frozen_string_literal: true
class ForumPostComponent < ApplicationComponent
attr_reader :forum_post, :original_forum_post_id, :dtext_data, :moderation_reports, :current_user
attr_reader :forum_post, :original_forum_post_id, :dtext_data, :current_user
delegate :link_to_user, :time_ago_in_words_tagged, :format_text, :policy, :data_attributes_for, to: :helpers
delegate :link_to_user, :time_ago_in_words_tagged, :format_text, :data_attributes_for, to: :helpers
with_collection_parameter :forum_post
@@ -12,7 +12,7 @@ class ForumPostComponent < ApplicationComponent
original_forum_post_id = forum_topic.original_post&.id
forum_posts = forum_posts.includes(:creator, :bulk_update_request)
forum_posts = forum_posts.includes(:moderation_reports) if Pundit.policy!(current_user, ModerationReport).show?
forum_posts = forum_posts.includes(:pending_moderation_reports) if Pundit.policy(current_user, ModerationReport).can_see_moderation_reports?
super(forum_posts, dtext_data: dtext_data, original_forum_post_id: original_forum_post_id, current_user: current_user)
end
@@ -29,7 +29,7 @@ class ForumPostComponent < ApplicationComponent
policy(forum_post).show_deleted?
end
def has_moderation_reports?
policy(ModerationReport).can_see_moderation_reports? && forum_post.moderation_reports.present?
def reported?
policy(ModerationReport).can_see_moderation_reports? && forum_post.pending_moderation_reports.present?
end
end