From c7bdce8a6641ed8d361a43b6004a351535c78423 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 4 Apr 2017 11:54:52 -0400 Subject: PLT-5900 Removed automatic configuration of SiteURL (#5952) * Revert "PLT-5765 Passed SiteURL to SendNotifications (#5705)" This reverts commit a8e68bd8905972ae59de90fa33d5b3e3c274dc47. * Removed automatic configuration of SiteURL * Reverted unintentional config changes * Updated help text * Added link to docs in Site URL warning * Fixed merge conflict --- api/channel.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'api/channel.go') diff --git a/api/channel.go b/api/channel.go index d408e9478..0db3499e0 100644 --- a/api/channel.go +++ b/api/channel.go @@ -207,7 +207,7 @@ func updateChannel(c *Context, w http.ResponseWriter, r *http.Request) { return } else { if oldChannelDisplayName != channel.DisplayName { - if err := app.PostUpdateChannelDisplayNameMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelDisplayName, channel.DisplayName, c.GetSiteURL()); err != nil { + if err := app.PostUpdateChannelDisplayNameMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelDisplayName, channel.DisplayName); err != nil { l4g.Error(err.Error()) } } @@ -255,7 +255,7 @@ func updateChannelHeader(c *Context, w http.ResponseWriter, r *http.Request) { c.Err = err return } else { - if err := app.PostUpdateChannelHeaderMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelHeader, channelHeader, c.GetSiteURL()); err != nil { + if err := app.PostUpdateChannelHeaderMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelHeader, channelHeader); err != nil { l4g.Error(err.Error()) } c.LogAudit("name=" + channel.Name) @@ -301,7 +301,7 @@ func updateChannelPurpose(c *Context, w http.ResponseWriter, r *http.Request) { c.Err = err return } else { - if err := app.PostUpdateChannelPurposeMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelPurpose, channelPurpose, c.GetSiteURL()); err != nil { + if err := app.PostUpdateChannelPurposeMessage(c.Session.UserId, channel.Id, c.TeamId, oldChannelPurpose, channelPurpose); err != nil { l4g.Error(err.Error()) } c.LogAudit("name=" + channel.Name) @@ -412,7 +412,7 @@ func join(c *Context, w http.ResponseWriter, r *http.Request) { } } - if err = app.JoinChannel(channel, c.Session.UserId, c.GetSiteURL()); err != nil { + if err = app.JoinChannel(channel, c.Session.UserId); err != nil { c.Err = err return } @@ -425,7 +425,7 @@ func leave(c *Context, w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) id := params["channel_id"] - err := app.LeaveChannel(id, c.Session.UserId, c.GetSiteURL()) + err := app.LeaveChannel(id, c.Session.UserId) if err != nil { c.Err = err return @@ -467,7 +467,7 @@ func deleteChannel(c *Context, w http.ResponseWriter, r *http.Request) { } } - err = app.DeleteChannel(channel, c.Session.UserId, c.GetSiteURL()) + err = app.DeleteChannel(channel, c.Session.UserId) if err != nil { c.Err = err return @@ -663,7 +663,7 @@ func addMember(c *Context, w http.ResponseWriter, r *http.Request) { return } - go app.PostAddToChannelMessage(oUser, nUser, channel, c.GetSiteURL()) + go app.PostAddToChannelMessage(oUser, nUser, channel) app.UpdateChannelLastViewedAt([]string{id}, oUser.Id) w.Write([]byte(cm.ToJson())) @@ -698,7 +698,7 @@ func removeMember(c *Context, w http.ResponseWriter, r *http.Request) { return } - if err = app.RemoveUserFromChannel(userIdToRemove, c.Session.UserId, channel, c.GetSiteURL()); err != nil { + if err = app.RemoveUserFromChannel(userIdToRemove, c.Session.UserId, channel); err != nil { c.Err = err return } -- cgit v1.2.3-1-g7c22