diff options
| author | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
| commit | 7f266c19511171f509ae8a60170de10c8d10b41e (patch) | |
| tree | 04cd68ac4722313abec3ea47cc7cda229e463b1d /app/command_join.go | |
| parent | bfae88e60c7a623afae82e06ce1421ca778c06e7 (diff) | |
| parent | 8568afe5b4fb4d26b14fbc0d21f088eaa490b314 (diff) | |
| download | chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.gz chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.bz2 chat-7f266c19511171f509ae8a60170de10c8d10b41e.zip | |
Merge branch 'release-3.7' into master.
Diffstat (limited to 'app/command_join.go')
| -rw-r--r-- | app/command_join.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/command_join.go b/app/command_join.go index 5b19dd7a0..e7d25aa16 100644 --- a/app/command_join.go +++ b/app/command_join.go @@ -45,7 +45,7 @@ func (me *JoinProvider) DoCommand(args *model.CommandArgs, message string) *mode return &model.CommandResponse{Text: args.T("api.command_join.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } - if err := JoinChannel(channel, args.UserId); err != nil { + if err := JoinChannel(channel, args.UserId, args.SiteURL); err != nil { return &model.CommandResponse{Text: args.T("api.command_join.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } |