From 383cddd3d14107fabea28e09f5f9401623cd19d5 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 28 Apr 2016 10:56:19 -0400 Subject: Don't return error if already part of channel being joined (#2814) --- api/channel.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'api/channel.go') 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, "") } -- cgit v1.2.3-1-g7c22