diff --git a/app/models/comment.rb b/app/models/comment.rb index 2c59d43cd..ea9cd037f 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -166,8 +166,6 @@ class Comment < ApplicationRecord end def self.available_includes - includes_array = [:post, :creator, :updater] - includes_array << :moderation_reports if CurrentUser.is_moderator? - includes_array + [:post, :creator, :updater] end end diff --git a/app/models/dmail.rb b/app/models/dmail.rb index 74e733558..f3ab4ea16 100644 --- a/app/models/dmail.rb +++ b/app/models/dmail.rb @@ -197,8 +197,6 @@ class Dmail < ApplicationRecord end def self.available_includes - includes_array = [:owner, :to, :from] - includes_array << :moderation_reports if CurrentUser.is_moderator? - includes_array + [:owner, :to, :from] end end diff --git a/app/models/forum_post.rb b/app/models/forum_post.rb index 5cf26f551..5ba970f5e 100644 --- a/app/models/forum_post.rb +++ b/app/models/forum_post.rb @@ -225,8 +225,6 @@ class ForumPost < ApplicationRecord end def self.available_includes - includes_array = [:creator, :updater, :topic, :dtext_links, :votes, :tag_alias, :tag_implication, :bulk_update_request] - includes_array << :moderation_reports if CurrentUser.is_moderator? - includes_array + [:creator, :updater, :topic, :dtext_links, :votes, :tag_alias, :tag_implication, :bulk_update_request] end end diff --git a/app/models/forum_topic.rb b/app/models/forum_topic.rb index 93d256bbc..720d5a7c8 100644 --- a/app/models/forum_topic.rb +++ b/app/models/forum_topic.rb @@ -179,8 +179,6 @@ class ForumTopic < ApplicationRecord end def self.available_includes - includes_array = [:creator, :updater, :original_post] - includes_array << :moderation_reports if CurrentUser.is_moderator? - includes_array + [:creator, :updater, :original_post] end end diff --git a/app/models/post.rb b/app/models/post.rb index 2405d1922..15fac0b94 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -1768,9 +1768,6 @@ class Post < ApplicationRecord end def self.available_includes - includes_array = [:uploader, :updater, :approver, :parent, :upload, :artist_commentary, :flags, :appeals, :notes, :comments, :children, :approvals, :replacements] - includes_array << :moderation_reports if CurrentUser.is_moderator? - includes_array << :disapprovals if CurrentUser.user.is_approver? - includes_array + [:uploader, :updater, :approver, :parent, :upload, :artist_commentary, :flags, :appeals, :notes, :comments, :children, :approvals, :replacements] end end diff --git a/app/models/post_flag.rb b/app/models/post_flag.rb index 1a34337fe..6930bf316 100644 --- a/app/models/post_flag.rb +++ b/app/models/post_flag.rb @@ -163,8 +163,6 @@ class PostFlag < ApplicationRecord end def self.available_includes - includes_array = [:post] - includes_array << :creator if CurrentUser.user.is_moderator? - includes_array + [:post] end end