jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mod actions: record the subject of the mod action.

Browse Source 
Add a polymorphic `subject` field that records the subject of the mod
action. The subject is the post, user, comment, artist, etc the mod
action is for.

* The subject for the user ban and unban actions is the user, not the ban itself.
* The subject for the user feedback update and deletion actions is the user,
  not the feedback itself.
* The subject for the post undeletion action is the post, not the approval itself.
* The subject for the move favorites action is the source post where the
  favorites were moved from, not the destination post where the favorites
  were moved to.
* The subject for the post permanent delete action is nil, because the
  post itself is hard deleted.
* When a post is permanently deleted, all mod actions related to the
  post are deleted as well.
This commit is contained in:
evazion
2022-09-25 01:05:50 -05:00
parent 9026875776
commit 34057b25e1
38 changed files with 183 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/functional/admin/users_controller_test.rb
View File

@@ -23,6 +23,8 @@ class Admin::UsersControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to(edit_admin_user_path(@user))
assert_equal(30, @user.reload.level)
assert_match(/promoted "#{@user.name}":\/users\/#{@user.id} from Member to Gold/, ModAction.last.description)
assert_equal(@user, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
should "promote the user to unrestricted uploads" do
@@ -34,6 +36,10 @@ class Admin::UsersControllerTest < ActionDispatch::IntegrationTest
assert_equal(false, @user.can_approve_posts?)
assert_match(/granted unlimited upload privileges to "#{@user.name}":\/users\/#{@user.id}/, ModAction.first.description)
assert_match(/promoted "#{@user.name}":\/users\/#{@user.id} from Member to Builder/, ModAction.last.description)
assert_equal(@user, ModAction.first.subject)
assert_equal(@mod, ModAction.first.creator)
assert_equal(@user, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
should "promote the user to approver" do
@@ -45,6 +51,10 @@ class Admin::UsersControllerTest < ActionDispatch::IntegrationTest
assert_equal(true, @user.can_approve_posts?)
assert_match(/granted approval privileges to "#{@user.name}":\/users\/#{@user.id}/, ModAction.first.description)
assert_match(/promoted "#{@user.name}":\/users\/#{@user.id} from Member to Builder/, ModAction.last.description)
assert_equal(@user, ModAction.first.subject)
assert_equal(@mod, ModAction.first.creator)
assert_equal(@user, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
context "promoted to an admin" do

4
test/functional/bans_controller_test.rb
View File

@@ -61,6 +61,8 @@ class BansControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to bans_path
assert_equal(true, @user.reload.is_banned?)
assert_match(/banned <@#{@user.name}> 1 day: xxx/, ModAction.last.description)
assert_equal(@user, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
end
@@ -135,6 +137,8 @@ class BansControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to bans_path
assert_match(/unbanned <@#{@ban.user.name}>/, ModAction.last.description)
assert_equal(@ban.user, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
end
end

5
test/functional/comment_votes_controller_test.rb
View File

@@ -214,7 +214,8 @@ class CommentVotesControllerTest < ActionDispatch::IntegrationTest
assert_equal(1, @vote.comment.score)
assert_difference("CommentVote.count", 0) do
delete_auth comment_vote_path(@vote), create(:admin_user), xhr: true, params: { variant: "listing" }
admin = create(:admin_user)
delete_auth comment_vote_path(@vote), admin, xhr: true, params: { variant: "listing" }
assert_response :success
assert_equal(true, @vote.reload.is_deleted?)
@@ -222,6 +223,8 @@ class CommentVotesControllerTest < ActionDispatch::IntegrationTest
assert_equal("comment_vote_delete", ModAction.last.category)
assert_match(/deleted comment vote/, ModAction.last.description)
assert_equal(@vote, ModAction.last.subject)
assert_equal(admin, ModAction.last.creator)
end
end

16
test/functional/comments_controller_test.rb
View File

@@ -178,10 +178,12 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
context "when updating another user's comment" do
should "succeed if updater is a moderator" do
put_auth comment_path(@comment.id), @user, params: {comment: {body: "abc"}}, xhr: true
put_auth comment_path(@comment.id), @mod, params: {comment: {body: "abc"}}, xhr: true
assert_equal("abc", @comment.reload.body)
assert_match(/updated comment ##{@comment.id}/, ModAction.last.description)
assert_equal(@comment, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
assert_response :success
end
@@ -199,6 +201,8 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
assert_equal(true, @comment.reload.is_sticky)
assert_match(/updated comment ##{@comment.id}/, ModAction.last.description)
assert_equal(@comment, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
assert_response :success
end
@@ -224,6 +228,8 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
assert_equal("abc", @comment.reload.body)
assert_match(/updated comment ##{@comment.id}/, ModAction.last.description)
assert_equal(@comment, ModAction.last.subject)
assert_equal(@user, ModAction.last.creator)
assert_response :success
end
@@ -233,6 +239,8 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
assert_equal("herp derp", @comment.reload.body)
assert_equal(true, @comment.is_deleted)
assert_match(/deleted comment ##{@comment.id}/, ModAction.last.description)
assert_equal(@comment, ModAction.last.subject)
assert_equal(@user, ModAction.last.creator)
assert_response :success
end
@@ -287,12 +295,14 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
assert_equal(true, @comment.reload.is_deleted)
assert_redirected_to @comment
assert_match(/deleted comment ##{@comment.id}/, ModAction.last.description)
assert_equal(@comment, ModAction.last.subject)
assert_equal(@user, ModAction.last.creator)
end
should "mark all pending moderation reports against the comment as handled" do
@comment = create(:comment, post: @post)
report1 = create(:moderation_report, model: @comment, status: :pending)
report2 = create(:moderation_report, model: @comment, status: :rejected)
report2 = create(:moderation_report, model: @comment, status: :rejected, updater: create(:user))
delete_auth comment_path(@comment.id), @mod
assert_redirected_to @comment
@@ -311,6 +321,8 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to(@comment)
assert_equal(false, @comment.reload.is_deleted)
assert_match(/updated comment ##{@comment.id}/, ModAction.last.description)
assert_equal(@comment, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
should "not allow normal Members to undelete their own comments" do

8
test/functional/forum_posts_controller_test.rb
View File

@@ -216,6 +216,8 @@ class ForumPostsControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to(forum_topic_path(@forum_topic, anchor: "forum_post_#{@forum_post.id}"))
assert_match(/updated forum ##{@forum_post.id}/, ModAction.last.description)
assert_equal(@forum_post, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
end
@@ -227,6 +229,8 @@ class ForumPostsControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to(@forum_reply)
assert_equal(true, @forum_reply.reload.is_deleted?)
assert_match(/updated forum ##{@forum_reply.id}/, ModAction.last.description)
assert_equal(@forum_reply, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
should "not allow users to delete their own posts" do
@@ -247,7 +251,7 @@ class ForumPostsControllerTest < ActionDispatch::IntegrationTest
should "mark all pending moderation reports against the post as handled" do
forum_reply = as(@user) { create(:forum_post, topic: @forum_topic, creator: @user) }
report1 = create(:moderation_report, model: forum_reply, status: :pending)
report2 = create(:moderation_report, model: forum_reply, status: :rejected)
report2 = create(:moderation_report, model: forum_reply, status: :rejected, updater: @user)
delete_auth forum_post_path(forum_reply), @mod
assert_redirected_to(forum_post_path(forum_reply))
@@ -266,6 +270,8 @@ class ForumPostsControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to(@forum_reply)
assert_equal(false, @forum_reply.reload.is_deleted?)
assert_match(/updated forum ##{@forum_reply.id}/, ModAction.last.description)
assert_equal(@forum_reply, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
should "not allow users to undelete their own posts" do

6
test/functional/ip_bans_controller_test.rb
View File

@@ -28,6 +28,8 @@ class IpBansControllerTest < ActionDispatch::IntegrationTest
assert_equal("ip_ban_create", ModAction.last&.category)
assert_match(/created ip ban for 1\.2\.3\.4/, ModAction.last.description)
assert_equal(IpBan.last, ModAction.last.subject)
assert_equal(@admin, ModAction.last.creator)
end
end
@@ -65,6 +67,8 @@ class IpBansControllerTest < ActionDispatch::IntegrationTest
assert_equal(true, @ip_ban.reload.is_deleted)
assert_equal("ip_ban_delete", ModAction.last.category)
assert_match(/deleted ip ban for #{@ip_ban.ip_addr}/, ModAction.last.description)
assert_equal(@ip_ban, ModAction.last.subject)
assert_equal(@admin, ModAction.last.creator)
end
should "mark an ip ban as undeleted" do
@@ -75,6 +79,8 @@ class IpBansControllerTest < ActionDispatch::IntegrationTest
assert_equal(false, @ip_ban.reload.is_deleted?)
assert_equal("ip_ban_undelete", ModAction.last.category)
assert_match(/undeleted ip ban for #{@ip_ban.ip_addr}/, ModAction.last.description)
assert_equal(@ip_ban, ModAction.last.subject)
assert_equal(@admin, ModAction.last.creator)
end
end
end

4
test/functional/moderation_reports_controller_test.rb
View File

@@ -127,6 +127,8 @@ class ModerationReportsControllerTest < ActionDispatch::IntegrationTest
assert_equal("handled", report.reload.status)
assert_equal(true, @user.dmails.received.exists?(from: User.system, title: "Thank you for reporting comment ##{@comment.id}"))
assert_equal(true, ModAction.moderation_report_handled.where(creator: @mod).exists?)
assert_equal(report, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
should "allow a moderator to mark a moderation report as rejected" do
@@ -137,6 +139,8 @@ class ModerationReportsControllerTest < ActionDispatch::IntegrationTest
assert_equal("rejected", report.reload.status)
assert_equal(false, @user.dmails.received.exists?(from: User.system))
assert_equal(true, ModAction.moderation_report_rejected.where(creator: @mod).exists?)
assert_equal(report, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
end
end

2
test/functional/moderator/post/posts_controller_test.rb
View File

@@ -69,7 +69,7 @@ module Moderator
context "unban action" do
should "render" do
@post.ban!
@post.ban!(@admin)
post_auth unban_moderator_post_post_path(@post), @admin
assert_redirected_to(@post)

4
test/functional/post_regenerations_controller_test.rb
View File

@@ -34,6 +34,8 @@ class PostRegenerationsControllerTest < ActionDispatch::IntegrationTest
assert_equal(@mod, ModAction.last.creator)
assert_equal("post_regenerate_iqdb", ModAction.last.category)
assert_equal("regenerated IQDB for post ##{@post.id}", ModAction.last.description)
assert_equal(@post, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
end
@@ -56,6 +58,8 @@ class PostRegenerationsControllerTest < ActionDispatch::IntegrationTest
assert_equal(@mod, ModAction.last.creator)
assert_equal("post_regenerate", ModAction.last.category)
assert_equal("regenerated image samples for post ##{@post.id}", ModAction.last.description)
assert_equal(@post, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
should "fix the width and height of exif-rotated images" do

2
test/functional/post_votes_controller_test.rb
View File

@@ -287,6 +287,8 @@ class PostVotesControllerTest < ActionDispatch::IntegrationTest
assert_equal(0, @post.votes.active.count)
assert_equal(true, @vote.reload.is_deleted?)
assert_match(/deleted post vote #\d+ on post #\d+/, ModAction.post_vote_delete.last.description)
assert_equal(@vote, ModAction.last.subject)
assert_equal(admin, ModAction.last.creator)
end
should "not fail when attempting to remove an already removed vote" do

1
test/functional/tag_aliases_controller_test.rb
View File

@@ -63,6 +63,7 @@ class TagAliasesControllerTest < ActionDispatch::IntegrationTest
assert_response :redirect
assert_equal("deleted", @tag_alias.reload.status)
assert_equal(user, ModAction.tag_alias_delete.last.creator)
assert_equal(@tag_alias, ModAction.tag_alias_delete.last.subject)
end
should "not allow members to delete aliases" do

1
test/functional/tag_implications_controller_test.rb
View File

@@ -72,6 +72,7 @@ class TagImplicationsControllerTest < ActionDispatch::IntegrationTest
assert_response :redirect
assert_equal("deleted", @tag_implication.reload.status)
assert_equal(@tag_implication, ModAction.last.subject)
assert_equal(user, ModAction.tag_implication_delete.last.creator)
end

4
test/functional/user_feedbacks_controller_test.rb
View File

@@ -125,6 +125,8 @@ class UserFeedbacksControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to @user_feedback
assert_equal("blah", @user_feedback.reload.body)
assert_match(/updated user feedback for "#{@user.name}":\/users\/#{@user.id}/, ModAction.last.description)
assert_equal(@user, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
should "allow deleting feedbacks given to other users" do
@@ -133,6 +135,8 @@ class UserFeedbacksControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to @user_feedback
assert(@user_feedback.reload.is_deleted?)
assert_match(/updated user feedback for "#{@user.name}":\/users\/#{@user.id}/, ModAction.last.description)
assert_equal(@user, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
should "not allow updating feedbacks given to themselves" do

9
test/unit/comment_test.rb
View File

@@ -159,9 +159,12 @@ class CommentTest < ActiveSupport::TestCase
end
should "create a mod action" do
assert_difference("ModAction.count") do
@comment.update(body: "nope")
end
@comment.update(body: "nope")
assert_equal(1, ModAction.count)
assert_equal("comment_update", ModAction.last.category)
assert_equal(@comment, ModAction.last.subject)
assert_equal(@mod, ModAction.last.creator)
end
should "credit the moderator as the updater" do

2
test/unit/favorite_group_test.rb
View File

@@ -27,7 +27,7 @@ class FavoriteGroupTest < ActiveSupport::TestCase
@fav_group.add(@post)
assert_equal([@post.id], @fav_group.post_ids)
@post.expunge!
@post.expunge!(create(:admin_user))
assert_equal([], @fav_group.reload.post_ids)
end
end

2
test/unit/post_approval_test.rb
View File

@@ -68,6 +68,8 @@ class PostApprovalTest < ActiveSupport::TestCase
assert_equal(true, @post.reload.is_active?)
assert_equal("post_undelete", ModAction.last.category)
assert_equal("undeleted post ##{@post.id}", ModAction.last.description)
assert_equal(@post, ModAction.last.subject)
assert_equal(@new_approver, ModAction.last.creator)
end
end

23
test/unit/post_test.rb
View File

@@ -34,6 +34,15 @@ class PostTest < ActiveSupport::TestCase
perform_enqueued_jobs # perform IqdbAddPostJob
end
should "log a modaction" do
@post.expunge!(@user)
assert_equal(1, ModAction.count)
assert_equal("post_permanent_delete", ModAction.last.category)
assert_equal(@user, ModAction.last.creator)
assert_nil(ModAction.last.subject)
end
should "delete the files" do
assert_nothing_raised { @post.file(:preview) }
assert_nothing_raised { @post.file(:original) }
@@ -64,6 +73,20 @@ class PostTest < ActiveSupport::TestCase
assert_equal(0, FavoriteGroup.for_post(@post.id).count)
end
should "destroy all modactions belonging to the post" do
create(:mod_action, description: "deleted post ##{@post.id}", category: :post_delete, subject: @post)
create(:mod_action, description: "undeleted post ##{@post.id}", category: :post_undelete, subject: @post)
create(:mod_action, description: "banned post ##{@post.id}", category: :post_ban, subject: @post)
create(:mod_action, description: "unbanned post ##{@post.id}", category: :post_unban, subject: @post)
@post.expunge!(@user)
assert_equal(1, ModAction.count)
assert_equal("post_permanent_delete", ModAction.last.category)
assert_equal(@user, ModAction.last.creator)
assert_nil(ModAction.last.subject)
end
should "decrement the uploader's upload count" do
assert_difference("@post.uploader.reload.post_upload_count", -1) do
@post.expunge!

4
test/unit/post_vote_test.rb
View File

@@ -107,6 +107,8 @@ class PostVoteTest < ActiveSupport::TestCase
vote.soft_delete!(updater: admin)
assert_match(/deleted post vote #\d+ on post #\d+/, ModAction.post_vote_delete.last.description)
assert_equal(vote, ModAction.post_vote_delete.last.subject)
assert_equal(admin, ModAction.post_vote_delete.last.creator)
end
end
@@ -129,6 +131,8 @@ class PostVoteTest < ActiveSupport::TestCase
should "leave a mod action" do
assert_match(/undeleted post vote #\d+ on post #\d+/, ModAction.post_vote_undelete.last.description)
assert_equal(@vote, ModAction.post_vote_undelete.last.subject)
assert_equal(@admin, ModAction.post_vote_undelete.last.creator)
end
end
end

7
test/unit/user_deletion_test.rb
View File

@@ -70,6 +70,9 @@ class UserDeletionTest < ActiveSupport::TestCase
should "generate a modaction" do
@deletion.delete!
assert_match(/deleted user ##{@user.id}/, ModAction.last.description)
assert_equal(@user, ModAction.last.subject)
assert_equal("user_delete", ModAction.last.category)
assert_equal(@deletion.deleter, ModAction.last.creator)
end
should "remove any favorites" do
@@ -90,7 +93,9 @@ class UserDeletionTest < ActiveSupport::TestCase
@deletion.delete!
assert_equal("user_#{@user.id}", @user.reload.name)
assert_equal(true, ModAction.exists?(description: "deleted user ##{@user.id}", creator: @deletion.deleter))
assert_equal("deleted user ##{@user.id}", ModAction.last.description)
assert_equal(@deletion.deleter, ModAction.last.creator)
assert_equal(@user, ModAction.last.subject)
end
should "not work for other users" do