diff --git a/app/controllers/chat_channels_controller.rb b/app/controllers/chat_channels_controller.rb index 3ba8f5982..a2c988392 100644 --- a/app/controllers/chat_channels_controller.rb +++ b/app/controllers/chat_channels_controller.rb @@ -101,7 +101,7 @@ class ChatChannelsController < ApplicationController user = User.find_by(username: username) membership = user&.chat_channel_memberships&.find_by(chat_channel: chat_channel) if user && membership - user.add_role :banned + user.add_role(:banned) user.messages.where(chat_channel: chat_channel).delete_all membership.update(status: "removed_from_channel") Pusher.trigger(chat_channel.pusher_channels, "user-banned", { userId: user.id }.to_json) @@ -116,7 +116,7 @@ class ChatChannelsController < ApplicationController when "/unban" user = User.find_by(username: username) if user - user.remove_role :banned + user.remove_role(:banned) render json: { status: "moderation-success", message: "#{username} was unsuspended." }, status: :ok else render json: { diff --git a/app/services/moderator/manage_activity_and_roles.rb b/app/services/moderator/manage_activity_and_roles.rb index 8bd3a53c6..735c144be 100644 --- a/app/services/moderator/manage_activity_and_roles.rb +++ b/app/services/moderator/manage_activity_and_roles.rb @@ -25,15 +25,15 @@ module Moderator end def remove_privileges - @user.remove_role :workshop_pass - @user.remove_role :pro + @user.remove_role(:workshop_pass) + @user.remove_role(:pro) remove_mod_roles remove_tag_moderator_role end def remove_mod_roles - @user.remove_role :trusted - @user.remove_role :tag_moderator + @user.remove_role(:trusted) + @user.remove_role(:tag_moderator) @user.update(email_tag_mod_newsletter: false) Mailchimp::Bot.new(user).manage_tag_moderator_list @user.update(email_community_mod_newsletter: false) @@ -41,7 +41,7 @@ module Moderator end def remove_tag_moderator_role - @user.remove_role :tag_moderator + @user.remove_role(:tag_moderator) Mailchimp::Bot.new(user).manage_tag_moderator_list end @@ -58,7 +58,7 @@ module Moderator def handle_user_status(role, note) case role when "Suspend" || "Spammer" - user.add_role :banned + user.add_role(:banned) remove_privileges when "Warn" warned @@ -68,20 +68,20 @@ module Moderator regular_member when "Trusted" remove_negative_roles - user.remove_role :pro + user.remove_role(:pro) TagModerators::AddTrustedRole.call(user) when "Admin" check_super_admin remove_negative_roles - user.add_role :admin + user.add_role(:admin) when "Super Admin" check_super_admin remove_negative_roles - user.add_role :super_admin + user.add_role(:super_admin) when "Tech Admin" check_super_admin remove_negative_roles - user.add_role :tech_admin + user.add_role(:tech_admin) # DataUpdateScripts falls under the admin namespace # and hence requires a single_resource_admin role to view # this technical admin resource @@ -93,7 +93,7 @@ module Moderator when "Pro" remove_negative_roles TagModerators::AddTrustedRole.call(user) - user.add_role :pro + user.add_role(:pro) end create_note(role, note) end @@ -103,27 +103,27 @@ module Moderator end def comment_banned - user.add_role :comment_banned - user.remove_role :banned + user.add_role(:comment_banned) + user.remove_role(:banned) remove_privileges end def regular_member remove_negative_roles - user.remove_role :pro + user.remove_role(:pro) remove_mod_roles end def warned - user.add_role :warned - user.remove_role :banned + user.add_role(:warned) + user.remove_role(:banned) remove_privileges end def remove_negative_roles - user.remove_role :banned if user.banned - user.remove_role :warned if user.warned - user.remove_role :comment_banned if user.comment_banned + user.remove_role(:banned) if user.banned + user.remove_role(:warned) if user.warned + user.remove_role(:comment_banned) if user.comment_banned end def update_trusted_cache diff --git a/docs/admin/readme.md b/docs/admin/readme.md index 1de7fdb09..9fb53fbe8 100644 --- a/docs/admin/readme.md +++ b/docs/admin/readme.md @@ -26,7 +26,7 @@ purpose. For example, if you needed to give a user access to only ```ruby user = User.find(some_user_id) -user.add_role :single_resource_admin, Welcome +user.add_role(:single_resource_admin, Welcome) ``` This gives the user administration privileges on the controller associated with diff --git a/docs/backend/roles.md b/docs/backend/roles.md index 6cf2a6ed1..2d5fba0bc 100644 --- a/docs/backend/roles.md +++ b/docs/backend/roles.md @@ -41,7 +41,7 @@ rails console > user.has_role? :pro => false -> user.add_role :pro +> user.add_role(:pro) => #