diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-05-06 12:08:58 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-05-06 12:08:58 -0400 |
| commit | 0cfcf5c5decc89a8a8070272f92da0c0ae49693d (patch) | |
| tree | ba2018c98116b80c33b3c33fcdece64e908bea72 /store | |
| parent | d2f9fd52fe8b0da6f23775f242660329fcef6421 (diff) | |
| download | chat-0cfcf5c5decc89a8a8070272f92da0c0ae49693d.tar.gz chat-0cfcf5c5decc89a8a8070272f92da0c0ae49693d.tar.bz2 chat-0cfcf5c5decc89a8a8070272f92da0c0ae49693d.zip | |
Add separator between DMs on your team and not (#2910)
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_user_store.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go index 8d4f1a31b..974081a64 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -434,7 +434,7 @@ func (s SqlUserStore) GetEtagForDirectProfiles(userId string) StoreChannel { result := StoreResult{} updateAt, err := s.GetReplica().SelectInt(` - SELECT + SELECT UpdateAt FROM Users @@ -454,13 +454,14 @@ func (s SqlUserStore) GetEtagForDirectProfiles(userId string) StoreChannel { Channels.Type = 'D' AND Channels.Id = ChannelMembers.ChannelId AND ChannelMembers.UserId = :UserId)) - OR Id IN (SELECT + OR Id IN (SELECT Name FROM Preferences WHERE UserId = :UserId AND Category = 'direct_channel_show') + ORDER BY UpdateAt DESC `, map[string]interface{}{"UserId": userId}) if err != nil { result.Data = fmt.Sprintf("%v.%v", model.CurrentVersion, model.GetMillis()) |