From 98284a79eb787fb78124ccc3f67b49b1a22476bf Mon Sep 17 00:00:00 2001
From: darkLord19 <umangjparmar@gmail.com>
Date: Thu, 14 Oct 2021 21:24:09 +0530
Subject: [PATCH] remove timedDND feature flag (#18346)

---
 api4/status.go         |  6 +-----
 app/server.go          | 18 ------------------
 model/feature_flags.go |  4 ----
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/api4/status.go b/api4/status.go
index 8bca2eb83a..e9fd83b2d8 100644
--- a/api4/status.go
+++ b/api4/status.go
@@ -114,11 +114,7 @@ func updateUserStatus(c *Context, w http.ResponseWriter, r *http.Request) {
 	case "away":
 		c.App.SetStatusAwayIfNeeded(c.Params.UserId, true)
 	case "dnd":
-		if c.App.Config().FeatureFlags.TimedDND {
-			c.App.SetStatusDoNotDisturbTimed(c.Params.UserId, status.DNDEndTime)
-		} else {
-			c.App.SetStatusDoNotDisturb(c.Params.UserId)
-		}
+		c.App.SetStatusDoNotDisturbTimed(c.Params.UserId, status.DNDEndTime)
 	default:
 		c.SetInvalidParam("status")
 		return
diff --git a/app/server.go b/app/server.go
index e970d285b9..56688be735 100644
--- a/app/server.go
+++ b/app/server.go
@@ -716,15 +716,6 @@ func NewServer(options ...Option) (*Server, error) {
 		}
 	})
 
-	s.AddConfigListener(func(oldCfg, newCfg *model.Config) {
-		if !oldCfg.FeatureFlags.TimedDND && newCfg.FeatureFlags.TimedDND {
-			runDNDStatusExpireJob(app)
-		}
-		if oldCfg.FeatureFlags.TimedDND && !newCfg.FeatureFlags.TimedDND {
-			stopDNDStatusExpireJob(app)
-		}
-	})
-
 	return s, nil
 }
 
@@ -2289,9 +2280,6 @@ func cancelDNDStatusExpirationRecurringTask(a *App) {
 }
 
 func runDNDStatusExpireJob(a *App) {
-	if !a.Config().FeatureFlags.TimedDND {
-		return
-	}
 	if a.IsLeader() {
 		createDNDStatusExpirationRecurringTask(a)
 	}
@@ -2304,9 +2292,3 @@ func runDNDStatusExpireJob(a *App) {
 		}
 	})
 }
-
-func stopDNDStatusExpireJob(a *App) {
-	if a.IsLeader() {
-		cancelDNDStatusExpirationRecurringTask(a)
-	}
-}
diff --git a/model/feature_flags.go b/model/feature_flags.go
index 62b260bd77..7a81afdf2f 100644
--- a/model/feature_flags.go
+++ b/model/feature_flags.go
@@ -33,9 +33,6 @@ type FeatureFlags struct {
 	PluginApps       string `plugin_id:"com.mattermost.apps"`
 	PluginFocalboard string `plugin_id:"focalboard"`
 
-	// Enable timed dnd support for user status
-	TimedDND bool
-
 	PermalinkPreviews bool
 
 	// Enable the Global Header
@@ -63,7 +60,6 @@ func (f *FeatureFlags) SetDefaults() {
 	f.AppsEnabled = false
 	f.PluginApps = ""
 	f.PluginFocalboard = ""
-	f.TimedDND = false
 	f.PermalinkPreviews = true
 	f.GlobalHeader = true
 	f.AddChannelButton = "by_team_name"