twikoo-func 1.6.40 → 1.6.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twikoo-func",
-  "version": "1.6.40",
+  "version": "1.6.42",
   "description": "A simple comment system.",
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",

package/utils/image.js

@@ -20,9 +20,17 @@ const fn = {
       if (config.IMAGE_CDN === '7bu') {
         await fn.uploadImageToLskyPro({ photo, fileName, config, res, imageCdn: 'https://7bu.top' })
       } else if (config.IMAGE_CDN === 'smms') {
-        await fn.uploadImageToSmms({ photo, fileName, config, res })
+        await fn.uploadImageToSmms({ photo, fileName, config, res, imageCdn: 'https://smms.app/api/v2/upload' })
       } else if (isUrl(config.IMAGE_CDN)) {
         await fn.uploadImageToLskyPro({ photo, fileName, config, res, imageCdn: config.IMAGE_CDN })
+      } else if (config.IMAGE_CDN === 'lskypro') {
+        await fn.uploadImageToLskyPro({ photo, fileName, config, res, imageCdn: config.IMAGE_CDN_URL })
+      } else if (config.IMAGE_CDN === 'piclist') {
+        await fn.uploadImageToPicList({ photo, fileName, config, res, imageCdn: config.IMAGE_CDN_URL })
+      } else if (config.IMAGE_CDN === 'easyimage') {
+        await fn.uploadImageToEasyImage({ photo, fileName, config, res })
+      } else {
+        throw new Error('不支持的图片上传服务')
       }
     } catch (e) {
       logger.error(e)
@@ -31,11 +39,11 @@ const fn = {
     }
     return res
   },
-  async uploadImageToSmms ({ photo, fileName, config, res }) {
+  async uploadImageToSmms ({ photo, fileName, config, res, imageCdn }) {
     // SM.MS 图床 https://sm.ms
     const formData = new FormData()
     formData.append('smfile', fn.base64UrlToReadStream(photo, fileName))
-    const uploadResult = await axios.post('https://smms.app/api/v2/upload', formData, {
+    const uploadResult = await axios.post(imageCdn, formData, {
       headers: {
         ...formData.getHeaders(),
         Authorization: config.IMAGE_CDN_TOKEN
@@ -72,6 +80,74 @@ const fn = {
       throw new Error(uploadResult.data.message)
     }
   },
+  async uploadImageToPicList ({ photo, fileName, config, res, imageCdn }) {
+    // PicList https://piclist.cn/ 高效的云存储和图床平台管理工具
+    // 鉴权使用 query 参数 key
+    const formData = new FormData()
+    formData.append('file', fn.base64UrlToReadStream(photo, fileName))
+    let url = `${imageCdn}/upload`
+    // 如果填写了 key 则拼接 url
+    if (config.IMAGE_CDN_TOKEN) {
+      url += `?key=${config.IMAGE_CDN_TOKEN}`
+    }
+    const uploadResult = await axios.post(url, formData)
+    if (uploadResult.data.success) {
+      res.data = uploadResult.data
+      res.data.url = uploadResult.data.result[0]
+    } else {
+      throw new Error(uploadResult.data.message)
+    }
+  },
+  async uploadImageToEasyImage ({ photo, fileName, config, res }) {
+    // EasyImage2.0 https://github.com/icret/EasyImages2.0 简单图床 - 一款功能强大无数据库的图床 2.0版
+    try {
+      // 参数校验
+      if (!config.IMAGE_CDN_URL) {
+        throw new Error('未配置 EasyImage2.0 的 API 地址 (IMAGE_CDN_URL)')
+      }
+      if (!config.IMAGE_CDN_TOKEN) {
+        throw new Error('未配置 EasyImage2.0 的 Token (IMAGE_CDN_TOKEN)')
+      }
+      // 构建固定格式的 FormData
+      const formData = new FormData()
+      // 添加 token 参数到 Body
+      formData.append('token', config.IMAGE_CDN_TOKEN)
+      // 添加图片文件（固定参数名 image）
+      formData.append('image', fn.base64UrlToReadStream(photo, fileName), {
+        filename: fileName
+      })
+      // 发送请求
+      const uploadResult = await axios.post(config.IMAGE_CDN_URL, formData, {
+        headers: {
+          ...formData.getHeaders(),
+          'User-Agent': 'Twikoo'
+        }
+      })
+      // 解析响应
+      const response = uploadResult.data
+      // 检查业务状态码
+      if (response.code !== 200 || response.result !== 'success') {
+        throw new Error(`API 返回错误 (CODE: ${response.code})`)
+      }
+      // 提取图片 URL（固定 JSON 路径 url）
+      if (!response.url) {
+        throw new Error('未找到有效图片 URL')
+      }
+      // 返回标准化结构
+      res.data = {
+        url: response.url,
+        thumb: response.thumb, // 可选返回缩略图
+        del: response.del // 可选返回删除链接
+      }
+    } catch (e) {
+      let errorMsg = `EasyImage2.0 上传失败: ${e.message}`
+      // 追加 API 返回的错误详情
+      if (e.response?.data) {
+        errorMsg += ` | 错误类型: ${e.response.data.message || '未知'}`
+      }
+      throw new Error(errorMsg)
+    }
+  },
   base64UrlToReadStream (base64Url, fileName) {
     const base64 = base64Url.split(';base64,').pop()
     const writePath = path.resolve(os.tmpdir(), fileName)

package/utils/index.js

@@ -67,7 +67,7 @@ const fn = {
     if (config.SHOW_UA !== 'false') {
       try {
         const ua = bowser.getParser(comment.ua)
-        const os = fn.fixOS(ua.getOS())
+        const os = fn.fixOS(ua)
         displayOs = [os.name, os.versionName ? os.versionName : os.version].join(' ')
         displayBrowser = [ua.getBrowserName(), ua.getBrowserVersion()].join(' ')
       } catch (e) {
@@ -98,7 +98,8 @@ const fn = {
       updated: comment.updated
     }
   },
-  fixOS (os) {
+  fixOS (ua) {
+    const os = ua.getOS()
     if (!os.versionName) {
       // fix version name of Win 11 & macOS ^11 & Android ^10
       if (os.name === 'Windows' && os.version === 'NT 11.0') {
@@ -120,12 +121,27 @@ const fn = {
           12: 'Snow Cone',
           13: 'Tiramisu',
           14: 'Upside Down Cake',
-          15: 'Vanilla Ice Cream'
+          15: 'Vanilla Ice Cream',
+          16: 'Baklava'
         }[majorPlatformVersion]
+      } else if (ua.test(/harmony/i)) {
+        os.name = 'Harmony'
+        os.version = fn.getFirstMatch(/harmony[\s/-](\d+(\.\d+)*)/i, ua.getUA())
+        os.versionName = ''
       }
     }
     return os
   },
+  /**
+   * Get first matched item for a string
+   * @param {RegExp} regexp
+   * @param {String} ua
+   * @return {Array|{index: number, input: string}|*|boolean|string}
+   */
+  getFirstMatch (regexp, ua) {
+    const match = ua.match(regexp)
+    return (match && match.length > 0 && match[1]) || ''
+  },
   // 获取回复人昵称 / Get replied user nick name
   ruser (pid, comments = []) {
     const comment = comments.find((item) => item._id === pid)
@@ -262,7 +278,7 @@ const fn = {
       // 违禁词检测
       const commentLowerCase = comment.toLowerCase()
       const nickLowerCase = nick.toLowerCase()
-      for (const forbiddenWord of config.FORBIDDEN_WORDS.split(',')) {
+      for (const forbiddenWord of config.FORBIDDEN_WORDS.replace(/,+$/, '').split(',')) {
         const forbiddenWordLowerCase = forbiddenWord.trim().toLowerCase()
         if (commentLowerCase.indexOf(forbiddenWordLowerCase) !== -1 || nickLowerCase.indexOf(forbiddenWordLowerCase) !== -1) {
           logger.warn('包含违禁词，直接标记为垃圾评论~')