From 6ba3d687923b12a3b547a0ea5e8408fda053bb60 Mon Sep 17 00:00:00 2001 From: evazion Date: Thu, 22 Aug 2019 21:20:51 -0500 Subject: [PATCH] dmails: fix feedback not being left when spammer is autobanned. --- app/models/ban.rb | 4 ++-- test/unit/dmail_test.rb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/ban.rb b/app/models/ban.rb index ad19e6bf2..ec572db97 100644 --- a/app/models/ban.rb +++ b/app/models/ban.rb @@ -89,7 +89,7 @@ class Ban < ApplicationRecord end def update_user_on_create - user.update_attribute(:is_banned, true) + user.update!(is_banned: true) end def update_user_on_destroy @@ -122,7 +122,7 @@ class Ban < ApplicationRecord end def create_feedback - user.feedback.create(category: "negative", body: "Banned for #{humanized_duration}: #{reason}") + user.feedback.create!(creator: banner, category: "negative", body: "Banned for #{humanized_duration}: #{reason}") end def create_ban_mod_action diff --git a/test/unit/dmail_test.rb b/test/unit/dmail_test.rb index bbdcc6cc1..a84277668 100644 --- a/test/unit/dmail_test.rb +++ b/test/unit/dmail_test.rb @@ -42,6 +42,7 @@ class DmailTest < ActiveSupport::TestCase assert_equal(true, @spammer.reload.is_banned) assert_equal(1, @spammer.bans.count) assert_match(/Spambot./, @spammer.bans.last.reason) + assert_match(/Spambot./, @spammer.feedback.last.body) end end