diff options
author | =Corey Hulen <corey@hulen.com> | 2016-04-28 17:03:59 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-04-28 17:03:59 -0700 |
commit | 62901defaebb8f3524bdfcad86b2576cfd9fe587 (patch) | |
tree | b0740451c56c68c5284834fd02bbce4d831acc17 /api/channel.go | |
parent | ad9dfc9c42b6597515d9eb0a96e9f069372dffdd (diff) | |
parent | f3fa435a1b35c2ada4cd9a81744a41904fe97909 (diff) | |
download | chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.gz chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.bz2 chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.zip |
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'api/channel.go')
-rw-r--r-- | api/channel.go | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/api/channel.go b/api/channel.go index 4b0e99b20..5f0d03246 100644 --- a/api/channel.go +++ b/api/channel.go @@ -513,9 +513,18 @@ func AddUserToChannel(user *model.User, channel *model.Channel) (*model.ChannelM return nil, model.NewLocAppError("AddUserToChannel", "api.channel.add_user_to_channel.type.app_error", nil, "") } + if result := <-Srv.Store.Channel().GetMember(channel.Id, user.Id); result.Err != nil { + if result.Err.Id != store.MISSING_MEMBER_ERROR { + return nil, result.Err + } + } else { + channelMember := result.Data.(model.ChannelMember) + return &channelMember, nil + } + newMember := &model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, NotifyProps: model.GetDefaultChannelNotifyProps()} - if cmresult := <-Srv.Store.Channel().SaveMember(newMember); cmresult.Err != nil { - l4g.Error("Failed to add member user_id=%v channel_id=%v err=%v", user.Id, channel.Id, cmresult.Err) + if result := <-Srv.Store.Channel().SaveMember(newMember); result.Err != nil { + l4g.Error("Failed to add member user_id=%v channel_id=%v err=%v", user.Id, channel.Id, result.Err) return nil, model.NewLocAppError("AddUserToChannel", "api.channel.add_user.to.channel.failed.app_error", nil, "") } |