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 /model | |
| 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 'model')
| -rw-r--r-- | model/user.go | 4 | ||||
| -rw-r--r-- | model/user_test.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/model/user.go b/model/user.go index ab076894a..77d04a9bc 100644 --- a/model/user.go +++ b/model/user.go @@ -244,8 +244,8 @@ func (u *User) ToJson() string { } // Generate a valid strong etag so the browser can cache the results -func (u *User) Etag() string { - return Etag(u.Id, u.UpdateAt) +func (u *User) Etag(showFullName, showEmail bool) string { + return Etag(u.Id, u.UpdateAt, showFullName, showEmail) } func (u *User) IsOffline() bool { diff --git a/model/user_test.go b/model/user_test.go index d8ef77d6a..899542a05 100644 --- a/model/user_test.go +++ b/model/user_test.go @@ -33,7 +33,7 @@ func TestUserJson(t *testing.T) { func TestUserPreSave(t *testing.T) { user := User{Password: "test"} user.PreSave() - user.Etag() + user.Etag(true, true) } func TestUserPreUpdate(t *testing.T) { |