From baf9f69c273c67d8c1569c6bab9376d21971d8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Mondrag=C3=B3n?=
 <79058848+julmondragon@users.noreply.github.com>
Date: Wed, 30 Mar 2022 12:07:03 -0500
Subject: [PATCH] MM-41407_Remove FF for MM-39053 Default Notifications
 (#19851)

---
 app/users/users.go     | 9 ---------
 model/feature_flags.go | 4 ----
 2 files changed, 13 deletions(-)

diff --git a/app/users/users.go b/app/users/users.go
index 2c208a62fc..b374d24f96 100644
--- a/app/users/users.go
+++ b/app/users/users.go
@@ -63,15 +63,6 @@ func (us *UserService) createUser(user *model.User) (*model.User, error) {
 		return nil, err
 	}
 
-	if us.config().FeatureFlags.NewAccountNoisy {
-		user.SetDefaultNotifications()
-		user.NotifyProps[model.DesktopNotifyProp] = model.UserNotifyAll
-		user.NotifyProps[model.PushNotifyProp] = model.UserNotifyAll
-		user.NotifyProps[model.ChannelMentionsNotifyProp] = "true"
-		user.NotifyProps[model.MentionKeysNotifyProp] = user.Username
-		user.NotifyProps[model.FirstNameNotifyProp] = "true"
-	}
-
 	ruser, err := us.store.Save(user)
 	if err != nil {
 		return nil, err
diff --git a/model/feature_flags.go b/model/feature_flags.go
index 0469c85274..2f3949d48a 100644
--- a/model/feature_flags.go
+++ b/model/feature_flags.go
@@ -38,9 +38,6 @@ type FeatureFlags struct {
 
 	PermalinkPreviews bool
 
-	// Determine whether when a user gets created, they'll have noisy notifications e.g. Send desktop notifications for all activity
-	NewAccountNoisy bool
-
 	// Enable Calls plugin support in the mobile app
 	CallsMobile bool
 
@@ -85,7 +82,6 @@ func (f *FeatureFlags) SetDefaults() {
 	f.PluginApps = ""
 	f.PluginFocalboard = ""
 	f.PermalinkPreviews = true
-	f.NewAccountNoisy = false
 	f.CallsMobile = false
 	f.BoardsFeatureFlags = ""
 	f.AddMembersToChannel = "top"