From b1e1572af3c209439e230d1822496a80c639bab5 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 9 Jan 2020 10:59:34 +0000 Subject: [PATCH] Don't validate the revoker for a block if it hasn't changed The revoker only has to be a moderator at the time they make the revocation - as things stood trying to view a block that had been revoked by somebody that was no longer a moderator failed. --- app/models/user_block.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user_block.rb b/app/models/user_block.rb index 60f680ac3..ad564f418 100644 --- a/app/models/user_block.rb +++ b/app/models/user_block.rb @@ -79,6 +79,6 @@ class UserBlock < ApplicationRecord # but i've also included it here just in case. def moderator_permissions errors.add(:base, I18n.t("user_block.model.non_moderator_update")) if creator_id_changed? && !creator.moderator? - errors.add(:base, I18n.t("user_block.model.non_moderator_revoke")) unless revoker_id.nil? || revoker.moderator? + errors.add(:base, I18n.t("user_block.model.non_moderator_revoke")) if revoker_id_changed? && !revoker_id.nil? && !revoker.moderator? end end -- 2.43.2