diff --git a/app/javascript/src/styles/specific/users.scss b/app/javascript/src/styles/specific/users.scss index ba9af319f..93269df0c 100644 --- a/app/javascript/src/styles/specific/users.scss +++ b/app/javascript/src/styles/specific/users.scss @@ -1,11 +1,5 @@ div#c-users { div#a-show { - div.moderation-users-notice { - margin: 1em 0; - font-weight: bold; - color: var(--moderation-report-text-color); - } - div.box { margin-bottom: 2em; } diff --git a/app/models/moderation_report.rb b/app/models/moderation_report.rb index 20874e2d1..f7a3312dc 100644 --- a/app/models/moderation_report.rb +++ b/app/models/moderation_report.rb @@ -1,26 +1,23 @@ class ModerationReport < ApplicationRecord + MODEL_TYPES = %w[Dmail Comment ForumPost] + belongs_to :model, polymorphic: true belongs_to :creator, class_name: "User" validates :reason, presence: true - validates :model_type, inclusion: { in: %w[Comment Dmail ForumPost User] } + validates :model_type, inclusion: { in: MODEL_TYPES } validates :creator, uniqueness: { scope: [:model_type, :model_id], message: "have already reported this message." } after_create :create_forum_post! after_create :autoban_reported_user - 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) } - def self.enabled? - !Rails.env.production? - end - def self.model_types - %w[User Dmail Comment ForumPost] + MODEL_TYPES end def forum_topic_title diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb index f065c4668..d02848a07 100644 --- a/app/policies/user_policy.rb +++ b/app/policies/user_policy.rb @@ -19,10 +19,6 @@ class UserPolicy < ApplicationPolicy !user.is_anonymous? end - def reportable? - false - end - def fix_counts? !user.is_anonymous? end diff --git a/app/views/moderation_reports/index.html.erb b/app/views/moderation_reports/index.html.erb index dcf471a19..2ac33377a 100644 --- a/app/views/moderation_reports/index.html.erb +++ b/app/views/moderation_reports/index.html.erb @@ -3,9 +3,7 @@

Moderation reports

<%= table_for @moderation_reports, width: "100%" do |t| %> <% t.column "Reported", width: "10%" do |report| %> - <% if report.model_type == "User" %> - <%= link_to_user report.model %> - <% elsif report.model_type == "Dmail" %> + <% if report.model_type == "Dmail" %> <%= link_to report.model.dtext_shortlink, dmail_path(report.model, key: report.model.key) %> <% else %> <%= link_to report.model.dtext_shortlink, report.model %> diff --git a/app/views/users/_secondary_links.html.erb b/app/views/users/_secondary_links.html.erb index 4487865cd..1fc05d1d0 100644 --- a/app/views/users/_secondary_links.html.erb +++ b/app/views/users/_secondary_links.html.erb @@ -21,9 +21,6 @@ <% if !@user.is_platinum? %> <%= subnav_link_to "Gift upgrade", new_user_upgrade_path(:user_id => @user.id) %> <% end %> - <% if policy(@user).reportable? %> - <%= subnav_link_to "Report user", new_moderation_report_path(moderation_report: { model_type: "User", model_id: @user.id }), remote: true %> - <% end %> <% end %> <% if policy(CurrentUser.user).promote? %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index ce75914bc..46907e33c 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -5,14 +5,6 @@

<%= link_to_user @user %>

- <% if @user.moderation_reports.visible(CurrentUser.user).recent.present? %> -
- - This user has been reported for moderation! (<%= pluralize(@user.moderation_reports.visible(CurrentUser.user).recent.length, "report") %>) - -
- <% end %> - <%= render "statistics", presenter: @user.presenter, user: @user %> <%= render "posts/partials/common/inline_blacklist" %>