From 3efd28c2ab648a8a2f232bfab03c0f46a655b6c3 Mon Sep 17 00:00:00 2001
From: Brad Coughlin <brad@bradcoughlin.com>
Date: Wed, 13 Mar 2019 17:45:48 -0700
Subject: [PATCH] [MM-14502] Add experimental flag to enable click-to-reply
 (#10415)

---
 config/client.go    | 1 +
 config/default.json | 3 ++-
 model/config.go     | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/config/client.go b/config/client.go
index e798b075fc..cfa966ab36 100644
--- a/config/client.go
+++ b/config/client.go
@@ -44,6 +44,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
 
 	// This setting is only temporary, so keep using the old setting name for the mobile and web apps
 	props["ExperimentalEnablePostMetadata"] = strconv.FormatBool(!*c.ExperimentalSettings.DisablePostMetadata)
+	props["ExperimentalEnableClickToReply"] = strconv.FormatBool(*c.ExperimentalSettings.EnableClickToReply)
 
 	if *c.ServiceSettings.ExperimentalChannelOrganization || *c.ServiceSettings.ExperimentalGroupUnreadChannels != model.GROUP_UNREAD_CHANNELS_DISABLED {
 		props["ExperimentalChannelOrganization"] = strconv.FormatBool(true)
diff --git a/config/default.json b/config/default.json
index 41fe64a1f2..566ef0537f 100644
--- a/config/default.json
+++ b/config/default.json
@@ -361,7 +361,8 @@
         "ClientSideCertCheck": "secondary",
         "DisablePostMetadata": false,
         "LinkMetadataTimeoutMilliseconds": 5000,
-        "RestrictSystemAdmin": false
+        "RestrictSystemAdmin": false,
+        "EnableClickToReply": false
     },
     "AnalyticsSettings": {
         "MaxUsersForStatistics": 2500
diff --git a/model/config.go b/model/config.go
index 3d316ffb22..0bba2cdfb4 100644
--- a/model/config.go
+++ b/model/config.go
@@ -717,6 +717,7 @@ type ExperimentalSettings struct {
 	ClientSideCertEnable            *bool
 	ClientSideCertCheck             *string
 	DisablePostMetadata             *bool
+	EnableClickToReply              *bool
 	LinkMetadataTimeoutMilliseconds *int64
 	RestrictSystemAdmin             *bool
 }
@@ -734,6 +735,10 @@ func (s *ExperimentalSettings) SetDefaults() {
 		s.DisablePostMetadata = NewBool(false)
 	}
 
+	if s.EnableClickToReply == nil {
+		s.EnableClickToReply = NewBool(false)
+	}
+
 	if s.LinkMetadataTimeoutMilliseconds == nil {
 		s.LinkMetadataTimeoutMilliseconds = NewInt64(EXPERIMENTAL_SETTINGS_DEFAULT_LINK_METADATA_TIMEOUT_MILLISECONDS)
 	}