summaryrefslogtreecommitdiffstats
path: root/app/notification.go
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-03-10 05:18:18 -0500
committerGeorge Goldberg <george@gberg.me>2017-03-10 10:18:18 +0000
commita8e68bd8905972ae59de90fa33d5b3e3c274dc47 (patch)
treec809d33800262830f2497813fcea2c5bb482ac1b /app/notification.go
parent43e5bbea372cb2c4a98d00fae19cdabd165a8f48 (diff)
downloadchat-a8e68bd8905972ae59de90fa33d5b3e3c274dc47.tar.gz
chat-a8e68bd8905972ae59de90fa33d5b3e3c274dc47.tar.bz2
chat-a8e68bd8905972ae59de90fa33d5b3e3c274dc47.zip
PLT-5765 Passed SiteURL to SendNotifications (#5705)
Diffstat (limited to 'app/notification.go')
-rw-r--r--app/notification.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/notification.go b/app/notification.go
index 1dd3fedb2..67959c6bc 100644
--- a/app/notification.go
+++ b/app/notification.go
@@ -24,7 +24,7 @@ import (
"github.com/nicksnyder/go-i18n/i18n"
)
-func SendNotifications(post *model.Post, team *model.Team, channel *model.Channel, sender *model.User) ([]string, *model.AppError) {
+func SendNotifications(post *model.Post, team *model.Team, channel *model.Channel, sender *model.User, siteURL string) ([]string, *model.AppError) {
pchan := Srv.Store.User().GetAllProfilesInChannel(channel.Id, true)
cmnchan := Srv.Store.Channel().GetAllChannelMembersNotifyPropsForChannel(channel.Id, true)
var fchan store.StoreChannel
@@ -171,7 +171,7 @@ func SendNotifications(post *model.Post, team *model.Team, channel *model.Channe
}
if userAllowsEmails && status.Status != model.STATUS_ONLINE && profileMap[id].DeleteAt == 0 {
- sendNotificationEmail(post, profileMap[id], channel, team, senderName, sender)
+ sendNotificationEmail(post, profileMap[id], channel, team, senderName, sender, siteURL)
}
}
}
@@ -317,7 +317,7 @@ func SendNotifications(post *model.Post, team *model.Team, channel *model.Channe
return mentionedUsersList, nil
}
-func sendNotificationEmail(post *model.Post, user *model.User, channel *model.Channel, team *model.Team, senderName string, sender *model.User) *model.AppError {
+func sendNotificationEmail(post *model.Post, user *model.User, channel *model.Channel, team *model.Team, senderName string, sender *model.User, siteURL string) *model.AppError {
if channel.IsGroupOrDirect() && channel.TeamId != team.Id {
// this message is a cross-team DM/GM so we need to find a team that the recipient is on to use in the link
if result := <-Srv.Store.Team().GetTeamsByUserId(user.Id); result.Err != nil {
@@ -368,7 +368,7 @@ func sendNotificationEmail(post *model.Post, user *model.User, channel *model.Ch
var mailTemplate string
var mailParameters map[string]interface{}
- teamURL := utils.GetSiteURL() + "/" + team.Name
+ teamURL := siteURL + "/" + team.Name
tm := time.Unix(post.CreateAt/1000, 0)
userLocale := utils.GetUserTranslations(user.Locale)
@@ -406,7 +406,7 @@ func sendNotificationEmail(post *model.Post, user *model.User, channel *model.Ch
subject := fmt.Sprintf("[%v] %v", utils.Cfg.TeamSettings.SiteName, userLocale(mailTemplate, mailParameters))
bodyPage := utils.NewHTMLTemplate("post_body", user.Locale)
- bodyPage.Props["SiteURL"] = utils.GetSiteURL()
+ bodyPage.Props["SiteURL"] = siteURL
bodyPage.Props["PostMessage"] = GetMessageForNotification(post, userLocale)
if team.Name != "select_team" {
bodyPage.Props["TeamLink"] = teamURL + "/pl/" + post.Id