diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-03-20 10:12:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-20 10:12:43 -0400 |
commit | dcdea9b54c14329e47a0cb7c6dffb9da765b35c6 (patch) | |
tree | 7778199d0c3e611ca88d60b6ec6dcce1b08c2091 | |
parent | 1ef071af6bcb6e97247860879f74556a66fe9987 (diff) | |
download | chat-dcdea9b54c14329e47a0cb7c6dffb9da765b35c6.tar.gz chat-dcdea9b54c14329e47a0cb7c6dffb9da765b35c6.tar.bz2 chat-dcdea9b54c14329e47a0cb7c6dffb9da765b35c6.zip |
Fix compile error on master (#5813)
-rw-r--r-- | api4/channel.go | 2 | ||||
-rw-r--r-- | app/channel.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/api4/channel.go b/api4/channel.go index 61d9e6f53..a4820d729 100644 --- a/api4/channel.go +++ b/api4/channel.go @@ -535,7 +535,7 @@ func addChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { return } - if cm, err := app.AddChannelMember(member.UserId, channel, c.Session.UserId); err != nil { + if cm, err := app.AddChannelMember(member.UserId, channel, c.Session.UserId, c.GetSiteURL()); err != nil { c.Err = err return } else { diff --git a/app/channel.go b/app/channel.go index a55805303..d66624f2c 100644 --- a/app/channel.go +++ b/app/channel.go @@ -446,7 +446,7 @@ func AddUserToChannel(user *model.User, channel *model.Channel) (*model.ChannelM return newMember, nil } -func AddChannelMember(userId string, channel *model.Channel, userRequestorId string) (*model.ChannelMember, *model.AppError) { +func AddChannelMember(userId string, channel *model.Channel, userRequestorId, siteURL string) (*model.ChannelMember, *model.AppError) { var user *model.User var err *model.AppError @@ -464,7 +464,7 @@ func AddChannelMember(userId string, channel *model.Channel, userRequestorId str return nil, err } - go PostAddToChannelMessage(userRequestor, user, channel) + go PostAddToChannelMessage(userRequestor, user, channel, siteURL) UpdateChannelLastViewedAt([]string{channel.Id}, userRequestor.Id) |