mirror of
https://github.com/discourse/discourse.git
synced 2024-11-26 19:00:32 -06:00
b6a2875749
* FIX: Granting staff status should auto-approve users waiting approval * Update app/models/concerns/roleable.rb Co-Authored-By: Robin Ward <robin.ward@gmail.com>
64 lines
1.4 KiB
Ruby
64 lines
1.4 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Roleable
|
|
extend ActiveSupport::Concern
|
|
|
|
included do
|
|
scope :admins, -> { where(admin: true) }
|
|
scope :moderators, -> { where(moderator: true) }
|
|
scope :staff, -> { where("moderator or admin ") }
|
|
end
|
|
|
|
# any user that is either a moderator or an admin
|
|
def staff?
|
|
admin || moderator
|
|
end
|
|
|
|
def regular?
|
|
!staff?
|
|
end
|
|
|
|
def grant_moderation!
|
|
set_permission('moderator', true)
|
|
auto_approve_user
|
|
enqueue_staff_welcome_message(:moderator)
|
|
end
|
|
|
|
def revoke_moderation!
|
|
set_permission('moderator', false)
|
|
end
|
|
|
|
def grant_admin!
|
|
set_permission('admin', true)
|
|
auto_approve_user
|
|
enqueue_staff_welcome_message(:admin)
|
|
end
|
|
|
|
def revoke_admin!
|
|
set_permission('admin', false)
|
|
end
|
|
|
|
def save_and_refresh_staff_groups!
|
|
transaction do
|
|
self.save!
|
|
Group.refresh_automatic_groups!(:admins, :moderators, :staff)
|
|
end
|
|
end
|
|
|
|
def set_permission(permission_name, value)
|
|
self.public_send("#{permission_name}=", value)
|
|
save_and_refresh_staff_groups!
|
|
end
|
|
|
|
private
|
|
|
|
def auto_approve_user
|
|
if reviewable = ReviewableUser.find_by(target: self, status: Reviewable.statuses[:pending])
|
|
reviewable.perform(Discourse.system_user, :approve_user, send_email: false)
|
|
else
|
|
ReviewableUser.set_approved_fields!(self, Discourse.system_user)
|
|
self.save!
|
|
end
|
|
end
|
|
end
|