From 9c2d33bda0cd802571357e1ebc46bbf59cd58f62 Mon Sep 17 00:00:00 2001 From: Michael Kohl Date: Thu, 23 Sep 2021 21:02:27 +0700 Subject: [PATCH] Check Connect feature flag in more places (#14795) --- app/models/organization_membership.rb | 2 ++ app/services/tag_moderators/add.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/organization_membership.rb b/app/models/organization_membership.rb index 79974f00f..088e4a040 100644 --- a/app/models/organization_membership.rb +++ b/app/models/organization_membership.rb @@ -31,6 +31,8 @@ class OrganizationMembership < ApplicationRecord end def add_chat_channel_membership(user, channel, role) + return unless FeatureFlag.enabled?(:connect) + membership = ChatChannelMembership.find_or_initialize_by(user_id: user.id, chat_channel_id: channel.id) membership.role = role membership.save diff --git a/app/services/tag_moderators/add.rb b/app/services/tag_moderators/add.rb index 9c631fbcf..42b3cc663 100644 --- a/app/services/tag_moderators/add.rb +++ b/app/services/tag_moderators/add.rb @@ -15,7 +15,7 @@ module TagModerators tag = Tag.find(tag_ids[index]) add_tag_mod_role(user, tag) ::TagModerators::AddTrustedRole.call(user) - add_to_chat_channels(user, tag) + add_to_chat_channels(user, tag) if FeatureFlag.enabled?(:connect) tag.update(supported: true) unless tag.supported? NotifyMailer