summaryrefslogtreecommitdiffstats
path: root/app/user.go
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-04-04 18:19:42 +0100
committerGitHub <noreply@github.com>2017-04-04 18:19:42 +0100
commit32460bf63bc07c69ee5da0bb5640b879facb5538 (patch)
tree2ee6abc94175823632e9f9ab40172948fcfa0f85 /app/user.go
parent0b5c0794fdcbb551c1233dcdfbdf5c7deb585fd6 (diff)
downloadchat-32460bf63bc07c69ee5da0bb5640b879facb5538.tar.gz
chat-32460bf63bc07c69ee5da0bb5640b879facb5538.tar.bz2
chat-32460bf63bc07c69ee5da0bb5640b879facb5538.zip
PLT-6198: Use added to channel system message on default channels. (#5969)
Use a different sytem message when a user was added to a default channel by someone else than when they joined themselves.
Diffstat (limited to 'app/user.go')
-rw-r--r--app/user.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/user.go b/app/user.go
index d995e90fe..99e9d46a3 100644
--- a/app/user.go
+++ b/app/user.go
@@ -63,7 +63,7 @@ func CreateUserWithHash(user *model.User, hash string, data string) (*model.User
return nil, err
}
- if err := JoinUserToTeam(team, ruser); err != nil {
+ if err := JoinUserToTeam(team, ruser, ""); err != nil {
return nil, err
}
@@ -92,7 +92,7 @@ func CreateUserWithInviteId(user *model.User, inviteId string) (*model.User, *mo
return nil, err
}
- if err := JoinUserToTeam(team, ruser); err != nil {
+ if err := JoinUserToTeam(team, ruser, ""); err != nil {
return nil, err
}