mod reports: enable reporting for members, add dmail reporting.

* Add ability to report dmails.
* Enable reports for comments, forum posts, and dmails.
* Allow Members to send reports.
* Don't allow users to report the same thing twice.

app/controllers/moderation_reports_controller.rb

@@ -4,19 +4,22 @@ class ModerationReportsController < ApplicationController
   before_action :moderator_only, only: [:index]
 
   def new
-    check_privilege
     @moderation_report = ModerationReport.new(moderation_report_params)
+    check_privilege(@moderation_report)
     respond_with(@moderation_report)
   end
 
   def index
-    @moderation_reports = ModerationReport.paginated_search(params).includes(:creator, :model)
+    @moderation_reports = ModerationReport.paginated_search(params, count_pages: true).includes(:creator, :model)
     respond_with(@moderation_reports)
   end
 
   def create
-    check_privilege
+    @moderation_report = ModerationReport.new(moderation_report_params.merge(creator: CurrentUser.user))
-    @moderation_report = ModerationReport.create(moderation_report_params.merge(creator: CurrentUser.user))
+    check_privilege(@moderation_report)
+    @moderation_report.save
+
+    flash.now[:notice] = @moderation_report.valid? ? "Report submitted" : @moderation_report.errors.full_messages.join("; ")
     respond_with(@moderation_report)
   end
 
@@ -30,16 +33,8 @@ class ModerationReportsController < ApplicationController
     params.fetch(:moderation_report, {}).fetch(:model_id)
   end
 
-  def check_privilege
+  def check_privilege(moderation_report)
-    case model_type
+    raise User::PrivilegeError unless moderation_report.model.reportable_by?(CurrentUser.user)
-    when "User"
-      return if User.find(model_id).reportable_by?(CurrentUser.user)
-    when "Comment"
-      return if Comment.find(model_id).reportable_by?(CurrentUser.user)
-    when "ForumPost"
-      return if ForumPost.find(model_id).reportable_by?(CurrentUser.user)
-    end
-    raise User::PrivilegeError
   end
 
   def moderation_report_params

app/models/application_record.rb

@@ -421,6 +421,12 @@ class ApplicationRecord < ActiveRecord::Base
     end
   end
 
+  concerning :DtextMethods do
+    def dtext_shortlink
+      "#{self.class.name.underscore.tr("_", " ")} ##{id}"
+    end
+  end
+
   concerning :AttributeMethods do
     class_methods do
       # Defines `<attribute>_string`, `<attribute>_string=`, and `<attribute>=`

app/models/comment.rb

@@ -129,7 +129,7 @@ class Comment < ApplicationRecord
   end
 
   def reportable_by?(user)
-    ModerationReport.enabled? && user.is_builder? && creator_id != user.id && !creator.is_moderator?
+    creator_id != user.id && !creator.is_moderator?
   end
 
   def voted_by?(user)

app/models/dmail.rb

@@ -198,4 +198,8 @@ class Dmail < ApplicationRecord
   def visible_to?(user, key)
     owner_id == user.id || (user.is_moderator? && key == self.key)
   end
+
+  def reportable_by?(user)
+    is_recipient? && !is_automated? && !from.is_moderator?
+  end
 end

app/models/forum_post.rb

@@ -95,7 +95,7 @@ class ForumPost < ApplicationRecord
   end
 
   def reportable_by?(user)
-    ModerationReport.enabled? && user.is_builder? && creator_id != user.id && !creator.is_moderator?
+    creator_id != user.id && !creator.is_moderator?
   end
 
   def votable?
@@ -223,4 +223,8 @@ class ForumPost < ApplicationRecord
       x.body = x.quoted_response
     end
   end
+
+  def dtext_shortlink
+    "forum ##{id}"
+  end
 end

app/models/forum_topic.rb

@@ -177,8 +177,4 @@ class ForumTopic < ApplicationRecord
   def update_orignal_post
     original_post&.update_columns(:updater_id => updater.id, :updated_at => Time.now)
   end
-
-  def viewable_moderation_reports
-    CurrentUser.is_moderator? ? moderation_reports.recent : []
-  end
 end

app/models/moderation_report.rb

@@ -3,9 +3,13 @@ class ModerationReport < ApplicationRecord
   belongs_to :creator, class_name: "User"
 
   validates :reason, presence: true
+  validates :model_type, inclusion: { in: %w[Comment Dmail ForumPost User] }
+  validates :creator, uniqueness: { scope: [:model_type, :model_id], message: "have already reported this message." }
+
   after_create :create_forum_post!
 
   scope :user, -> { where(model_type: "User") }
+  scope :dmail, -> { where(model_type: "Dmail") }
   scope :comment, -> { where(model_type: "Comment") }
   scope :forum_post, -> { where(model_type: "ForumPost") }
   scope :recent, -> { where("moderation_reports.created_at >= ?", 1.week.ago) }
@@ -35,14 +39,7 @@ class ModerationReport < ApplicationRecord
 
   def forum_post_message
     messages = ["[b]Submitted by:[/b] @#{creator.name}"]
-    case model_type
+    messages << "[b]Submitted against:[/b] #{model.dtext_shortlink}"
-    when "User"
-      messages << "[b]Submitted against:[/b] @#{model.name}"
-    when "Comment"
-      messages << "[b]Submitted against[/b]: comment ##{model_id}"
-    when "ForumPost"
-      messages << "[b]Submitted against[/b]: forum ##{model_id}"
-    end
     messages << ""
     messages << "[quote]"
     messages << "[b]Reason:[/b]"
@@ -57,6 +54,10 @@ class ModerationReport < ApplicationRecord
     updater.update(forum_post_message)
   end
 
+  def self.visible(user = CurrentUser.user)
+    user.is_moderator? ? all : none
+  end
+
   def self.search(params)
     q = super
     q = q.search_attributes(params, :model_type, :model_id, :creator_id)

app/models/post.rb

@@ -1782,8 +1782,4 @@ class Post < ApplicationRecord
 
     save
   end
-
-  def viewable_moderation_reports
-    CurrentUser.is_moderator? ? moderation_reports.recent : []
-  end
 end

app/models/user.rb

@@ -827,7 +827,7 @@ class User < ApplicationRecord
     @presenter ||= UserPresenter.new(self)
   end
 
-  def viewable_moderation_reports
+  def dtext_shortlink
-    CurrentUser.is_moderator? ? moderation_reports.recent : []
+    "<@#{name}>"
   end
 end

app/views/comments/index_for_post.js.erb

@@ -1,5 +1,5 @@
 $("#threshold-comments-notice-for-<%= @post.id %>").hide();
 
 var current_comment_section = $("div.comments-for-post[data-post-id=<%= @post.id %>] div.list-of-comments");
-current_comment_section.html("<%= j(render(partial: 'comments/partials/show/comment', collection: @comments, locals: { context: :index_for_post, dtext_data: DText.preprocess(@comments.map(&:body)), moderation_reports: @post.viewable_moderation_reports })) %>");
+current_comment_section.html("<%= j(render(partial: 'comments/partials/show/comment', collection: @comments, locals: { context: :index_for_post, dtext_data: DText.preprocess(@comments.map(&:body)), moderation_reports: @post.moderation_reports.visible.recent })) %>");
 $(window).trigger("danbooru:index_for_post", [<%= @post.id %>]);

app/views/comments/partials/index/_list.html.erb

@@ -3,10 +3,10 @@
     <%= render "comments/partials/index/header", :post => post %>
   <% end %>
 
-  <% if post.viewable_moderation_reports.present? %>
+  <% if post.moderation_reports.visible.recent.present? %>
     <div class="row moderation-comments-notice">
       <span class="info" id="moderation-comments-notice-for-<%= post.id %>">
-        This post has comments reported for moderation! (<%= pluralize(post.viewable_moderation_reports.length, "report") %>)
+        This post has comments reported for moderation! (<%= pluralize(post.moderation_reports.visible.recent.length, "report") %>)
       </span>
     </div>
   <% end %>
@@ -20,7 +20,7 @@
 
   <div class="list-of-comments list-of-messages">
     <% if comments.present? %>
-      <%= render partial: "comments/partials/show/comment", collection: comments, locals: { context: :index_by_post, dtext_data: DText.preprocess(comments.map(&:body)), moderation_reports: post.viewable_moderation_reports } %>
+      <%= render partial: "comments/partials/show/comment", collection: comments, locals: { context: :index_by_post, dtext_data: DText.preprocess(comments.map(&:body)), moderation_reports: post.moderation_reports.visible.recent } %>
     <% elsif post.last_commented_at.present? %>
       <p>There are no visible comments.</p>
     <% else %>

app/views/comments/partials/show/_comment.html.erb

@@ -57,7 +57,7 @@
             <%= link_to "Unvote", comment_comment_votes_path(comment_id: comment.id), method: :delete, remote: true %>
           </li>
           <% if comment.reportable_by?(CurrentUser.user) %>
-            <li><%= link_to "Report comment", new_moderation_report_path(moderation_report: { model_type: "Comment", model_id: comment.id }), remote: true %></li>
+            <li><%= link_to "Report", new_moderation_report_path(moderation_report: { model_type: "Comment", model_id: comment.id }), remote: true %></li>
           <% end %>
         </menu>
         <% if comment.editable_by?(CurrentUser.user) %>

app/views/dmails/show.html.erb

@@ -33,10 +33,13 @@
             <% if @dmail.is_spam? %>
               | <%= link_to "Not spam", ham_dmail_path(@dmail), remote: :true, method: :post %>
             <% else %>
-              | <%= link_to "Mark as spam", spam_dmail_path(@dmail), remote: :true, method: :post %>
+              | <%= link_to "Spam", spam_dmail_path(@dmail), remote: :true, method: :post %>
             <% end %>
           </span>
         <% end %>
+        <% if @dmail.reportable_by?(CurrentUser.user) %>
+          | <%= link_to "Report", new_moderation_report_path(moderation_report: { model_type: "Dmail", model_id: @dmail.id }), remote: true, title: "Report this dmail to the moderators" %>
+        <% end %>
       </p>
     </div>
   </div>

app/views/forum_posts/_forum_post.html.erb

@@ -38,7 +38,7 @@
           <% end %>
         <% end %>
         <% if forum_post.reportable_by?(CurrentUser.user) %>
-          <li><%= link_to "Report forum", new_moderation_report_path(moderation_report: { model_type: "ForumPost", model_id: forum_post.id }), remote: true %></li>
+          <li><%= link_to "Report", new_moderation_report_path(moderation_report: { model_type: "ForumPost", model_id: forum_post.id }), remote: true, title: "Report this forum post to the moderators" %></li>
         <% end %>
         <% if forum_post.votable? %>
           <ul class="votes" id="forum-post-votes-for-<%= forum_post.id %>">

app/views/forum_topics/show.html.erb

@@ -26,7 +26,7 @@
       </div>
     <% end %>
 
-    <%= render "forum_posts/listing", forum_posts: @forum_posts, original_forum_post_id: @forum_topic.original_post&.id, dtext_data: DText.preprocess(@forum_posts.map(&:body)), moderation_reports: @forum_topic.viewable_moderation_reports %>
+    <%= render "forum_posts/listing", forum_posts: @forum_posts, original_forum_post_id: @forum_topic.original_post&.id, dtext_data: DText.preprocess(@forum_posts.map(&:body)), moderation_reports: @forum_topic.moderation_reports.visible.recent %>
 
     <% if CurrentUser.is_member? %>
       <% if CurrentUser.is_moderator? || !@forum_topic.is_locked? %>

app/views/moderation_reports/create.js.erb

@@ -1 +1 @@
-Danbooru.notice("Report submitted.");
+Danbooru.notice("<%= j flash[:notice] %>");

app/views/moderation_reports/index.html.erb

@@ -5,10 +5,10 @@
       <% t.column "Reported", width: "10%" do |report| %>
         <% if report.model_type == "User" %>
           <%= link_to_user report.model %>
-        <% elsif report.model_type == "Comment" %>
+        <% elsif report.model_type == "Dmail" %>
-          <%= link_to "comment ##{report.model_id}", comment_path(report.model_id) %>
+          <%= link_to report.model.dtext_shortlink, dmail_path(report.model, key: report.model.key) %>
-        <% elsif report.model_type == "ForumPost" %>
+        <% else %>
-          <%= link_to "forum ##{report.model_id}", forum_post_path(report.model_id) %>
+          <%= link_to report.model.dtext_shortlink, report.model %>
         <% end %>
       <% end %>
       <% t.column "Reason" do |report| %>

app/views/users/show.html.erb

@@ -5,10 +5,10 @@
   <div id="a-show">
     <h1><%= link_to_user @user %></h1>
 
-  <% if @user.viewable_moderation_reports.present? %>
+  <% if @user.moderation_reports.visible.recent.present? %>
     <div class="moderation-users-notice">
       <span class="info" id="moderation-users-notice-for-<%= @user.id %>">
-        This user has been reported for moderation! (<%= pluralize(@user.viewable_moderation_reports.length, "report") %>)
+        This user has been reported for moderation! (<%= pluralize(@user.moderation_reports.visible.recent.length, "report") %>)
       </span>
     </div>
   <% end %>

config/locales/en.yml

@@ -37,6 +37,8 @@ en:
         url: ""
       forum_post_vote:
         creator_id: "Your vote"
+      moderation_report:
+        creator: "You"
       post:
         approver: "You"
         approver_id: "You"