remove timedDND feature flag (#18346)

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)
-			c.App.SetStatusDoNotDisturbTimed(c.Params.UserId, status.DNDEndTime)
-		} else {
-			c.App.SetStatusDoNotDisturb(c.Params.UserId)
-		}
 	default:
 		c.SetInvalidParam("status")
 		return

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)
-	}
-}

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"