Users: Update promotion code.

aibooruorg · Sep 12, 2023 · 3cb2b29 · 3cb2b29
1 parent de669cf
commit 3cb2b29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/logical/user_promotion.rb b/app/logical/user_promotion.rb
@@ -40,6 +40,8 @@ def create_mod_actions
   end
 
   def validate!
+    return if promoter.is_owner?
+
     if !promoter.is_moderator?
       raise User::PrivilegeError, "You can't promote or demote other users"
     elsif promoter == user
@@ -48,8 +50,6 @@ def validate!
       raise User::PrivilegeError, "You can't promote other users to your rank or above"
     elsif user.level >= promoter.level
       raise User::PrivilegeError, "You can't promote or demote other users at your rank or above"
-    elsif !(promoter.is_owner? || promoter == User.system) && (new_level > User::Levels::CONTRIBUTOR || user.level > User::Levels::CONTRIBUTOR)
-      raise User::PrivilegeError, "You can't promote or demote users to that level"
     end
   end
 

diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb
@@ -22,7 +22,7 @@ def destroy?
   end
 
   def promote?
-    (user.is_owner? || (user.is_moderator? && record.level < User::Levels::APPROVER)) && user != record
+    user.is_moderator?
   end
 
   def fix_counts?