From 8217507715fda4c0407b93087ac58b3a7a2b5b18 Mon Sep 17 00:00:00 2001
From: iMaeGoo <mail1st@qq.com>
Date: Mon, 4 Jan 2021 18:43:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(0.5.1):=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD=20(#86)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 修复 Valine 导入 #70
* 修复 Disqus 导入
---
 .npmignore                              |  3 +-
 babel.config.json                       |  2 +-
 {public => demo}/demo.css               |  0
 {public => demo}/demo.html              |  0
 {public => demo}/index.html             |  0
 docs/.vuepress/theme/layouts/Layout.vue |  2 +-
 docs/quick-start.md                     |  4 +--
 package.json                            |  6 ++--
 src/function/twikoo/index.js            | 44 ++++++++++++++++++-------
 src/function/twikoo/package.json        |  2 +-
 webpack.config.js                       | 36 ++++++++++----------
 11 files changed, 61 insertions(+), 38 deletions(-)
 rename {public => demo}/demo.css (100%)
 rename {public => demo}/demo.html (100%)
 rename {public => demo}/index.html (100%)

diff --git a/.npmignore b/.npmignore
index da5bdd7ae..1b0b4c133 100644
--- a/.npmignore
+++ b/.npmignore
@@ -9,13 +9,14 @@
 .gitignore
 .npmignore
 _config.js
+babel.config.json
 cloudbaserc.json
+demo
 dist/demo.css
 dist/demo.html
 dist/index.html
 docs
 node_modules
-public
 src
 stats.json
 webpack.config.js
diff --git a/babel.config.json b/babel.config.json
index 8d3699ee9..b1a982592 100644
--- a/babel.config.json
+++ b/babel.config.json
@@ -1,4 +1,4 @@
 {
   "presets": ["@babel/preset-env"],
-  "plugins": ["@babel/plugin-transform-modules-commonjs","@babel/transform-runtime"]
+  "plugins": ["@babel/plugin-transform-modules-commonjs", "@babel/transform-runtime"]
 }
\ No newline at end of file
diff --git a/public/demo.css b/demo/demo.css
similarity index 100%
rename from public/demo.css
rename to demo/demo.css
diff --git a/public/demo.html b/demo/demo.html
similarity index 100%
rename from public/demo.html
rename to demo/demo.html
diff --git a/public/index.html b/demo/index.html
similarity index 100%
rename from public/index.html
rename to demo/index.html
diff --git a/docs/.vuepress/theme/layouts/Layout.vue b/docs/.vuepress/theme/layouts/Layout.vue
index ad05ba912..275edf6df 100644
--- a/docs/.vuepress/theme/layouts/Layout.vue
+++ b/docs/.vuepress/theme/layouts/Layout.vue
@@ -6,7 +6,7 @@
         <script defer src="https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/katex.min.js" integrity="sha384-g7c+Jr9ZivxKLnZTDUhnkOnsh30B4H0rpLUpJ4jAIKs4fnJI+sEnkvrMWph2EDg4" crossorigin="anonymous"></script>
         <script defer src="https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/contrib/auto-render.min.js" integrity="sha384-mll67QQFJfxn0IYznZYonOWZ644AWYC+Pt2cHqMaRhXVrursRwvLnLaebdGIlYNa" crossorigin="anonymous"></script>
         <div id="twikoo"></div>
-        <script src="https://cdn.jsdelivr.net/npm/twikoo@0.5.0/dist/twikoo.all.min.js" ref="twikooJs"></script>
+        <script src="https://cdn.jsdelivr.net/npm/twikoo@0.5.1/dist/twikoo.all.min.js" ref="twikooJs"></script>
       </div>
     </template>
   </ParentLayout>
diff --git a/docs/quick-start.md b/docs/quick-start.md
index 5e679a2b4..5c61cc82c 100644
--- a/docs/quick-start.md
+++ b/docs/quick-start.md
@@ -99,7 +99,7 @@ Volantis 目前支持 Twikoo，请查看 [hexo-theme-volantis/_config.yml](https
 ``` yml
 comments:
   twikoo:
-    js: https://cdn.jsdelivr.net/npm/twikoo@0.5.0/dist/twikoo.all.min.js
+    js: https://cdn.jsdelivr.net/npm/twikoo@0.5.1/dist/twikoo.all.min.js
     envId: xxxxxxxxxxxxxxx # 腾讯云环境id
 ```
 
@@ -124,7 +124,7 @@ twikoo:
 
 ``` html
 <div id="tcomment"></div>
-<script src="https://cdn.jsdelivr.net/npm/twikoo@0.5.0/dist/twikoo.all.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/twikoo@0.5.1/dist/twikoo.all.min.js"></script>
 <script>
 twikoo.init({
   envId: '您的环境id',
diff --git a/package.json b/package.json
index 853d4f42d..7a5200ddc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twikoo",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "A simple comment system based on Tencent CloudBase (tcb).",
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",
@@ -14,8 +14,8 @@
   },
   "homepage": "https://twikoo.js.org",
   "scripts": {
-    "dev": "node_modules/.bin/webpack serve",
-    "serve": "node_modules/.bin/webpack serve",
+    "dev": "webpack serve --mode development",
+    "serve": "webpack serve --mode development",
     "build": "webpack --mode production",
     "analyze": "webpack --profile --json > stats.json && webpack-bundle-analyzer stats.json",
     "login": "tcb login",
diff --git a/src/function/twikoo/index.js b/src/function/twikoo/index.js
index 39768be27..120f84413 100644
--- a/src/function/twikoo/index.js
+++ b/src/function/twikoo/index.js
@@ -1,5 +1,5 @@
 /*!
- * Twikoo cloudbase function v0.5.0
+ * Twikoo cloudbase function v0.5.1
  * (c) 2020-2020 iMaeGoo
  * Released under the MIT License.
  */
@@ -31,7 +31,7 @@ const window = new JSDOM('').window
 const DOMPurify = createDOMPurify(window)
 
 // 常量 / constants
-const VERSION = '0.5.0'
+const VERSION = '0.5.1'
 const RES_CODE = {
   SUCCESS: 0,
   FAIL: 1000,
@@ -456,7 +456,7 @@ async function readFile (fileId, type, log) {
     let content = result.fileContent.toString('utf8')
     log('评论文件读取成功')
     if (type === 'json') {
-      content = JSON.parse(content)
+      content = jsonParse(content)
       log('评论文件 JSON 解析成功')
     } else if (type === 'xml') {
       content = await xml2js.parseStringPromise(content)
@@ -468,6 +468,23 @@ async function readFile (fileId, type, log) {
   }
 }
 
+// 兼容 Leancloud 两种 JSON 导出格式
+function jsonParse (content) {
+  try {
+    return JSON.parse(content)
+  } catch (e1) {
+    const results = []
+    const lines = content.split('\n')
+    for (const line of lines) {
+      // 逐行 JSON.parse
+      try {
+        results.push(JSON.parse(line))
+      } catch (e2) {}
+    }
+    return { results }
+  }
+}
+
 // Valine 导入
 async function commentImportValine (valineDb, log) {
   if (!valineDb || !valineDb.results) {
@@ -551,7 +568,11 @@ async function commentImportDisqus (disqusDb, log) {
         nick: post.author[0].name[0],
         mail: '',
         link: '',
-        url: thread.url,
+        url: thread.url
+          ? thread.url.indexOf('http') === 0
+              ? getRelativeUrl(thread.url)
+              : thread.url
+          : getRelativeUrl(thread.href),
         href: thread.href,
         comment: post.message[0],
         ua: '',
@@ -574,6 +595,14 @@ async function commentImportDisqus (disqusDb, log) {
   return comments
 }
 
+function getRelativeUrl (url) {
+  let x = url.indexOf('/')
+  for (let i = 0; i < 2; i++) {
+    x = url.indexOf('/', x + 1)
+  }
+  return url.substring(x)
+}
+
 // Artalk 导入
 async function commentImportArtalk (artalkDb, log) {
   const comments = []
@@ -581,13 +610,6 @@ async function commentImportArtalk (artalkDb, log) {
     log('Artalk 评论文件格式有误')
     return
   }
-  const getRelativeUrl = (url) => {
-    let x = url.indexOf('/')
-    for (let i = 0; i < 2; i++) {
-      x = url.indexOf('/', x + 1)
-    }
-    return url.substring(x)
-  }
   marked.setOptions({
     renderer: new marked.Renderer(),
     gfm: true,
diff --git a/src/function/twikoo/package.json b/src/function/twikoo/package.json
index 1d64e062d..ffd35f87f 100644
--- a/src/function/twikoo/package.json
+++ b/src/function/twikoo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twikoo-func",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "A simple comment system based on Tencent CloudBase (tcb).",
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",
diff --git a/webpack.config.js b/webpack.config.js
index c47e80c9f..1748f2368 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -5,7 +5,7 @@ const VueLoaderPlugin = require('vue-loader/lib/plugin')
 const ROOT_PATH = path.resolve(__dirname)
 const BUILD_PATH = path.resolve(ROOT_PATH, 'dist')
 const version = require('./package.json').version
-const TerserPlugin = require("terser-webpack-plugin");
+const TerserPlugin = require('terser-webpack-plugin')
 const banner =
   'Twikoo v' + version + '\n' +
   '(c) 2020-' + new Date().getFullYear() + ' iMaeGoo\n' +
@@ -18,7 +18,7 @@ module.exports = {
       { test: /\.vue$/, loader: 'vue-loader' },
       { test: /\.css$/, use: ['vue-style-loader', 'css-loader'] },
       { test: /\.svg$/, loader: 'svg-inline-loader' },
-      { test: /\.js$/, use: { loader: 'babel-loader', options: { presets: ['@babel/preset-env'] ,plugins: ["@babel/plugin-transform-modules-commonjs","@babel/transform-runtime"]} } }
+      { test: /\.js$/, use: { loader: 'babel-loader', options: { presets: ['@babel/preset-env'], plugins: ['@babel/plugin-transform-modules-commonjs', '@babel/transform-runtime'] } } }
     ]
   },
   entry: {
@@ -37,32 +37,32 @@ module.exports = {
     new webpack.BannerPlugin(banner),
     new CopyPlugin({
       patterns: [
-        { from: 'public/', to: './' }
+        { from: 'demo/', to: './' }
       ]
     }),
     new VueLoaderPlugin(),
     new TerserPlugin({
-	  parallel: 4,
-	  terserOptions: {
-	    ecma: 5,
-	    toplevel: true,
-	    ie8: true,
-	    safari10: true,
-     },
+      parallel: 4,
+      terserOptions: {
+        ecma: 5,
+        toplevel: true,
+        ie8: true,
+        safari10: true
+      }
     })
   ],
   devServer: {
     static: [{
-        directory: BUILD_PATH,
-        publicPath: '/dist/',
-        serveIndex: true,
-        watch: true,
-    },],
+      directory: BUILD_PATH,
+      publicPath: '/dist/',
+      serveIndex: true,
+      watch: true
+    }],
     port: 9820,
     host: 'localhost',
-    open:true,
-    hot:true,
-    compress: true,
+    open: true,
+    hot: true,
+    compress: true
   },
   performance: {
     maxEntrypointSize: 524288,