diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-04-28 10:56:19 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-04-28 10:56:19 -0400 |
| commit | 383cddd3d14107fabea28e09f5f9401623cd19d5 (patch) | |
| tree | f0aedc438756bf41aa29aa5f3518e83f40e95da1 /store | |
| parent | 3dbb5ab4cca74de7d7a00909927e1f034949052d (diff) | |
| download | chat-383cddd3d14107fabea28e09f5f9401623cd19d5.tar.gz chat-383cddd3d14107fabea28e09f5f9401623cd19d5.tar.bz2 chat-383cddd3d14107fabea28e09f5f9401623cd19d5.zip | |
Don't return error if already part of channel being joined (#2814)
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_channel_store.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 46f56e7eb..6d549c7f0 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -12,6 +12,7 @@ import ( const ( MISSING_CHANNEL_ERROR = "store.sql_channel.get_by_name.missing.app_error" + MISSING_MEMBER_ERROR = "store.sql_channel.get_member.missing.app_error" ) type SqlChannelStore struct { @@ -572,9 +573,13 @@ func (s SqlChannelStore) GetMember(channelId string, userId string) StoreChannel result := StoreResult{} var member model.ChannelMember - err := s.GetReplica().SelectOne(&member, "SELECT * FROM ChannelMembers WHERE ChannelId = :ChannelId AND UserId = :UserId", map[string]interface{}{"ChannelId": channelId, "UserId": userId}) - if err != nil { - result.Err = model.NewLocAppError("SqlChannelStore.GetMember", "store.sql_channel.get_member.app_error", nil, "channel_id="+channelId+"user_id="+userId+","+err.Error()) + + if err := s.GetReplica().SelectOne(&member, "SELECT * FROM ChannelMembers WHERE ChannelId = :ChannelId AND UserId = :UserId", map[string]interface{}{"ChannelId": channelId, "UserId": userId}); err != nil { + if err == sql.ErrNoRows { + result.Err = model.NewLocAppError("SqlChannelStore.GetMember", MISSING_MEMBER_ERROR, nil, "channel_id="+channelId+"user_id="+userId+","+err.Error()) + } else { + result.Err = model.NewLocAppError("SqlChannelStore.GetMember", "store.sql_channel.get_member.app_error", nil, "channel_id="+channelId+"user_id="+userId+","+err.Error()) + } } else { result.Data = member } |