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

mod actions: fix messages to use consistent format.

Browse Source 
Fix mod actions to use the same message format everywhere.

Before mod actions were formatted in various inconsistent ways:

* "deleted post #1234"
* "comment #1234 updated by <user>"
* "<user> updated forum #1234"
* "<user> level changed Member -> Builder"

Now all mod actions consistently use this format:

* "deleted post #1234"
* "updated comment #1234"
* "updated forum #1234"
* "promoted <user> from Member to Builder"

This way mod actions are formatted consistently with other actions on
the /user_actions page, where everything is written as "<user> did X".

Also add a fix script to fix existing mod actions.
This commit is contained in:
evazion
2022-09-18 20:30:41 -05:00
parent 72e95b6ca3
commit 2119a8efc5
21 changed files with 224 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/user_deletion.rb
View File

@@ -40,7 +40,7 @@ class UserDeletion
private
def create_mod_action
ModAction.log("user ##{user.id} deleted", :user_delete)
ModAction.log("deleted user ##{user.id}", :user_delete, user)
end
def create_user_event

18
app/logical/user_promotion.rb
View File

@@ -41,16 +41,22 @@ class UserPromotion
private
def create_mod_actions
if old_can_approve_posts != user.can_approve_posts?
ModAction.log("\"#{promoter.name}\":#{Routes.user_path(promoter)} changed approval privileges for \"#{user.name}\":#{Routes.user_path(user)} from #{old_can_approve_posts} to [b]#{user.can_approve_posts?}[/b]", :user_approval_privilege, promoter)
if old_can_approve_posts == false && user.can_approve_posts? == true
ModAction.log("granted approval privileges to \"#{user.name}\":#{Routes.user_path(user)}", :user_approval_privilege, promoter)
elsif old_can_approve_posts == true && user.can_approve_posts? == false
ModAction.log("removed approval privileges from \"#{user.name}\":#{Routes.user_path(user)}", :user_approval_privilege, promoter)
end
if old_can_upload_free != user.can_upload_free?
ModAction.log("\"#{promoter.name}\":#{Routes.user_path(promoter)} changed unlimited upload privileges for \"#{user.name}\":#{Routes.user_path(user)} from #{old_can_upload_free} to [b]#{user.can_upload_free?}[/b]", :user_upload_privilege, promoter)
if old_can_upload_free == false && user.can_upload_free? == true
ModAction.log("granted unlimited upload privileges to \"#{user.name}\":#{Routes.user_path(user)}", :user_upload_privilege, promoter)
elsif old_can_upload_free == false && user.can_upload_free? == true
ModAction.log("removed unlimited upload privileges from \"#{user.name}\":#{Routes.user_path(user)}", :user_upload_privilege, promoter)
end
if user.level_changed?
ModAction.log(%{"#{user.name}":#{Routes.user_path(user)} level changed #{user.level_string_was} -> #{user.level_string}}, :user_level_change, promoter)
if user.level_changed? && user.level >= user.level_was
ModAction.log(%{promoted "#{user.name}":#{Routes.user_path(user)} from #{user.level_string_was} to #{user.level_string}}, :user_level_change, promoter)
elsif user.level_changed? && user.level < user.level_was
ModAction.log(%{demoted "#{user.name}":#{Routes.user_path(user)} from #{user.level_string_was} to #{user.level_string}}, :user_level_change, promoter)
end
end

4
app/models/ban.rb
View File

@@ -82,11 +82,11 @@ class Ban < ApplicationRecord
end
def create_ban_mod_action
ModAction.log(%{Banned <@#{user_name}> #{humanized_duration}: #{reason}}, :user_ban)
ModAction.log(%{banned <@#{user_name}> #{humanized_duration}: #{reason}}, :user_ban, banner)
end
def create_unban_mod_action
ModAction.log(%{Unbanned <@#{user_name}>}, :user_unban)
ModAction.log(%{unbanned <@#{user_name}>}, :user_unban)
end
def self.available_includes

8
app/models/comment.rb
View File

@@ -18,12 +18,12 @@ class Comment < ApplicationRecord
before_create :autoreport_spam
before_save :handle_reports_on_deletion
after_create :update_last_commented_at_on_create
after_update(:if => ->(rec) {(!rec.is_deleted? || !rec.saved_change_to_is_deleted?) && CurrentUser.id != rec.creator_id}) do |rec|
ModAction.log("comment ##{rec.id} updated by #{CurrentUser.user.name}", :comment_update)
after_update(:if => ->(rec) {(!rec.is_deleted? || !rec.saved_change_to_is_deleted?) && CurrentUser.id != rec.creator_id}) do |comment|
ModAction.log("updated #{comment.dtext_shortlink}", :comment_update, comment.updater)
end
after_save :update_last_commented_at_on_destroy, :if => ->(rec) {rec.is_deleted? && rec.saved_change_to_is_deleted?}
after_save(:if => ->(rec) {rec.is_deleted? && rec.saved_change_to_is_deleted? && CurrentUser.id != rec.creator_id}) do |rec|
ModAction.log("comment ##{rec.id} deleted by #{CurrentUser.user.name}", :comment_delete)
after_save(:if => ->(rec) {rec.is_deleted? && rec.saved_change_to_is_deleted? && CurrentUser.id != rec.creator_id}) do |comment|
ModAction.log("deleted #{comment.dtext_shortlink}", :comment_delete, comment.updater)
end
deletable

4
app/models/comment_vote.rb
View File

@@ -56,13 +56,13 @@ class CommentVote < ApplicationRecord
comment.update_columns(score: comment.score - score)
if updater != user
ModAction.log("#{updater.name} deleted comment vote ##{id} on comment ##{comment_id}", :comment_vote_delete, updater)
ModAction.log("deleted comment vote ##{id} on comment ##{comment_id}", :comment_vote_delete, updater)
end
else
comment.update_columns(score: comment.score + score)
if updater != user
ModAction.log("#{updater.name} undeleted comment vote ##{id} on comment ##{comment_id}", :comment_vote_undelete, updater)
ModAction.log("undeleted comment vote ##{id} on comment ##{comment_id}", :comment_vote_undelete, updater)
end
end
end

8
app/models/forum_post.rb
View File

@@ -24,11 +24,11 @@ class ForumPost < ApplicationRecord
after_create :update_topic_updated_at_on_create
after_update :update_topic_updated_at_on_update_for_original_posts
after_destroy :update_topic_updated_at_on_destroy
after_update(:if => ->(rec) {rec.updater_id != rec.creator_id}) do |rec|
ModAction.log("#{CurrentUser.user.name} updated forum ##{rec.id}", :forum_post_update)
after_update(:if => ->(rec) {rec.updater_id != rec.creator_id}) do |forum_post|
ModAction.log("updated #{forum_post.dtext_shortlink}", :forum_post_update, forum_post.updater)
end
after_destroy(:if => ->(rec) {rec.updater_id != rec.creator_id}) do |rec|
ModAction.log("#{CurrentUser.user.name} deleted forum ##{rec.id}", :forum_post_delete)
after_destroy(:if => ->(rec) {rec.updater_id != rec.creator_id}) do |forum_post|
ModAction.log("deleted #{forum_post.dtext_shortlink}", :forum_post_delete, forum_post.updater)
end
after_create_commit :async_send_discord_notification

6
app/models/ip_ban.rb
View File

@@ -52,11 +52,11 @@ class IpBan < ApplicationRecord
def create_mod_action
if new_record?
ModAction.log("#{creator.name} created ip ban for #{ip_addr}", :ip_ban_create)
ModAction.log("created ip ban for #{ip_addr}", :ip_ban_create, creator)
elsif is_deleted? == true && is_deleted_was == false
ModAction.log("#{CurrentUser.user.name} deleted ip ban for #{ip_addr}", :ip_ban_delete)
ModAction.log("deleted ip ban for #{ip_addr}", :ip_ban_delete)
elsif is_deleted? == false && is_deleted_was == true
ModAction.log("#{CurrentUser.user.name} undeleted ip ban for #{ip_addr}", :ip_ban_undelete)
ModAction.log("undeleted ip ban for #{ip_addr}", :ip_ban_undelete)
end
end

4
app/models/post.rb
View File

@@ -1462,7 +1462,7 @@ class Post < ApplicationRecord
if category == "iqdb"
update_iqdb
ModAction.log("<@#{user.name}> regenerated IQDB for post ##{id}", :post_regenerate_iqdb, user)
ModAction.log("regenerated IQDB for post ##{id}", :post_regenerate_iqdb, user)
else
media_file = media_asset.variant(:original).open_file
media_asset.distribute_files!(media_file)
@@ -1484,7 +1484,7 @@ class Post < ApplicationRecord
purge_cached_urls!
update_iqdb
ModAction.log("<@#{user.name}> regenerated image samples for post ##{id}", :post_regenerate, user)
ModAction.log("regenerated image samples for post ##{id}", :post_regenerate, user)
end
end

4
app/models/post_vote.rb
View File

@@ -81,9 +81,9 @@ class PostVote < ApplicationRecord
return if new_record? || updater.nil? || updater == user
if is_deleted_changed?(from: false, to: true)
ModAction.log("#{updater.name} deleted post vote ##{id} on post ##{post_id}", :post_vote_delete, updater)
ModAction.log("deleted post vote ##{id} on post ##{post_id}", :post_vote_delete, updater)
elsif is_deleted_changed?(from: true, to: false)
ModAction.log("#{updater.name} undeleted post vote ##{id} on post ##{post_id}", :post_vote_undelete, updater)
ModAction.log("undeleted post vote ##{id} on post ##{post_id}", :post_vote_undelete, updater)
end
end

4
app/models/user_feedback.rb
View File

@@ -11,10 +11,10 @@ class UserFeedback < ApplicationRecord
validates :category, presence: true, inclusion: { in: %w[positive negative neutral] }
after_create :create_dmail, unless: :disable_dmail_notification
after_update(:if => ->(rec) { CurrentUser.id != rec.creator_id}) do |rec|
ModAction.log(%{#{CurrentUser.user.name} updated user feedback for "#{rec.user.name}":#{Routes.user_path(rec.user)}}, :user_feedback_update)
ModAction.log(%{updated user feedback for "#{rec.user.name}":#{Routes.user_path(rec.user)}}, :user_feedback_update)
end
after_destroy(:if => ->(rec) { CurrentUser.id != rec.creator_id}) do |rec|
ModAction.log(%{#{CurrentUser.user.name} deleted user feedback for "#{rec.user.name}":#{Routes.user_path(rec.user)}}, :user_feedback_delete)
ModAction.log(%{deleted user feedback for "#{rec.user.name}":#{Routes.user_path(rec.user)}}, :user_feedback_delete)
end
deletable

132
script/fixes/114_fix_mod_action_descriptions.rb Executable file
View File

@@ -0,0 +1,132 @@
#!/usr/bin/env ruby
require_relative "base"
with_confirmation do
ModAction.user_delete.where_regex(:description, "^user #[0-9]+ deleted$"). find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\Auser #([0-9]+) deleted\z/, 'deleted user #\1'))
puts ma.description
end
ModAction.user_approval_privilege.where_regex(:description, '^".+":/users/[0-9]+ changed approval privileges for ".*":/users/[0-9]+ from false to \[b\]true\[/b\]$').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\A".+":\/users\/[0-9]+ changed approval privileges for "(.+)":\/users\/([0-9]+) from false to \[b\]true\[\/b\]\z/, 'granted approval privileges to "\1":/users/\2'))
puts ma.description
end
ModAction.user_approval_privilege.where_regex(:description, '^".+":/users/[0-9]+ changed approval privileges for ".*":/users/[0-9]+ from true to \[b\]false\[/b\]$').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\A".+":\/users\/[0-9]+ changed approval privileges for "(.+)":\/users\/([0-9]+) from true to \[b\]false\[\/b\]\z/, 'removed approval privileges from "\1":/users/\2'))
puts ma.description
end
ModAction.user_upload_privilege.where_regex(:description, '^".+":/users/[0-9]+ changed unlimited upload privileges for ".*":/users/[0-9]+ from false to \[b\]true\[/b\]$').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\A".+":\/users\/[0-9]+ changed unlimited upload privileges for "(.+)":\/users\/([0-9]+) from false to \[b\]true\[\/b\]\z/, 'granted unlimited upload privileges to "\1":/users/\2'))
puts ma.description
end
ModAction.user_upload_privilege.where_regex(:description, '^".+":/users/[0-9]+ changed unlimited upload privileges for ".*":/users/[0-9]+ from true to \[b\]false\[/b\]$').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\A".+":\/users\/[0-9]+ changed unlimited upload privileges for "(.+)":\/users\/([0-9]+) from true to \[b\]false\[\/b\]\z/, 'removed unlimited upload privileges from "\1":/users/\2'))
puts ma.description
end
ModAction.user_level_change.where_regex(:description, '^".+":/users/[0-9]+ level changed .* -> .*$').find_each do |ma|
ma.description =~ /\A"(.+)":\/users\/([0-9]+) level changed (.*) -> (.*)\z/
old_level = User.level_hash[$3]
new_level = User.level_hash[$4]
if old_level < new_level
ma.update_columns(description: "promoted \"#{$1}\":/users/#{$2} from #{$3} to #{$4}")
else
ma.update_columns(description: "demoted \"#{$1}\":/users/#{$2} from #{$3} to #{$4}")
end
puts ma.description
end
ModAction.user_account_upgrade.where_regex(:description, '^".+":/users/[0-9]+ level changed .* -> .*$').find_each do |ma|
ma.description =~ /\A"(.+)":\/users\/([0-9]+) level changed (.*) -> (.*)\z/
recipient_id = $2.to_i
if recipient_id == ma.creator_id
ma.update_columns(description: "upgraded from #{$3} to #{$4}")
else
ma.update_columns(description: "upgraded \"#{$1}\":/users/#{$2} from #{$3} to #{$4}")
end
puts ma.description
end
ModAction.user_ban.where_regex(:description, '^Banned').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\ABanned/, "banned"))
puts ma.description
end
ModAction.user_unban.where_regex(:description, '^Unbanned').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\AUnbanned/, "unbanned"))
puts ma.description
end
ModAction.comment_update.where_regex(:description, '^comment #[0-9]+ updated by').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\Acomment #([0-9]+) updated by .+\z/, 'updated comment #\1'))
puts ma.description
end
ModAction.comment_delete.where_regex(:description, '^comment #[0-9]+ deleted by').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\Acomment #([0-9]+) deleted by .+\z/, 'deleted comment #\1'))
puts ma.description
end
ModAction.comment_vote_delete.where_regex(:description, '^.+ deleted comment vote #[0-9]+ on comment #[0-9]+$').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\A.+ deleted comment vote #([0-9]+) on comment #([0-9]+)\z/, 'deleted comment vote #\1 on comment #\2'))
puts ma.description
end
ModAction.forum_post_update.where_regex(:description, '^.* updated forum #[0-9]+$').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\A.* updated forum #([0-9]+)\z/, 'updated forum #\1'))
puts ma.description
end
ModAction.forum_post_delete.where_regex(:description, '^.* deleted forum #[0-9]+$').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\A.* deleted forum #([0-9]+)\z/, 'deleted forum #\1'))
puts ma.description
end
ModAction.ip_ban_create.where_regex(:description, '^.* created ip ban for .*$').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\A.* created ip ban for (.*)\z/, 'created ip ban for \1'))
puts ma.description
end
ModAction.ip_ban_delete.where_regex(:description, '^.* deleted ip ban for .*$').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\A.* deleted ip ban for (.*)\z/, 'deleted ip ban for \1'))
puts ma.description
end
ModAction.ip_ban_undelete.where_regex(:description, '^.* undeleted ip ban for .*$').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\A.* undeleted ip ban for (.*)\z/, 'undeleted ip ban for \1'))
puts ma.description
end
ModAction.post_vote_delete.where_regex(:description, '^.+ deleted post vote #[0-9]+ on post #[0-9]+$').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\A.+ deleted post vote #([0-9]+) on post #([0-9]+)\z/, 'deleted post vote #\1 on post #\2'))
puts ma.description
end
ModAction.user_feedback_update.where_regex(:description, '^.+ updated user feedback for ".+":/users/[0-9]+$').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\A.+ updated user feedback for "(.+)":\/users\/([0-9]+)\z/, 'updated user feedback for "\1":/users/\2'))
puts ma.description
end
ModAction.user_feedback_delete.where_regex(:description, '^.+ deleted user feedback for ".+":/users/[0-9]+$').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\A.+ deleted user feedback for "(.+)":\/users\/([0-9]+)\z/, 'deleted user feedback for "\1":/users/\2'))
puts ma.description
end
ModAction.post_regenerate_iqdb.where_regex(:description, '^<@.*> regenerated IQDB for post #[0-9]+$').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\A<@.*> regenerated IQDB for post #([0-9]+)$/, 'regenerated IQDB for post #\1'))
puts ma.description
end
ModAction.post_regenerate.where_regex(:description, '^<@.*> regenerated image samples for post #[0-9]+$').find_each do |ma|
ma.update_columns(description: ma.description.gsub(/\A<@.*> regenerated image samples for post #([0-9]+)$/, 'regenerated image samples for post #\1'))
puts ma.description
end
end

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

@@ -19,8 +19,10 @@ class Admin::UsersControllerTest < ActionDispatch::IntegrationTest
context "on a basic user" do
should "succeed" do
put_auth admin_user_path(@user), @mod, params: {:user => {:level => "30"}}
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)
end
should "promote the user to unrestricted uploads" do
@@ -30,6 +32,8 @@ class Admin::UsersControllerTest < ActionDispatch::IntegrationTest
assert_equal(true, @user.is_builder?)
assert_equal(true, @user.can_upload_free?)
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)
end
should "promote the user to approver" do
@@ -39,6 +43,8 @@ class Admin::UsersControllerTest < ActionDispatch::IntegrationTest
assert_equal(true, @user.is_builder?)
assert_equal(false, @user.can_upload_free?)
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)
end
context "promoted to an admin" do

3
test/functional/bans_controller_test.rb
View File

@@ -60,6 +60,7 @@ 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)
end
end
@@ -131,7 +132,9 @@ class BansControllerTest < ActionDispatch::IntegrationTest
assert_difference("Ban.count", -1) do
delete_auth ban_path(@ban.id), @mod
assert_redirected_to bans_path
assert_match(/unbanned <@#{@ban.user.name}>/, ModAction.last.description)
end
end
end

10
test/functional/comments_controller_test.rb
View File

@@ -141,7 +141,9 @@ 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
assert_equal("abc", @comment.reload.body)
assert_match(/updated comment ##{@comment.id}/, ModAction.last.description)
assert_response :success
end
@@ -156,7 +158,9 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
context "when stickying a comment" do
should "succeed if updater is a moderator" do
put_auth comment_path(@comment.id), @mod, params: {comment: {is_sticky: true}}, xhr: true
assert_equal(true, @comment.reload.is_sticky)
assert_match(/updated comment ##{@comment.id}/, ModAction.last.description)
assert_response :success
end
@@ -179,14 +183,18 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
should "update the body" do
put_auth comment_path(@comment.id), @user, params: {comment: {body: "abc"}}, xhr: true
assert_equal("abc", @comment.reload.body)
assert_match(/updated comment ##{@comment.id}/, ModAction.last.description)
assert_response :success
end
should "allow changing the body and is_deleted" do
put_auth comment_path(@comment.id), @user, params: {comment: {body: "herp derp", is_deleted: true}}, xhr: true
assert_equal("herp derp", @comment.reload.body)
assert_equal(true, @comment.is_deleted)
assert_match(/deleted comment ##{@comment.id}/, ModAction.last.description)
assert_response :success
end
@@ -240,6 +248,7 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
assert_equal(true, @comment.reload.is_deleted)
assert_redirected_to @comment
assert_match(/deleted comment ##{@comment.id}/, ModAction.last.description)
end
should "mark all pending moderation reports against the comment as handled" do
@@ -263,6 +272,7 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to(@comment)
assert_equal(false, @comment.reload.is_deleted)
assert_match(/updated comment ##{@comment.id}/, ModAction.last.description)
end
should "not allow normal Members to undelete their own comments" do

4
test/functional/forum_posts_controller_test.rb
View File

@@ -213,7 +213,9 @@ class ForumPostsControllerTest < ActionDispatch::IntegrationTest
should "allow moderators to update other people's posts" do
put_auth forum_post_path(@forum_post), @mod, params: { forum_post: { body: "test" }}
assert_redirected_to(forum_topic_path(@forum_topic, anchor: "forum_post_#{@forum_post.id}"))
assert_match(/updated forum ##{@forum_post.id}/, ModAction.last.description)
end
end
@@ -224,6 +226,7 @@ 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)
end
should "not allow users to delete their own posts" do
@@ -262,6 +265,7 @@ 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)
end
should "not allow users to undelete their own posts" do

14
test/functional/ip_bans_controller_test.rb
View File

@@ -18,13 +18,16 @@ class IpBansControllerTest < ActionDispatch::IntegrationTest
should "create a new ip ban" do
assert_difference("IpBan.count", 1) do
post_auth ip_bans_path, @admin, params: {:ip_ban => {:ip_addr => "1.2.3.4", :reason => "xyz"}}
assert_response :redirect
end
end
should "log a mod action" do
post_auth ip_bans_path, @admin, params: { ip_ban: { ip_addr: "1.2.3.4", reason: "xyz" }}
assert_equal("ip_ban_create", ModAction.last&.category)
assert_match(/created ip ban for 1\.2\.3\.4/, ModAction.last.description)
end
end
@@ -61,6 +64,17 @@ class IpBansControllerTest < ActionDispatch::IntegrationTest
assert_response :success
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)
end
should "mark an ip ban as undeleted" do
@ip_ban = create(:ip_ban, ip_addr: "5.6.7.8", is_deleted: true)
put_auth ip_ban_path(@ip_ban), @admin, params: { ip_ban: { is_deleted: false }, format: "js" }
assert_response :success
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)
end
end
end

4
test/functional/post_regenerations_controller_test.rb
View File

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

2
test/functional/post_votes_controller_test.rb
View File

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

11
test/functional/user_feedbacks_controller_test.rb
View File

@@ -100,6 +100,7 @@ class UserFeedbacksControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to(@user_feedback)
assert_equal("positive", @user_feedback.reload.category)
assert_equal(0, ModAction.count)
end
should "not allow updating deleted feedbacks" do
@@ -114,14 +115,24 @@ class UserFeedbacksControllerTest < ActionDispatch::IntegrationTest
assert_response :redirect
assert_equal(true, @user_feedback.reload.is_deleted)
assert_equal(0, ModAction.count)
end
context "by a moderator" do
should "allow updating feedbacks given to other users" do
put_auth user_feedback_path(@user_feedback), @mod, params: { user_feedback: { body: "blah" }}
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)
end
should "allow deleting feedbacks given to other users" do
put_auth user_feedback_path(@user_feedback), @mod, params: { user_feedback: { is_deleted: "true" }}
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)
end
should "not allow updating feedbacks given to themselves" do

4
test/unit/post_vote_test.rb
View File

@@ -106,7 +106,7 @@ class PostVoteTest < ActiveSupport::TestCase
vote = create(:post_vote, post: @post, score: 1)
vote.soft_delete!(updater: admin)
assert_match(/admin deleted post vote #\d+ on post #\d+/, ModAction.post_vote_delete.last.description)
assert_match(/deleted post vote #\d+ on post #\d+/, ModAction.post_vote_delete.last.description)
end
end
@@ -128,7 +128,7 @@ class PostVoteTest < ActiveSupport::TestCase
end
should "leave a mod action" do
assert_match(/admin undeleted post vote #\d+ on post #\d+/, ModAction.post_vote_undelete.last.description)
assert_match(/undeleted post vote #\d+ on post #\d+/, ModAction.post_vote_undelete.last.description)
end
end
end

5
test/unit/user_deletion_test.rb
View File

@@ -67,6 +67,11 @@ class UserDeletionTest < ActiveSupport::TestCase
assert_equal(false, @user.authenticate_password("password"))
end
should "generate a modaction" do
@deletion.delete!
assert_match(/deleted user ##{@user.id}/, ModAction.last.description)
end
should "remove any favorites" do
@post = create(:post)
Favorite.create!(post: @post, user: @user)