github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-07 17:29:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV:Using symbols is deprecated, use strings instead (#17874)

Browse Source
This commit is contained in:
Roman Rizzi 2022-08-11 11:33:41 -03:00 committed by GitHub
parent fe436523a5
commit 58b135d6d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/jobs/regular/publish_group_membership_updates.rb
View File

@ -3,12 +3,13 @@
module Jobs module Jobs
class PublishGroupMembershipUpdates < ::Jobs::Base class PublishGroupMembershipUpdates < ::Jobs::Base
def execute(args) def execute(args)
raise Discourse::InvalidParameters.new(:type) if !%w[add remove].include?(args[:type]) available_types = [Group::AUTO_GROUPS_ADD, Group::AUTO_GROUPS_REMOVE]
raise Discourse::InvalidParameters.new(:type) if !available_types.include?(args[:type])
group = Group.find_by(id: args[:group_id]) group = Group.find_by(id: args[:group_id])
return if !group return if !group
added_members = args[:type] == 'add' added_members = args[:type] == Group::AUTO_GROUPS_ADD
User.human_users.where(id: args[:user_ids]).each do |user| User.human_users.where(id: args[:user_ids]).each do |user|
if added_members if added_members

7
app/models/group.rb
View File

@ -103,6 +103,9 @@ class Group < ActiveRecord::Base
AUTO_GROUP_IDS = Hash[*AUTO_GROUPS.to_a.flatten.reverse] AUTO_GROUP_IDS = Hash[*AUTO_GROUPS.to_a.flatten.reverse]
STAFF_GROUPS = [:admins, :moderators, :staff] STAFF_GROUPS = [:admins, :moderators, :staff]
AUTO_GROUPS_ADD = "add"
AUTO_GROUPS_REMOVE = "remove"
IMAP_SETTING_ATTRIBUTES = [ IMAP_SETTING_ATTRIBUTES = [
"imap_server", "imap_server",
"imap_port", "imap_port",
@ -493,7 +496,7 @@ class Group < ActiveRecord::Base
if removed_user_ids.present? if removed_user_ids.present?
Jobs.enqueue( Jobs.enqueue(
:publish_group_membership_updates, :publish_group_membership_updates,
user_ids: removed_user_ids, group_id: group.id, type: :remove user_ids: removed_user_ids, group_id: group.id, type: AUTO_GROUPS_REMOVE
) )
end end
@ -526,7 +529,7 @@ class Group < ActiveRecord::Base
if added_user_ids.present? if added_user_ids.present?
Jobs.enqueue( Jobs.enqueue(
:publish_group_membership_updates, :publish_group_membership_updates,
user_ids: added_user_ids, group_id: group.id, type: :add user_ids: added_user_ids, group_id: group.id, type: AUTO_GROUPS_ADD
) )
end end