diff --git a/webapp/channels/src/components/user_settings/notifications/user_settings_notifications.tsx b/webapp/channels/src/components/user_settings/notifications/user_settings_notifications.tsx
index 3d667e695d9..2aee8fa5f3c 100644
--- a/webapp/channels/src/components/user_settings/notifications/user_settings_notifications.tsx
+++ b/webapp/channels/src/components/user_settings/notifications/user_settings_notifications.tsx
@@ -64,6 +64,7 @@ type State = {
customKeysWithHighlightInputValue: string;
firstNameKey: boolean;
channelKey: boolean;
+ channelMentionAutoFollow: boolean;
autoResponderActive: boolean;
autoResponderMessage: UserNotifyProps['auto_responder_message'];
notifyCommentsLevel: UserNotifyProps['comments'];
@@ -146,6 +147,7 @@ function getDefaultStateFromProps(props: Props): State {
let usernameKey = false;
let firstNameKey = false;
let channelKey = false;
+ let channelMentionAutoFollow = true;
let isCustomKeysWithNotificationInputChecked = false;
const customKeysWithNotification: MultiInputValue[] = [];
const customKeysWithHighlight: MultiInputValue[] = [];
@@ -182,6 +184,7 @@ function getDefaultStateFromProps(props: Props): State {
firstNameKey = props.user.notify_props?.first_name === 'true';
channelKey = props.user.notify_props?.channel === 'true';
+ channelMentionAutoFollow = props.user.notify_props?.channel_mention_auto_follow_threads !== 'false';
}
return {
@@ -204,6 +207,7 @@ function getDefaultStateFromProps(props: Props): State {
customKeysWithHighlightInputValue: '',
firstNameKey,
channelKey,
+ channelMentionAutoFollow,
autoResponderActive,
autoResponderMessage,
notifyCommentsLevel: comments,
@@ -252,6 +256,7 @@ class NotificationsTab extends React.PureComponent
{
data.auto_responder_message = this.state.autoResponderMessage;
data.first_name = this.state.firstNameKey ? 'true' : 'false';
data.channel = this.state.channelKey ? 'true' : 'false';
+ data.channel_mention_auto_follow_threads = this.state.channelMentionAutoFollow ? 'true' : 'false';
if (this.state.desktopAndMobileSettingsDifferent) {
data.push = this.state.pushActivity;
@@ -359,6 +364,10 @@ class NotificationsTab extends React.PureComponent {
this.setState({channelKey: checked});
};
+ handleChangeForChannelMentionAutoFollowRadio = (value: boolean) => {
+ this.setState({channelMentionAutoFollow: value});
+ };
+
handleChangeForCustomKeysWithNotificationCheckbox = (event: ChangeEvent) => {
const {target: {checked}} = event;
this.setState({isCustomKeysWithNotificationInputChecked: checked});
@@ -487,6 +496,97 @@ class NotificationsTab extends React.PureComponent {
this.props.closeModal();
};
+ createChannelMentionAutoFollowSection = () => {
+ const serverError = this.state.serverError;
+ const isSectionExpanded = this.props.activeSection === UserSettingsNotificationSections.CHANNEL_MENTION_AUTO_FOLLOW;
+
+ let max = null;
+ if (isSectionExpanded) {
+ max = (
+
+
+
+
+
+
+
+
+
+
+ }
+ extraInfo={
+
+
+
+ }
+ submit={this.handleSubmit}
+ saving={this.state.isSaving}
+ serverError={serverError}
+ updateSection={this.handleUpdateSection}
+ />
+ );
+ }
+
+ const describe = this.state.channelMentionAutoFollow ? (
+
+ ) : (
+
+ );
+
+ return (
+
+ );
+ };
+
createKeywordsWithNotificationSection = () => {
const serverError = this.state.serverError;
const user = this.props.user;
@@ -976,6 +1076,7 @@ class NotificationsTab extends React.PureComponent {
};
render() {
+ const channelMentionAutoFollowSection = this.createChannelMentionAutoFollowSection();
const keywordsWithNotificationSection = this.createKeywordsWithNotificationSection();
const keywordsWithHighlightSection = this.createKeywordsWithHighlightSection();
const commentsSection = this.createCommentsSection();
@@ -1080,6 +1181,8 @@ class NotificationsTab extends React.PureComponent {
threads={this.state.emailThreads || ''}
/>
+ {channelMentionAutoFollowSection}
+
{keywordsWithNotificationSection}
{(!this.props.isEnterpriseOrCloudOrSKUStarterFree && this.props.isEnterpriseReady) && (
<>
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 2aaaeb52645..92f16a5a845 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -7262,6 +7262,10 @@
"user.settings.notifications.autoResponderEnabled": "Enabled",
"user.settings.notifications.autoResponderHint": "Set a custom message that will be automatically sent in response to Direct Messages. Mentions in Public and Private Channels will not trigger the automated reply. Enabling Automatic Replies sets your status to Out of Office and disables email and push notifications.",
"user.settings.notifications.autoResponderPlaceholder": "Message",
+ "user.settings.notifications.channelMentionAutoFollow.description": "When enabled, @channel, @all, and @here mentions auto-follow the thread. Disabling stops the auto-follow. Notifications may still trigger based on your keyword settings.",
+ "user.settings.notifications.channelMentionAutoFollow.off": "Off",
+ "user.settings.notifications.channelMentionAutoFollow.on": "On",
+ "user.settings.notifications.channelMentionAutoFollow.title": "Auto-follow threads on channel-wide mentions",
"user.settings.notifications.channelWide": "Channel-wide mentions \"@channel\", \"@all\", \"@here\"",
"user.settings.notifications.comments": "Reply notifications",
"user.settings.notifications.commentsAny": "Trigger notifications on messages in reply threads that I start or participate in",
diff --git a/webapp/channels/src/utils/constants.tsx b/webapp/channels/src/utils/constants.tsx
index c6bb98dc5ee..6769f3ad018 100644
--- a/webapp/channels/src/utils/constants.tsx
+++ b/webapp/channels/src/utils/constants.tsx
@@ -967,6 +967,7 @@ export const UserSettingsNotificationSections = {
DESKTOP_AND_MOBILE: 'desktopAndMobile',
DESKTOP_NOTIFICATION_SOUND: 'desktopNotificationSound',
EMAIL: 'email',
+ CHANNEL_MENTION_AUTO_FOLLOW: 'channelMentionAutoFollow',
KEYWORDS_MENTIONS: 'keywordsAndMentions',
KEYWORDS_HIGHLIGHT: 'keywordsAndHighlight',
REPLY_NOTIFCATIONS: 'replyNotifications',
diff --git a/webapp/platform/types/src/users.ts b/webapp/platform/types/src/users.ts
index 328f2fb2f23..09a7608b270 100644
--- a/webapp/platform/types/src/users.ts
+++ b/webapp/platform/types/src/users.ts
@@ -30,6 +30,7 @@ export type UserNotifyProps = {
auto_responder_message?: string;
calls_mobile_sound?: 'true' | 'false' | '';
calls_mobile_notification_sound?: 'Dynamic' | 'Calm' | 'Urgent' | 'Cheerful' | '';
+ channel_mention_auto_follow_threads?: 'true' | 'false';
};
export type UserProfile = {