feat: update prismjs, add ip region #366 #368

* chore: update prismjs
* feat: ip region

Author: imaegoo

cloudbaserc.json

@@ -6,7 +6,7 @@
     {
       "name": "twikoo",
       "timeout": 30,
-      "runtime": "Nodejs10.15",
+      "runtime": "Nodejs12.16",
       "memorySize": 128,
       "handler": "index.main"
     }
@@ -23,7 +23,7 @@
               "name": "twikoo",
               "timeout": 30,
               "envVariables": {},
-              "runtime": "Nodejs10.15",
+              "runtime": "Nodejs12.16",
               "memory": 128
             }
           ],

docs/.vuepress/theme/layouts/Layout.vue

@@ -13,7 +13,7 @@
 
         <!-- Twikoo -->
         <div id="twikoo"></div>
-        <script src="https://cdn.jsdelivr.net/npm/twikoo@1.5.8/dist/twikoo.all.min.js" ref="twikooJs"></script>
+        <script src="https://cdn.jsdelivr.net/npm/twikoo@1.5.9/dist/twikoo.all.min.js" ref="twikooJs"></script>
       </div>
     </template>
   </ParentLayout>

docs/quick-start.md

@@ -44,7 +44,7 @@ exports.main = require('twikoo-func').main
 8. 创建完成后，点击“twikoo"进入云函数详情页，进入“函数代码”标签，点击“文件 - 新建文件”，输入 `package.json`，回车
 9. 复制以下代码、粘贴到代码框中，点击“保存并安装依赖”
 ``` json
-{ "dependencies": { "twikoo-func": "1.5.8" } }
+{ "dependencies": { "twikoo-func": "1.5.9" } }
 ```
 
 ### 命令行部署
@@ -175,7 +175,7 @@ twikoo:
 
 ``` html
 <div id="tcomment"></div>
-<script src="https://cdn.jsdelivr.net/npm/twikoo@1.5.8/dist/twikoo.all.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/twikoo@1.5.9/dist/twikoo.all.min.js"></script>
 <script>
 twikoo.init({
   envId: '您的环境id', // 腾讯云环境填 envId；Vercel 环境填地址（https://xxx.vercel.app）
@@ -193,7 +193,7 @@ twikoo.init({
 
 请参考爆米兔前端静态资源库 [https://cdn.baomitu.com/twikoo](https://cdn.baomitu.com/twikoo)
 
-引入的 CDN 链接替换为如下即可：`https://lib.baomitu.com/twikoo/1.5.8/twikoo.all.min.js`
+引入的 CDN 链接替换为如下即可：`https://lib.baomitu.com/twikoo/1.5.9/twikoo.all.min.js`
 
 ## 开启管理面板
 

package.json

@@ -1,8 +1,14 @@
 {
   "name": "twikoo",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "description": "A simple comment system based on Tencent CloudBase (tcb).",
-  "keywords": ["twikoojs", "comment", "comment-system", "cloudbase", "vercel"],
+  "keywords": [
+    "twikoojs",
+    "comment",
+    "comment-system",
+    "cloudbase",
+    "vercel"
+  ],
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",
   "main": "./dist/twikoo.all.min.js",
@@ -51,7 +57,7 @@
     "eslint-plugin-vue": "^8.0.3",
     "marked": "^4.0.12",
     "owo": "^1.0.2",
-    "prismjs": "^1.25.0",
+    "prismjs": "^1.28.0",
     "svg-inline-loader": "^0.8.2",
     "terser-webpack-plugin": "^5.2.5",
     "vue": "^2.6.14",

src/function/twikoo/index.js

@@ -21,7 +21,8 @@ const CryptoJS = require('crypto-js') // 编解码
 const tencentcloud = require('tencentcloud-sdk-nodejs') // 腾讯云 API NODEJS SDK
 const fs = require('fs')
 const FormData = require('form-data') // 图片上传
-const pushoo = require('pushoo').default
+const pushoo = require('pushoo').default // 即时消息通知
+const ipToRegion = require('dy-node-ip2region') // IP 属地查询
 
 // 云函数 SDK / tencent cloudbase sdk
 const app = tcb.init({ env: tcb.SYMBOL_CURRENT_ENV })
@@ -33,6 +34,9 @@ const _ = db.command
 const window = new JSDOM('').window
 const DOMPurify = createDOMPurify(window)
 
+// 初始化 IP 属地
+const ipRegionSearcher = ipToRegion.create()
+
 // 常量 / constants
 const RES_CODE = {
   SUCCESS: 0,
@@ -343,13 +347,15 @@ function parseComment (comments, uid) {
 function toCommentDto (comment, uid, replies = [], comments = []) {
   let displayOs = ''
   let displayBrowser = ''
-  try {
-    const ua = bowser.getParser(comment.ua)
-    const os = ua.getOS()
-    displayOs = [os.name, os.versionName ? os.versionName : os.version].join(' ')
-    displayBrowser = [ua.getBrowserName(), ua.getBrowserVersion()].join(' ')
-  } catch (e) {
-    console.log('bowser 错误：', e)
+  if (config.SHOW_UA !== 'false') {
+    try {
+      const ua = bowser.getParser(comment.ua)
+      const os = ua.getOS()
+      displayOs = [os.name, os.versionName ? os.versionName : os.version].join(' ')
+      displayBrowser = [ua.getBrowserName(), ua.getBrowserVersion()].join(' ')
+    } catch (e) {
+      console.log('bowser 错误：', e)
+    }
   }
   return {
     id: comment._id,
@@ -360,6 +366,7 @@ function toCommentDto (comment, uid, replies = [], comments = []) {
     comment: comment.comment,
     os: displayOs,
     browser: displayBrowser,
+    ipRegion: config.SHOW_REGION ? getIpRegion({ ip: comment.ip }) : '',
     master: comment.master,
     like: comment.like ? comment.like.length : 0,
     liked: comment.like ? comment.like.findIndex((item) => item === uid) > -1 : false,
@@ -440,7 +447,7 @@ function getCommentSearchCondition (event) {
 
 function parseCommentForAdmin (comments) {
   for (const comment of comments) {
-    comment.commentText = $(comment.comment).text()
+    comment.ipRegion = getIpRegion({ ip: comment.ip, detail: true })
   }
   return comments
 }
@@ -1652,6 +1659,27 @@ async function isAdmin () {
   return ADMIN_USER_ID === userInfo.userInfo.customUserId
 }
 
+/**
+ * 获取 IP 属地
+ * @param detail true 返回省市运营商，false 只返回省
+ * @returns {String}
+ */
+function getIpRegion ({ ip, detail = false }) {
+  if (!ip) return ''
+  try {
+    const { region } = ipRegionSearcher.btreeSearchSync(ip)
+    const [,, province, city, isp] = region.split('|')
+    if (detail) {
+      return province === city ? [city, isp].join(' ') : [province, city, isp].join(' ')
+    } else {
+      return province
+    }
+  } catch (e) {
+    console.error('IP 属地查询失败：', e)
+    return ''
+  }
+}
+
 // 判断是否为递归调用（即云函数调用自身）
 function isRecursion (context) {
   const envObj = tcb.getCloudbaseContext(context)

src/function/twikoo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twikoo-func",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "description": "A simple comment system based on Tencent CloudBase (tcb).",
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",
@@ -20,6 +20,7 @@
     "cheerio": "1.0.0-rc.5",
     "crypto-js": "^4.0.0",
     "dompurify": "^2.2.6",
+    "dy-node-ip2region": "^1.0.1",
     "form-data": "^4.0.0",
     "jsdom": "^16.4.0",
     "marked": "^4.0.12",

src/js/entites/config.js

@@ -44,6 +44,8 @@ class Config {
     this.MAIL_TEMPLATE = model.MAIL_TEMPLATE
     this.MAIL_SUBJECT_ADMIN = model.MAIL_SUBJECT_ADMIN
     this.MAIL_TEMPLATE_ADMIN = model.MAIL_TEMPLATE_ADMIN
+    this.SHOW_UA = model.SHOW_UA
+    this.SHOW_REGION = model.SHOW_REGION
   }
 }
 

src/js/utils/highlight.js

@@ -1,6 +1,6 @@
 import { app } from '../../view'
 
-const PRISM_CDN = 'https://cdn.jsdelivr.net/npm/prismjs@1.23.0'
+const PRISM_CDN = 'https://cdn.jsdelivr.net/npm/prismjs@1.28.0'
 let Prism
 let cssEl
 
@@ -22,9 +22,9 @@ const loadCss = (theme, prismCdn) => {
   if ((cssEl && twikooEl.contains(cssEl)) || !theme || theme === 'none') return
   cssEl = document.createElement('link')
   if (theme === 'default') {
-    cssEl.href = `${prismCdn}/themes/prism.css`
+    cssEl.href = `${prismCdn}/themes/prism.min.css`
   } else {
-    cssEl.href = `${prismCdn}/themes/prism-${theme}.css`
+    cssEl.href = `${prismCdn}/themes/prism-${theme}.min.css`
   }
   cssEl.rel = 'stylesheet'
   cssEl.type = 'text/css'

src/js/utils/i18n/i18n.js

@@ -236,6 +236,12 @@ export default {
     '外掛',
     'Plugin'
   ],
+  [S.ACC + '_PRIVACY']: [
+    '隐私',
+    '隱私',
+    '隱私',
+    'Privacy'
+  ],
   [S.ACC + '_SPAM']: [
     '反垃圾',
     '反垃圾',
@@ -482,6 +488,18 @@ export default {
     '啟用插入圖片功能，預設為：true',
     'Enable picture uploading. Default: true.'
   ],
+  [S.ACI + '_SHOW_UA']: [
+    '是否显示用户系统和浏览器，默认为：true',
+    '是否顯示使用者系統和瀏覽器，預設為：true',
+    '是否顯示使用者系統和瀏覽器，預設為：true',
+    'Show users\' OS and browser. Default: true.'
+  ],
+  [S.ACI + '_SHOW_REGION']: [
+    '是否显示用户 IP 属地到省，默认为：false',
+    '是否顯示使用者 IP 屬地到省，預設為：false',
+    '是否顯示使用者 IP 屬地到省，預設為：false',
+    'Show users\' IP region (province). Default: false.'
+  ],
   [S.ACI + '_SITE_NAME']: [
     '网站名称',
     '網站名稱',

src/vercel-min/package.json

@@ -1 +1 @@
-{ "dependencies": { "twikoo-vercel": "1.5.8" } }
+{ "dependencies": { "twikoo-vercel": "1.5.9" } }