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

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