From c06b2f483898669b224321728321b7a3a8e9e37c Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han <jacky_cute0808@hotmail.com>
Date: Tue, 11 Oct 2016 16:46:50 +0800
Subject: [PATCH] Fix history time should save in UNIX timestamp to avoid time
 offset issue

---
 lib/history.js       |  2 +-
 public/js/history.js | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/history.js b/lib/history.js
index c3754e0b8..4a3bbe1e0 100644
--- a/lib/history.js
+++ b/lib/history.js
@@ -123,7 +123,7 @@ function updateHistory(userid, noteId, document) {
             var noteInfo = models.Note.parseNoteInfo(document);
             noteHistory.id = noteId;
             noteHistory.text = noteInfo.title;
-            noteHistory.time = moment().format('MMMM Do YYYY, h:mm:ss a');
+            noteHistory.time = moment().valueOf();
             noteHistory.tags = noteInfo.tags;
             caches[userid].isDirty = true;
         });
diff --git a/public/js/history.js b/public/js/history.js
index 9be681048..324a9da2a 100644
--- a/public/js/history.js
+++ b/public/js/history.js
@@ -96,8 +96,8 @@ function clearDuplicatedHistory(notehistory) {
             var id = notehistory[i].id.replace(/\=+$/, '');
             var newId = newnotehistory[j].id.replace(/\=+$/, '');
             if (id == newId || notehistory[i].id == newnotehistory[j].id || !notehistory[i].id || !newnotehistory[j].id) {
-                var time = moment(notehistory[i].time, 'MMMM Do YYYY, h:mm:ss a');
-                var newTime = moment(newnotehistory[j].time, 'MMMM Do YYYY, h:mm:ss a');
+                var time = (typeof notehistory[i].time === 'number' ? moment(notehistory[i].time) : moment(notehistory[i].time, 'MMMM Do YYYY, h:mm:ss a'));
+                var newTime = (typeof newnotehistory[i].time === 'number' ? moment(newnotehistory[i].time) : moment(newnotehistory[i].time, 'MMMM Do YYYY, h:mm:ss a'));
                 if(time >= newTime) {
                     newnotehistory[j] = notehistory[i];
                 }
@@ -247,7 +247,7 @@ function renderHistory(view) {
     return {
         id: id,
         text: title,
-        time: moment().format('MMMM Do YYYY, h:mm:ss a'),
+        time: moment().valueOf(),
         tags: tags
     };
 }
@@ -358,9 +358,10 @@ function parseToHistory(list, notehistory, callback) {
     else if (notehistory && notehistory.length > 0) {
         for (var i = 0; i < notehistory.length; i++) {
             //parse time to timestamp and fromNow
-            notehistory[i].timestamp = moment(notehistory[i].time, 'MMMM Do YYYY, h:mm:ss a').valueOf();
-            notehistory[i].fromNow = moment(notehistory[i].time, 'MMMM Do YYYY, h:mm:ss a').fromNow();
-            notehistory[i].time = moment(notehistory[i].time, 'MMMM Do YYYY, h:mm:ss a').format('llll');
+            var timestamp = (typeof notehistory[i].time === 'number' ? moment(notehistory[i].time) : moment(notehistory[i].time, 'MMMM Do YYYY, h:mm:ss a'));
+            notehistory[i].timestamp = timestamp.valueOf();
+            notehistory[i].fromNow = timestamp.fromNow();
+            notehistory[i].time = timestamp.format('llll');
             if (notehistory[i].id && list.get('id', notehistory[i].id).length == 0)
                 list.add(notehistory[i]);
         }