diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-02-10 11:10:14 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-02-10 11:10:14 -0500 |
| commit | 7410dfb93198f2d74aebf5efea83a16f4561df42 (patch) | |
| tree | b2273a1a2a4cd07c0172004fd9353317a7499507 /store/sql_channel_store.go | |
| parent | 6bfb90ccc54ec12f7991de2af6504f2807a97339 (diff) | |
| parent | 1eab2ef39350c1035864918f366ab593d23e0f5a (diff) | |
| download | chat-7410dfb93198f2d74aebf5efea83a16f4561df42.tar.gz chat-7410dfb93198f2d74aebf5efea83a16f4561df42.tar.bz2 chat-7410dfb93198f2d74aebf5efea83a16f4561df42.zip | |
Merge pull request #2130 from hmhealey/extrainfo
RC2 - Stopped returning inactive members with getExtraInfo calls
Diffstat (limited to 'store/sql_channel_store.go')
| -rw-r--r-- | store/sql_channel_store.go | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 8b52dae12..87ee2bb11 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -615,9 +615,36 @@ func (s SqlChannelStore) GetExtraMembers(channelId string, limit int) StoreChann var err error if limit != -1 { - _, err = s.GetReplica().Select(&members, "SELECT Id, Nickname, Email, ChannelMembers.Roles, Username FROM ChannelMembers, Users WHERE ChannelMembers.UserId = Users.Id AND ChannelId = :ChannelId LIMIT :Limit", map[string]interface{}{"ChannelId": channelId, "Limit": limit}) + _, err = s.GetReplica().Select(&members, ` + SELECT + Id, + Nickname, + Email, + ChannelMembers.Roles, + Username + FROM + ChannelMembers, + Users + WHERE + ChannelMembers.UserId = Users.Id + AND Users.DeleteAt = 0 + AND ChannelId = :ChannelId + LIMIT :Limit`, map[string]interface{}{"ChannelId": channelId, "Limit": limit}) } else { - _, err = s.GetReplica().Select(&members, "SELECT Id, Nickname, Email, ChannelMembers.Roles, Username FROM ChannelMembers, Users WHERE ChannelMembers.UserId = Users.Id AND ChannelId = :ChannelId", map[string]interface{}{"ChannelId": channelId}) + _, err = s.GetReplica().Select(&members, ` + SELECT + Id, + Nickname, + Email, + ChannelMembers.Roles, + Username + FROM + ChannelMembers, + Users + WHERE + ChannelMembers.UserId = Users.Id + AND Users.DeleteAt = 0 + AND ChannelId = :ChannelId`, map[string]interface{}{"ChannelId": channelId}) } if err != nil { |