diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-06-14 12:12:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-14 12:12:46 -0400 |
| commit | 8f87e60231c406d9f26c1b3a84abd725e544a187 (patch) | |
| tree | 14349a4b0492f6be37945ea0d437a5f7eb5a7340 /store | |
| parent | a0cc913b85dea5023b705697afa5cd8749a6e5de (diff) | |
| download | chat-8f87e60231c406d9f26c1b3a84abd725e544a187.tar.gz chat-8f87e60231c406d9f26c1b3a84abd725e544a187.tar.bz2 chat-8f87e60231c406d9f26c1b3a84abd725e544a187.zip | |
Fix bad condition on hiding email addresses and update user etag to include privacy settings (#3327)
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_user_store.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go index 07a801dc6..6313a91e2 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -10,6 +10,7 @@ import ( "strings" "github.com/mattermost/platform/model" + "github.com/mattermost/platform/utils" ) const ( @@ -485,9 +486,9 @@ func (s SqlUserStore) GetEtagForDirectProfiles(userId string) StoreChannel { ORDER BY UpdateAt DESC LIMIT 1 `, map[string]interface{}{"UserId": userId}) if err != nil { - result.Data = fmt.Sprintf("%v.%v", model.CurrentVersion, model.GetMillis()) + result.Data = fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, model.GetMillis(), utils.Cfg.PrivacySettings.ShowFullName, utils.Cfg.PrivacySettings.ShowEmailAddress) } else { - result.Data = fmt.Sprintf("%v.%v", model.CurrentVersion, updateAt) + result.Data = fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, updateAt, utils.Cfg.PrivacySettings.ShowFullName, utils.Cfg.PrivacySettings.ShowEmailAddress) } storeChannel <- result @@ -505,9 +506,9 @@ func (s SqlUserStore) GetEtagForAllProfiles() StoreChannel { updateAt, err := s.GetReplica().SelectInt("SELECT UpdateAt FROM Users ORDER BY UpdateAt DESC LIMIT 1") if err != nil { - result.Data = fmt.Sprintf("%v.%v", model.CurrentVersion, model.GetMillis()) + result.Data = fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, model.GetMillis(), utils.Cfg.PrivacySettings.ShowFullName, utils.Cfg.PrivacySettings.ShowEmailAddress) } else { - result.Data = fmt.Sprintf("%v.%v", model.CurrentVersion, updateAt) + result.Data = fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, updateAt, utils.Cfg.PrivacySettings.ShowFullName, utils.Cfg.PrivacySettings.ShowEmailAddress) } storeChannel <- result @@ -557,9 +558,9 @@ func (s SqlUserStore) GetEtagForProfiles(teamId string) StoreChannel { updateAt, err := s.GetReplica().SelectInt("SELECT UpdateAt FROM Users, TeamMembers WHERE TeamMembers.TeamId = :TeamId AND Users.Id = TeamMembers.UserId ORDER BY UpdateAt DESC LIMIT 1", map[string]interface{}{"TeamId": teamId}) if err != nil { - result.Data = fmt.Sprintf("%v.%v", model.CurrentVersion, model.GetMillis()) + result.Data = fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, model.GetMillis(), utils.Cfg.PrivacySettings.ShowFullName, utils.Cfg.PrivacySettings.ShowEmailAddress) } else { - result.Data = fmt.Sprintf("%v.%v", model.CurrentVersion, updateAt) + result.Data = fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, updateAt, utils.Cfg.PrivacySettings.ShowFullName, utils.Cfg.PrivacySettings.ShowEmailAddress) } storeChannel <- result |