opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-24 16:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile error on master (#5813)

Browse Source
This commit is contained in:
Joram Wilander
2017-03-20 10:12:43 -04:00
committed by GitHub
parent 1ef071af6b
commit dcdea9b54c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api4/channel.go
+1 -1
View File
@@ -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 {
app/channel.go
+2 -2
View File
@@ -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)