From 74e703f58daff2aded07a969410f988cff9ada9b Mon Sep 17 00:00:00 2001
From: Chris Duarte <csduarte@users.noreply.github.com>
Date: Thu, 22 Mar 2018 06:53:43 -0700
Subject: Timezone feature (#8185)

* Add supported timezones into config

Remove Timezone list creation in favor of timezone from configs

Add Timezone field to Users table

Clean up format of SupportedTimezones in config

* Remove unwanted change

* Add test for updating user timezone

* Add empty map[string]string if Timezone is null

* Add EnableTimezoneSelection config

* Revert back to map[string]string for ClientConfig

* Refactor SupportedTimezones into timezones.json

* Include timezones.json in TestConfigFlag

* Add timezone api endpoint

* Bump varchar size to 256 and setMaxSize in user_store

* Refactor LoadConfig to LoadConfig and LoadTimezoneConfig

* Remove unnecessary argument in LoadConfig, mail_test

* Add test for timezone endpoint

* Add license header

* Refactor timezones endpoint to system.go

* Add system base route to timezone endpoint

* db timezone upgrade in db v4.9

* Avoid saving SupportedTimezones to config.json

* Add timezonePath support in config

* Remove EnableTimezoneSelection from config

* Use return statement without return parameter

* Refactor test for SupportedTimezones

* Check for supportedTimezone != nil instead of using len

* Decouple SupportedTimezones out of Config

* Fix failing test

* Add LastTeamIconUpdate back in upgrade.go

* Write timezone config in config_flag_test

* Add code fallback for default timezone support
---
 utils/timezone.go | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 utils/timezone.go

(limited to 'utils/timezone.go')

diff --git a/utils/timezone.go b/utils/timezone.go
new file mode 100644
index 000000000..ea5f15140
--- /dev/null
+++ b/utils/timezone.go
@@ -0,0 +1,25 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package utils
+
+import (
+	"encoding/json"
+	"io/ioutil"
+
+	"github.com/mattermost/mattermost-server/model"
+)
+
+func LoadTimezones(fileName string) model.SupportedTimezones {
+	var supportedTimezones model.SupportedTimezones
+
+	if timezoneFile := FindConfigFile(fileName); timezoneFile == "" {
+		return model.DefaultSupportedTimezones
+	} else if raw, err := ioutil.ReadFile(timezoneFile); err != nil {
+		return model.DefaultSupportedTimezones
+	} else if err := json.Unmarshal(raw, &supportedTimezones); err != nil {
+		return model.DefaultSupportedTimezones
+	} else {
+		return supportedTimezones
+	}
+}
-- 
cgit v1.2.3-1-g7c22