From c1a9fdec16b67576cc56173bc60560ebaac7e8ff Mon Sep 17 00:00:00 2001
From: lihengxin <lihengxin@baidu.com>
Date: Tue, 7 Sep 2021 12:56:49 +0800
Subject: [PATCH] Add setting for exact date format

---
 frontend/src/components/files/ListingItem.vue | 5 ++++-
 frontend/src/i18n/en.json                     | 2 ++
 frontend/src/views/settings/Profile.vue       | 9 ++++++++-
 http/auth.go                                  | 2 ++
 settings/defaults.go                          | 2 ++
 users/users.go                                | 1 +
 6 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/files/ListingItem.vue b/frontend/src/components/files/ListingItem.vue
index c7ab60db..6ae52544 100644
--- a/frontend/src/components/files/ListingItem.vue
+++ b/frontend/src/components/files/ListingItem.vue
@@ -106,7 +106,10 @@ export default {
       return filesize(this.size);
     },
     humanTime: function () {
-      return moment(this.modified).format("YYYY-MM-DD HH:mm");
+      if (this.user.dateFormat) {
+        return moment(this.modified).format("YYYY-MM-DD HH:mm");
+      }
+      return moment(this.modified).fromNow();
     },
     dragStart: function () {
       if (this.selectedCount === 0) {
diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json
index 38e3a42e..c6f88377 100644
--- a/frontend/src/i18n/en.json
+++ b/frontend/src/i18n/en.json
@@ -27,6 +27,7 @@
     "search": "Search",
     "select": "Select",
     "selectMultiple": "Select multiple",
+    "setDateFormat": "Set exact date format",
     "share": "Share",
     "shell": "Toggle shell",
     "submit": "Submit",
@@ -214,6 +215,7 @@
     "rules": "Rules",
     "rulesHelp": "Here you can define a set of allow and disallow rules for this specific user. The blocked files won't show up in the listings and they wont be accessible to the user. We support regex and paths relative to the users scope.\n",
     "scope": "Scope",
+    "setDateFormat": "Set exact date format",
     "settingsUpdated": "Settings updated!",
     "shareDuration": "Share Duration",
     "shareManagement": "Share Management",
diff --git a/frontend/src/views/settings/Profile.vue b/frontend/src/views/settings/Profile.vue
index 3c57791e..82f1b43b 100644
--- a/frontend/src/views/settings/Profile.vue
+++ b/frontend/src/views/settings/Profile.vue
@@ -15,6 +15,10 @@
             <input type="checkbox" v-model="singleClick" />
             {{ $t("settings.singleClick") }}
           </p>
+          <p>
+            <input type="checkbox" v-model="dateFormat" />
+            {{ $t("settings.setDateFormat") }}            
+          </p>
           <h3>{{ $t("settings.language") }}</h3>
           <languages
             class="input input--block"
@@ -83,6 +87,7 @@ export default {
       passwordConf: "",
       hideDotfiles: false,
       singleClick: false,
+      dateFormat: false,
       locale: "",
     };
   },
@@ -107,6 +112,7 @@ export default {
     this.locale = this.user.locale;
     this.hideDotfiles = this.user.hideDotfiles;
     this.singleClick = this.user.singleClick;
+    this.dateFormat = this.user.dateFormat;
   },
   methods: {
     ...mapMutations(["updateUser", "setLoading"]),
@@ -135,8 +141,9 @@ export default {
           locale: this.locale,
           hideDotfiles: this.hideDotfiles,
           singleClick: this.singleClick,
+          dateFormat: this.dateFormat,
         };
-        await api.update(data, ["locale", "hideDotfiles", "singleClick"]);
+        await api.update(data, ["locale", "hideDotfiles", "singleClick", "dateFormat"]);
         this.updateUser(data);
         this.$showSuccess(this.$t("settings.settingsUpdated"));
       } catch (e) {
diff --git a/http/auth.go b/http/auth.go
index b90f926f..1f58e60c 100644
--- a/http/auth.go
+++ b/http/auth.go
@@ -28,6 +28,7 @@ type userInfo struct {
 	Commands     []string          `json:"commands"`
 	LockPassword bool              `json:"lockPassword"`
 	HideDotfiles bool              `json:"hideDotfiles"`
+	DateFormat   bool              `json:"dateFormat"`
 }
 
 type authToken struct {
@@ -184,6 +185,7 @@ func printToken(w http.ResponseWriter, _ *http.Request, d *data, user *users.Use
 			LockPassword: user.LockPassword,
 			Commands:     user.Commands,
 			HideDotfiles: user.HideDotfiles,
+			DateFormat:   user.DateFormat,
 		},
 		StandardClaims: jwt.StandardClaims{
 			IssuedAt:  time.Now().Unix(),
diff --git a/settings/defaults.go b/settings/defaults.go
index e340d260..d60e36dc 100644
--- a/settings/defaults.go
+++ b/settings/defaults.go
@@ -16,6 +16,7 @@ type UserDefaults struct {
 	Perm         users.Permissions `json:"perm"`
 	Commands     []string          `json:"commands"`
 	HideDotfiles bool              `json:"hideDotfiles"`
+	DateFormat   bool              `json:"dateFormat"`
 }
 
 // Apply applies the default options to a user.
@@ -28,4 +29,5 @@ func (d *UserDefaults) Apply(u *users.User) {
 	u.Sorting = d.Sorting
 	u.Commands = d.Commands
 	u.HideDotfiles = d.HideDotfiles
+	u.DateFormat = d.DateFormat
 }
diff --git a/users/users.go b/users/users.go
index c58cae0e..ab5421bf 100644
--- a/users/users.go
+++ b/users/users.go
@@ -35,6 +35,7 @@ type User struct {
 	Fs           afero.Fs      `json:"-" yaml:"-"`
 	Rules        []rules.Rule  `json:"rules"`
 	HideDotfiles bool          `json:"hideDotfiles"`
+	DateFormat   bool          `json:"dateFormat"`
 }
 
 // GetRules implements rules.Provider.