From be716e6cf98127c1bbe7c7a74e801d3da9a10324 Mon Sep 17 00:00:00 2001
From: MickaelK <mickael@kerjean.me>
Date: Mon, 22 Apr 2024 01:05:20 +1000
Subject: [PATCH] fix (time): hide time whenever not available

---
 client/pages/filespage/thing-existing.js |  2 +-
 server/common/types.go                   |  3 ++-
 server/ctrl/files.go                     | 18 +++++++++++-------
 server/plugin/plg_backend_s3/index.go    |  1 +
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/client/pages/filespage/thing-existing.js b/client/pages/filespage/thing-existing.js
index 2ec4bcf8..5d239cb5 100644
--- a/client/pages/filespage/thing-existing.js
+++ b/client/pages/filespage/thing-existing.js
@@ -323,7 +323,7 @@ class ExistingThingComponent extends React.Component {
                             is_renaming={this.state.is_renaming}
                             onRenameCancel={this.onRenameRequest.bind(this, false)} />
                         <DateTime
-                            show={this.state.icon !== "loading"}
+                            show={this.state.icon !== "loading" || this.props.file.time !== 0}
                             timestamp={this.props.file.time} />
                         <ActionButton
                             onClickRename={this.onRenameRequest.bind(this)}
diff --git a/server/common/types.go b/server/common/types.go
index 46031c65..5e9d087e 100644
--- a/server/common/types.go
+++ b/server/common/types.go
@@ -91,7 +91,8 @@ func (f File) Mode() os.FileMode {
 }
 func (f File) ModTime() time.Time {
 	if f.FTime == 0 {
-		return time.Now()
+		t := new(time.Time)
+		return *t
 	}
 	return time.Unix(f.FTime, 0)
 }
diff --git a/server/ctrl/files.go b/server/ctrl/files.go
index eed6e781..43f526c8 100644
--- a/server/ctrl/files.go
+++ b/server/ctrl/files.go
@@ -125,16 +125,20 @@ func FileLs(ctx *App, res http.ResponseWriter, req *http.Request) {
 	etagger.Write([]byte(path + strconv.Itoa(len(entries))))
 	for i := 0; i < len(entries); i++ {
 		name := entries[i].Name()
-		modTime := entries[i].ModTime().UnixNano() / int64(time.Millisecond)
-
-		if i < 200 { // etag is generated from a few values to avoid large memory usage
-			etagger.Write([]byte(name + strconv.Itoa(int(modTime))))
-		}
-
 		files[i] = FileInfo{
 			Name: name,
 			Size: entries[i].Size(),
-			Time: modTime,
+			Time: func(mt time.Time) (modTime int64) {
+				if mt.IsZero() == false {
+					modTime = mt.UnixNano() / int64(time.Millisecond)
+
+				}
+				if i < 200 { // etag is generated from a few values to avoid large memory usage
+					etagger.Write([]byte(name + strconv.Itoa(int(modTime))))
+				}
+
+				return modTime
+			}(entries[i].ModTime()),
 			Type: func(mode os.FileMode) string {
 				if mode.IsRegular() {
 					return "file"
diff --git a/server/plugin/plg_backend_s3/index.go b/server/plugin/plg_backend_s3/index.go
index ffa7bb73..555a681a 100644
--- a/server/plugin/plg_backend_s3/index.go
+++ b/server/plugin/plg_backend_s3/index.go
@@ -222,6 +222,7 @@ func (this S3Backend) Ls(path string) (files []os.FileInfo, err error) {
 				files = append(files, &File{
 					FName: filepath.Base(*object.Prefix),
 					FType: "directory",
+					FTime: 0,
 				})
 			}
 			return aws.BoolValue(objs.IsTruncated)