diff options
| author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-10-13 12:35:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-13 12:35:57 +0200 |
| commit | 908ed5555f8a3d37cd057035b2792d66c8b7838a (patch) | |
| tree | 7ad4248a72a7c3b6e6c3981840c5951c6108fe1d /model/user.go | |
| parent | e87965f39d2ce6dbd0e7883c387956413c663f6a (diff) | |
| download | chat-908ed5555f8a3d37cd057035b2792d66c8b7838a.tar.gz chat-908ed5555f8a3d37cd057035b2792d66c8b7838a.tar.bz2 chat-908ed5555f8a3d37cd057035b2792d66c8b7838a.zip | |
[APIv4] add getChannelMembersTimezone (#9286)
* add getChannelMembersTimezone
* update per feedback review
* add delimeter to error
Diffstat (limited to 'model/user.go')
| -rw-r--r-- | model/user.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/model/user.go b/model/user.go index 781bcae66..06ad9294f 100644 --- a/model/user.go +++ b/model/user.go @@ -499,11 +499,7 @@ func (u *User) IsSAMLUser() bool { } func (u *User) GetPreferredTimezone() string { - if u.Timezone["useAutomaticTimezone"] == "true" { - return u.Timezone["automaticTimezone"] - } - - return u.Timezone["manualTimezone"] + return GetPreferredTimezone(u.Timezone) } // UserFromJson will decode the input and return a User |