From a8e68bd8905972ae59de90fa33d5b3e3c274dc47 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Fri, 10 Mar 2017 05:18:18 -0500 Subject: PLT-5765 Passed SiteURL to SendNotifications (#5705) --- cmd/platform/channel.go | 2 +- cmd/platform/oldcommands.go | 6 +++--- cmd/platform/team.go | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'cmd') diff --git a/cmd/platform/channel.go b/cmd/platform/channel.go index b99486242..2510f90f3 100644 --- a/cmd/platform/channel.go +++ b/cmd/platform/channel.go @@ -168,7 +168,7 @@ func removeUserFromChannel(channel *model.Channel, user *model.User, userArg str CommandPrintErrorln("Can't find user '" + userArg + "'") return } - if err := app.RemoveUserFromChannel(user.Id, "", channel); err != nil { + if err := app.RemoveUserFromChannel(user.Id, "", channel, utils.GetSiteURL()); err != nil { CommandPrintErrorln("Unable to remove '" + userArg + "' from " + channel.Name + ". Error: " + err.Error()) } } diff --git a/cmd/platform/oldcommands.go b/cmd/platform/oldcommands.go index 518dcbaaf..18758cc61 100644 --- a/cmd/platform/oldcommands.go +++ b/cmd/platform/oldcommands.go @@ -274,7 +274,7 @@ func cmdCreateUser() { } if team != nil { - err = app.JoinUserToTeam(team, ruser) + err = app.JoinUserToTeam(team, ruser, utils.GetSiteURL()) if err != nil { l4g.Error("%v", err) flushLogAndExit(1) @@ -546,7 +546,7 @@ func cmdLeaveChannel() { channel = result.Data.(*model.Channel) } - err := app.RemoveUserFromChannel(user.Id, user.Id, channel) + err := app.RemoveUserFromChannel(user.Id, user.Id, channel, utils.GetSiteURL()) if err != nil { l4g.Error("%v", err) flushLogAndExit(1) @@ -673,7 +673,7 @@ func cmdJoinTeam() { user = result.Data.(*model.User) } - err := app.JoinUserToTeam(team, user) + err := app.JoinUserToTeam(team, user, utils.GetSiteURL()) if err != nil { l4g.Error("%v", err) flushLogAndExit(1) diff --git a/cmd/platform/team.go b/cmd/platform/team.go index 1dc5d46eb..6dab2ad16 100644 --- a/cmd/platform/team.go +++ b/cmd/platform/team.go @@ -8,6 +8,7 @@ import ( "github.com/mattermost/platform/app" "github.com/mattermost/platform/model" + "github.com/mattermost/platform/utils" "github.com/spf13/cobra" ) @@ -154,7 +155,7 @@ func addUserToTeam(team *model.Team, user *model.User, userArg string) { CommandPrintErrorln("Can't find user '" + userArg + "'") return } - if err := app.JoinUserToTeam(team, user); err != nil { + if err := app.JoinUserToTeam(team, user, utils.GetSiteURL()); err != nil { CommandPrintErrorln("Unable to add '" + userArg + "' to " + team.Name) } } -- cgit v1.2.3-1-g7c22