Merge branch 'master' into frontend-next

1 files changed, 10 insertions, 10 deletions

diff --git a/lib/response.js b/lib/response.js
index 2b38cf25..54e2a337 100755
--- a/lib/response.js
+++ b/lib/response.js
@@ -75,7 +75,7 @@ function showIndex(req, res, next) {
 }
 
 function responseHackMD(res, note) {
-    var body = LZString.decompressFromBase64(note.content);
+    var body = note.content;
     var meta = null;
     try {
         meta = models.Note.parseMeta(metaMarked(body).meta);
@@ -191,7 +191,7 @@ function showPublishNote(req, res, next) {
             if (!note) {
                 return response.errorNotFound(res);
             }
-            var body = LZString.decompressFromBase64(note.content);
+            var body = note.content;
             var meta = null;
             var markdown = null;
             try {
@@ -209,7 +209,7 @@ function showPublishNote(req, res, next) {
             var origin = config.serverurl;
             var data = {
                 title: title,
-                description: meta.description || markdown ? models.Note.generateDescription(markdown) : null,
+                description: meta.description || (markdown ? models.Note.generateDescription(markdown) : null),
                 viewcount: note.viewcount,
                 createtime: createtime,
                 updatetime: updatetime,
@@ -248,7 +248,7 @@ function actionSlide(req, res, note) {
 }
 
 function actionDownload(req, res, note) {
-    var body = LZString.decompressFromBase64(note.content);
+    var body = note.content;
     var title = models.Note.decodeTitle(note.title);
     var filename = title;
     filename = encodeURIComponent(filename);
@@ -265,7 +265,7 @@ function actionDownload(req, res, note) {
 }
 
 function actionInfo(req, res, note) {
-    var body = LZString.decompressFromBase64(note.content);
+    var body = note.content;
     var meta = null;
     var markdown = null;
     try {
@@ -281,7 +281,7 @@ function actionInfo(req, res, note) {
     var title = models.Note.decodeTitle(note.title);
     var data = {
         title: meta.title || title,
-        description: meta.description || markdown ? models.Note.generateDescription(markdown) : null,
+        description: meta.description || (markdown ? models.Note.generateDescription(markdown) : null),
         viewcount: note.viewcount,
         createtime: createtime,
         updatetime: updatetime
@@ -297,7 +297,7 @@ function actionInfo(req, res, note) {
 }
 
 function actionPDF(req, res, note) {
-    var body = LZString.decompressFromBase64(note.content);
+    var body = note.content;
     try {
         body = metaMarked(body).markdown;
     } catch(err) {
@@ -479,7 +479,7 @@ function githubActionGist(req, res, note) {
             if (!error && httpResponse.statusCode == 200) {
                 var access_token = body.access_token;
                 if (access_token) {
-                    var content = LZString.decompressFromBase64(note.content);
+                    var content = note.content;
                     var title = models.Note.decodeTitle(note.title);
                     var filename = title.replace('/', ' ') + '.md';
                     var gist = {
@@ -579,7 +579,7 @@ function showPublishSlide(req, res, next) {
             if (!note) {
                 return response.errorNotFound(res);
             }
-            var body = LZString.decompressFromBase64(note.content);
+            var body = note.content;
             var meta = null;
             var markdown = null;
             try {
@@ -597,7 +597,7 @@ function showPublishSlide(req, res, next) {
             var origin = config.serverurl;
             var data = {
                 title: title,
-                description: meta.description || markdown ? models.Note.generateDescription(markdown) : null,
+                description: meta.description || (markdown ? models.Note.generateDescription(markdown) : null),
                 viewcount: note.viewcount,
                 createtime: createtime,
                 updatetime: updatetime,