From 0766e6cb366a464327c8e20f2da987e71d5bcebc Mon Sep 17 00:00:00 2001
From: Rob Loranger <dev@loranger.xyz>
Date: Tue, 14 Jan 2020 10:44:56 -0800
Subject: [PATCH 1/2] fixes imported post times

changes the client side to round the unix time to avoid floats

alters the time to match the client time zone on the server side
---
 account_import.go          | 8 ++++++++
 templates/user/import.tmpl | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/account_import.go b/account_import.go
index b34f3a7..1098798 100644
--- a/account_import.go
+++ b/account_import.go
@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
 
@@ -85,6 +86,7 @@ func handleImport(app *App, u *User, w http.ResponseWriter, r *http.Request) err
 		log.Error("invalid form data for file dates: %v", err)
 		return impart.HTTPError{http.StatusBadRequest, "form data for file dates was invalid"}
 	}
+	fileTZ := r.FormValue("tz")
 	files := r.MultipartForm.File["files"]
 	var fileErrs []error
 	filesSubmitted := len(files)
@@ -147,6 +149,12 @@ func handleImport(app *App, u *User, w http.ResponseWriter, r *http.Request) err
 			post.Collection = collAlias
 		}
 		dateTime := time.Unix(fileDates[formFile.Filename], 0)
+		offset, err := strconv.Atoi(fileTZ)
+		if err != nil {
+			log.Error("form time zone offset not a valid integer: %v", err)
+			continue
+		}
+		dateTime = dateTime.Add(time.Minute * time.Duration(offset))
 		post.Created = &dateTime
 		created := post.Created.Format("2006-01-02T15:04:05Z")
 		submittedPost := SubmittedPost{
diff --git a/templates/user/import.tmpl b/templates/user/import.tmpl
index 3400e2f..06ff8b7 100644
--- a/templates/user/import.tmpl
+++ b/templates/user/import.tmpl
@@ -32,6 +32,7 @@
 				<input id="fileInput" class="fileInput" name="files" type="file" multiple accept="text/markdown, text/plain"/>
 			</label>
 			<input id="fileDates" name="fileDates" hidden/>
+			<input id="tzInput" name="tz" hidden/>
 			<label>
 				Import these posts to:
 				<select name="collection">
@@ -42,13 +43,15 @@
 				</select>
 			</label>
 			<script>
+				const tzInput = document.getElementById('tzInput');
+				tzInput.value = new Date().getTimezoneOffset();
 				const fileInput = document.getElementById('fileInput');
 				const fileDates = document.getElementById('fileDates');
 				fileInput.addEventListener('change', (e) => {
 					const files = e.target.files;
 					let dateMap = {};
 					for (let file of files) {
-						dateMap[file.name] = file.lastModified / 1000;
+						dateMap[file.name] = Math.round(file.lastModified / 1000);
 					}
 					fileDates.value = JSON.stringify(dateMap);
 				})

From 571460f08d8b6b8db87670cd4f41984ddda90a6c Mon Sep 17 00:00:00 2001
From: Rob Loranger <dev@loranger.xyz>
Date: Wed, 15 Jan 2020 09:04:38 -0800
Subject: [PATCH 2/2] move timezone correction to client side

---
 account_import.go          | 8 --------
 templates/user/import.tmpl | 8 ++++----
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/account_import.go b/account_import.go
index 1098798..b34f3a7 100644
--- a/account_import.go
+++ b/account_import.go
@@ -9,7 +9,6 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"time"
 
@@ -86,7 +85,6 @@ func handleImport(app *App, u *User, w http.ResponseWriter, r *http.Request) err
 		log.Error("invalid form data for file dates: %v", err)
 		return impart.HTTPError{http.StatusBadRequest, "form data for file dates was invalid"}
 	}
-	fileTZ := r.FormValue("tz")
 	files := r.MultipartForm.File["files"]
 	var fileErrs []error
 	filesSubmitted := len(files)
@@ -149,12 +147,6 @@ func handleImport(app *App, u *User, w http.ResponseWriter, r *http.Request) err
 			post.Collection = collAlias
 		}
 		dateTime := time.Unix(fileDates[formFile.Filename], 0)
-		offset, err := strconv.Atoi(fileTZ)
-		if err != nil {
-			log.Error("form time zone offset not a valid integer: %v", err)
-			continue
-		}
-		dateTime = dateTime.Add(time.Minute * time.Duration(offset))
 		post.Created = &dateTime
 		created := post.Created.Format("2006-01-02T15:04:05Z")
 		submittedPost := SubmittedPost{
diff --git a/templates/user/import.tmpl b/templates/user/import.tmpl
index 06ff8b7..803a07c 100644
--- a/templates/user/import.tmpl
+++ b/templates/user/import.tmpl
@@ -32,7 +32,6 @@
 				<input id="fileInput" class="fileInput" name="files" type="file" multiple accept="text/markdown, text/plain"/>
 			</label>
 			<input id="fileDates" name="fileDates" hidden/>
-			<input id="tzInput" name="tz" hidden/>
 			<label>
 				Import these posts to:
 				<select name="collection">
@@ -43,15 +42,16 @@
 				</select>
 			</label>
 			<script>
-				const tzInput = document.getElementById('tzInput');
-				tzInput.value = new Date().getTimezoneOffset();
+				// timezone offset in seconds
+				const tzOffsetSec = new Date().getTimezoneOffset() * 60;
 				const fileInput = document.getElementById('fileInput');
 				const fileDates = document.getElementById('fileDates');
 				fileInput.addEventListener('change', (e) => {
 					const files = e.target.files;
 					let dateMap = {};
 					for (let file of files) {
-						dateMap[file.name] = Math.round(file.lastModified / 1000);
+						// convert from milliseconds to seconds and adjust for tz
+						dateMap[file.name] = Math.round(file.lastModified / 1000) + tzOffsetSec;
 					}
 					fileDates.value = JSON.stringify(dateMap);
 				})