From 58b135d6d30c7440f77b7d22e97a360bf8cd1cfd Mon Sep 17 00:00:00 2001 From: Roman Rizzi Date: Thu, 11 Aug 2022 11:33:41 -0300 Subject: [PATCH] DEV:Using symbols is deprecated, use strings instead (#17874) --- app/jobs/regular/publish_group_membership_updates.rb | 5 +++-- app/models/group.rb | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/jobs/regular/publish_group_membership_updates.rb b/app/jobs/regular/publish_group_membership_updates.rb index a9bc5dc93ea..6b93e87a0b2 100644 --- a/app/jobs/regular/publish_group_membership_updates.rb +++ b/app/jobs/regular/publish_group_membership_updates.rb @@ -3,12 +3,13 @@ module Jobs class PublishGroupMembershipUpdates < ::Jobs::Base 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]) 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| if added_members diff --git a/app/models/group.rb b/app/models/group.rb index 1228288ca5e..aa6fdc0220b 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -103,6 +103,9 @@ class Group < ActiveRecord::Base AUTO_GROUP_IDS = Hash[*AUTO_GROUPS.to_a.flatten.reverse] STAFF_GROUPS = [:admins, :moderators, :staff] + AUTO_GROUPS_ADD = "add" + AUTO_GROUPS_REMOVE = "remove" + IMAP_SETTING_ATTRIBUTES = [ "imap_server", "imap_port", @@ -493,7 +496,7 @@ class Group < ActiveRecord::Base if removed_user_ids.present? Jobs.enqueue( :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 @@ -526,7 +529,7 @@ class Group < ActiveRecord::Base if added_user_ids.present? Jobs.enqueue( :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