diff --git a/app/models/post_event.rb b/app/models/post_event.rb index d14bbb7bf..82964c7ba 100644 --- a/app/models/post_event.rb +++ b/app/models/post_event.rb @@ -6,16 +6,40 @@ class PostEvent < ApplicationRecord belongs_to :post def self.model_types - %w[Post PostAppeal PostApproval PostDisapproval PostFlag PostReplacement] + %w[Post PostAppeal PostApproval PostDisapproval PostFlag PostReplacement ModAction] + end + + def self.categories + # model_types.excluding("ModAction") + ModAction.categories.keys.grep(/\Apost_(?!permanent_delete|vote)/).map(&:camelize) + %w[Upload Flag Appeal Approval Disapproval Delete Undelete Ban Unban Replacement Regenerate RegenerateIqdb MoveFavorites NoteLockCreate NoteLockDelete RatingLockCreate RatingLockDelete] end def self.visible(user) all end + def self.category_matches(category) + category = category.squish.titleize.delete(" ") + + case category + when "Upload" + where(model_type: "Post") + when "Flag", "Appeal", "Approval", "Disapproval", "Replacement" + where(model_type: "Post" + category) + when *categories + where(model: ModAction.where(category: "post_" + category.underscore)) + else + none + end + end + def self.search(params, current_user) q = search_attributes(params, [:model, :post, :creator, :event_at], current_user: current_user) + if params[:category] + q = q.category_matches(params[:category]) + end + case params[:order] when "event_at_asc" q = q.order(event_at: :asc, model_id: :asc) @@ -34,6 +58,20 @@ class PostEvent < ApplicationRecord [:post, :model] # XXX creator isn't included because it leaks flagger/disapprover names end + def category + if model_type == "Post" + "Upload" + elsif model_type == "ModAction" + model.category.camelize.delete_prefix("Post") + else + model_type.delete_prefix("Post") + end + end + + def pretty_category + category.titleize.delete_prefix("Post ") + end + def readonly? true end diff --git a/app/policies/post_event_policy.rb b/app/policies/post_event_policy.rb index 3677c5058..984dc4660 100644 --- a/app/policies/post_event_policy.rb +++ b/app/policies/post_event_policy.rb @@ -24,8 +24,13 @@ class PostEventPolicy < ApplicationPolicy attr = attr.to_s.gsub("creator", "uploader").to_sym if type == "Post" attr = attr.to_s.gsub("creator", "user").to_sym if type in "PostApproval" | "PostDisapproval" - # XXX ordering by created_at desc is a query planner hack to make Postgres use the right indexes. - events.where(model: type.constantize.visible_for_search(attr, user).order(created_at: :desc)) + if type == "ModAction" + # XXX don't apply visible_for_search to mod actions because it's slow and we know all mod actions are visible + events.where(model_type: "ModAction") + else + # XXX ordering by created_at desc is a query planner hack to make Postgres use the right indexes. + events.where(model: type.constantize.visible_for_search(attr, user).order(created_at: :desc)) + end end.reduce(:or) else events diff --git a/app/views/post_events/_secondary_links.html.erb b/app/views/post_events/_secondary_links.html.erb index 2f89f2640..eecda0817 100644 --- a/app/views/post_events/_secondary_links.html.erb +++ b/app/views/post_events/_secondary_links.html.erb @@ -14,4 +14,5 @@ <%= subnav_link_to "Disapprovals", post_disapprovals_path %> <%= subnav_link_to "Flags", post_flags_path %> <%= subnav_link_to "Replacements", post_replacements_path %> + <%= subnav_link_to "Mod Actions", mod_actions_path(search: { subject_type: "Post" }) %> <% end %> diff --git a/app/views/post_events/index.html.erb b/app/views/post_events/index.html.erb index d4aa55aa6..1241d0864 100644 --- a/app/views/post_events/index.html.erb +++ b/app/views/post_events/index.html.erb @@ -11,7 +11,7 @@ <%= search_form_for(post_events_path) do |f| %> <%= f.input :creator_name, label: "User", input_html: { value: params[:search][:creator_name], "data-autocomplete": "user" } %> <%= f.input :post_tags_match, label: "Tags", input_html: { value: params[:search][:post_tags_match], "data-autocomplete": "tag-query" } %> - <%= f.input :model_type, label: "Category", collection: PostEvent.model_types.map { |type| [type.titleize.delete_prefix("Post "), type] }, include_blank: true, selected: params[:search][:model_type] %> + <%= f.input :category, label: "Category", collection: PostEvent.categories.map { |category| [category.titleize, category] }, include_blank: true, selected: params[:search][:category] %> <%= f.input :order, collection: [%w[Newest event_at], %w[Oldest event_at_asc]], include_blank: true, selected: params[:search][:order] %> <%= f.submit "Search" %> <% end %> @@ -60,11 +60,38 @@ (<%= external_link_to model.original_url.presence || "none", Source::URL.site_name(model.original_url) || model.original_url %> -> <%= external_link_to model.replacement_url, Source::URL.site_name(model.replacement_url) || model.replacement_url %>). <% end %> + <% when "ModAction" %> + <% case model.category %> + <% when "post_ban" %> + <%= link_to post.dtext_shortlink, post %> was banned by <%= link_to_user creator %>. + <% when "post_unban" %> + <%= link_to post.dtext_shortlink, post %> was unbanned by <%= link_to_user creator %>. + <% when "post_delete" %> + <%= link_to post.dtext_shortlink, post %> was deleted by <%= link_to_user creator %>. + <% when "post_undelete" %> + <%= link_to post.dtext_shortlink, post %> was undeleted by <%= link_to_user creator %>. + <% when "post_regenerate" %> + <%= link_to post.dtext_shortlink, post %> had its thumbnails regenerated by <%= link_to_user creator %>. + <% when "post_regenerate_iqdb" %> + <%= link_to post.dtext_shortlink, post %> was reindexed in IQDB by <%= link_to_user creator %>. + <% when "post_rating_lock_create" %> + <%= link_to post.dtext_shortlink, post %> was rating locked by <%= link_to_user creator %>. + <% when "post_rating_lock_delete" %> + <%= link_to post.dtext_shortlink, post %> was rating unlocked by <%= link_to_user creator %>. + <% when "post_note_lock_create" %> + <%= link_to post.dtext_shortlink, post %> was note locked by <%= link_to_user creator %>. + <% when "post_note_lock_delete" %> + <%= link_to post.dtext_shortlink, post %> was note unlocked by <%= link_to_user creator %>. + <% else %> +