Refactor user blocking code; hide the Block button in admin

2025-02-25 18:55:32 -06:00 · 2013-07-02 14:42:30 -04:00
parent fab1be7c8e
commit 075ed1ab53
8 changed files with 168 additions and 70 deletions
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -96,13 +96,13 @@ class Admin::UsersController < Admin::AdminController

  def block
    guardian.ensure_can_block_user! @user
-    SpamRulesEnforcer.punish! @user
+    UserBlocker.block(@user, current_user)
    render nothing: true
  end

  def unblock
    guardian.ensure_can_unblock_user! @user
-    SpamRulesEnforcer.clear @user
+    UserBlocker.unblock(@user, current_user)
    render nothing: true
  end