Use better method for querying moderation reports on posts and topics

- Also moved the control logic out of the views and into the models
This commit is contained in:
BrokenEagle
2020-01-19 20:14:42 +00:00
parent 16100ecfe6
commit 29e8b89c93
8 changed files with 16 additions and 14 deletions

View File

@@ -14,6 +14,7 @@ class ForumTopic < ApplicationRecord
belongs_to_creator
belongs_to_updater
has_many :posts, -> {order("forum_posts.id asc")}, :class_name => "ForumPost", :foreign_key => "topic_id", :dependent => :destroy
has_many :moderation_reports, through: :posts
has_one :original_post, -> {order("forum_posts.id asc")}, class_name: "ForumPost", foreign_key: "topic_id", inverse_of: :topic
has_many :subscriptions, :class_name => "ForumSubscription"
before_validation :initialize_is_deleted, :on => :create
@@ -182,8 +183,7 @@ class ForumTopic < ApplicationRecord
original_post&.update_columns(:updater_id => CurrentUser.id, :updated_at => Time.now)
end
def moderation_reports
posts_with_reports = posts.joins(:moderation_reports).includes(:moderation_reports).distinct
posts_with_reports.reduce([]) {|arr,post| arr + post.moderation_reports}
def viewable_moderation_reports
CurrentUser.is_moderator? ? moderation_reports : []
end
end

View File

@@ -49,6 +49,7 @@ class Post < ApplicationRecord
has_many :votes, :class_name => "PostVote", :dependent => :destroy
has_many :notes, :dependent => :destroy
has_many :comments, -> {order("comments.id")}, :dependent => :destroy
has_many :moderation_reports, through: :comments
has_many :children, -> {order("posts.id")}, :class_name => "Post", :foreign_key => "parent_id"
has_many :approvals, :class_name => "PostApproval", :dependent => :destroy
has_many :disapprovals, :class_name => "PostDisapproval", :dependent => :destroy
@@ -1812,10 +1813,7 @@ class Post < ApplicationRecord
save
end
def moderation_reports
@moderation_reports ||= begin
comments_with_reports = comments.joins(:moderation_reports).includes(:moderation_reports).distinct
comments_with_reports.reduce([]) {|arr,comment| arr + comment.moderation_reports}
end
def viewable_moderation_reports
CurrentUser.is_moderator? ? moderation_reports : []
end
end

View File

@@ -812,4 +812,8 @@ class User < ApplicationRecord
def presenter
@presenter ||= UserPresenter.new(self)
end
def viewable_moderation_reports
!is_moderator? && CurrentUser.is_moderator? ? moderation_reports : []
end
end