From 8e221c1895fc42a41edc73c2e9fc09e3c98aaf43 Mon Sep 17 00:00:00 2001 From: Jason Blais <13119842+jasonblais@users.noreply.github.com> Date: Mon, 14 Dec 2020 23:15:17 -0500 Subject: [PATCH] [MM-31018] Update email address for admin advisor contact requests to support-advisor@mattermost.com (#16443) Automatic Merge --- app/app.go | 4 ++-- app/integration_action.go | 2 +- model/config.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/app.go b/app/app.go index d52d27c481..0c39c7d8f3 100644 --- a/app/app.go +++ b/app/app.go @@ -483,8 +483,8 @@ func (a *App) NotifyAndSetWarnMetricAck(warnMetricId string, sender *model.User, subject := T("api.templates.warn_metric_ack.subject") bodyPage.Props["Title"] = warnMetricDisplayTexts.EmailBody - if err := mailservice.SendMailUsingConfig(model.MM_SUPPORT_ADDRESS, subject, bodyPage.Render(), a.Config(), false, sender.Email); err != nil { - mlog.Error("Error while sending email", mlog.String("destination email", model.MM_SUPPORT_ADDRESS), mlog.Err(err)) + if err := mailservice.SendMailUsingConfig(model.MM_SUPPORT_ADVISOR_ADDRESS, subject, bodyPage.Render(), a.Config(), false, sender.Email); err != nil { + mlog.Error("Error while sending email", mlog.String("destination email", model.MM_SUPPORT_ADVISOR_ADDRESS), mlog.Err(err)) return model.NewAppError("NotifyAndSetWarnMetricAck", "api.email.send_warn_metric_ack.failure.app_error", map[string]interface{}{"Error": err.Error()}, "", http.StatusInternalServerError) } } diff --git a/app/integration_action.go b/app/integration_action.go index b05d52c3a6..7b71f5d172 100644 --- a/app/integration_action.go +++ b/app/integration_action.go @@ -554,7 +554,7 @@ func (a *App) buildWarnMetricMailtoLink(warnMetricId string, user *model.User) s mailToLinkContent := &MailToLinkContent{ MetricId: warnMetricId, - MailRecipient: "support@mattermost.com", + MailRecipient: model.MM_SUPPORT_ADVISOR_ADDRESS, MailCC: user.Email, MailSubject: T("api.server.warn_metric.bot_response.mailto_subject"), MailBody: mailBody, diff --git a/model/config.go b/model/config.go index 5ae21a088f..a5a78af389 100644 --- a/model/config.go +++ b/model/config.go @@ -50,7 +50,7 @@ const ( GENERIC_NO_CHANNEL_NOTIFICATION = "generic_no_channel" GENERIC_NOTIFICATION = "generic" GENERIC_NOTIFICATION_SERVER = "https://push-test.mattermost.com" - MM_SUPPORT_ADDRESS = "support@mattermost.com" + MM_SUPPORT_ADVISOR_ADDRESS = "support-advisor@mattermost.com" FULL_NOTIFICATION = "full" ID_LOADED_NOTIFICATION = "id_loaded"