From 92ad67b813c3b940f619983c7daee7cdf21c3f4e Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Fri, 3 Feb 2017 21:39:08 +0800
Subject: Update to remove history cache to lower application coupling

---
 app.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app.js')

diff --git a/app.js b/app.js
index ba0b67d3..ee82fab5 100644
--- a/app.js
+++ b/app.js
@@ -26,7 +26,6 @@ var validator = require('validator');
 var config = require("./lib/config.js");
 var logger = require("./lib/logger.js");
 var auth = require("./lib/auth.js");
-var history = require("./lib/history.js");
 var response = require("./lib/response.js");
 var models = require("./lib/models");
 
@@ -443,6 +442,7 @@ app.get('/logout', function (req, res) {
     req.logout();
     res.redirect(config.serverurl + '/');
 });
+var history = require("./lib/history.js");
 //get history
 app.get('/history', history.historyGet);
 //post history
@@ -608,7 +608,7 @@ function startListen() {
 // sync db then start listen
 models.sequelize.sync().then(function () {
     // check if realtime is ready
-    if (history.isReady() && realtime.isReady()) {
+    if (realtime.isReady()) {
         models.Revision.checkAllNotesRevision(function (err, notes) {
             if (err) throw new Error(err);
             if (!notes || notes.length <= 0) return startListen();
@@ -639,7 +639,7 @@ function handleTermSignals() {
         }, 0);
     });
     var checkCleanTimer = setInterval(function () {
-        if (history.isReady() && realtime.isReady()) {
+        if (realtime.isReady()) {
             models.Revision.checkAllNotesRevision(function (err, notes) {
                 if (err) return logger.error(err);
                 if (!notes || notes.length <= 0) {
-- 
cgit v1.2.3


From 90c83ebd5b5610652c9bc8ae81299e85fe7056ef Mon Sep 17 00:00:00 2001
From: NV
Date: Thu, 9 Feb 2017 14:07:36 +0900
Subject: Fix image path problem when using filesystem backend

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app.js')

diff --git a/app.js b/app.js
index ee82fab5..67a62540 100644
--- a/app.js
+++ b/app.js
@@ -502,7 +502,7 @@ app.post('/uploadimage', function (req, res) {
                 switch (config.imageUploadType) {
                 case 'filesystem':
                     res.send({
-                        link: url.resolve(config.serverurl, files.image.path.match(/^public(.+$)/)[1])
+                        link: url.resolve(config.serverurl + '/', files.image.path.match(/^public\/(.+$)/)[1])
                     });
 
                     break;
-- 
cgit v1.2.3