karin-plugin-kkk 1.6.9 → 1.6.11

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # 变更日志
 
+## [1.6.11](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.6.10...v1.6.11) (2025-06-15)
+
+
+### Bug Fixes
+
+* 不打包 '@karinjs/md-html' ([2392a0c](https://github.com/ikenxuan/karin-plugin-kkk/commit/2392a0cec5807ca035924cc6a3fdd7993676f6aa))
+
+## [1.6.10](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.6.9...v1.6.10) (2025-06-15)
+
+
+### Bug Fixes
+
+* **douyin:** 修复评论中表情替换和空格处理问题 ([d49a2e1](https://github.com/ikenxuan/karin-plugin-kkk/commit/d49a2e1b4dd5e7c28cbe15429c53f1d1951a3447))
+* 分割更新日志 ([11ddf95](https://github.com/ikenxuan/karin-plugin-kkk/commit/11ddf952338b459b9a0751c72aaad294f10559dc))
+* 移除内置更新 ([11ddf95](https://github.com/ikenxuan/karin-plugin-kkk/commit/11ddf952338b459b9a0751c72aaad294f10559dc))
+
 ## [1.6.9](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.6.8...v1.6.9) (2025-06-11)
 
 

package/lib/apps/admin.js

@@ -2,13 +2,14 @@ import fs from "node:fs";
 import karin, { logger } from "node-karin";
 import require$$1 from "path";
 import "sequelize";
-import "../chunk/db-BwUYgCsJ.js";
+import "../chunk/db-D3WhtbU7.js";
 import "../root.js";
-import "../chunk/vendor-FI9gb_Rv.js";
-import { C as Config, a as Common, b as bilibiliLogin, d as douyinLogin } from "../chunk/main-NN4to0wU.js";
+import "../chunk/vendor-BXFp06D9.js";
+import { C as Config, a as Common, b as bilibiliLogin, d as douyinLogin } from "../chunk/main-ACpbO-o9.js";
 import "node-karin/axios";
 import "stream/promises";
 import "node:path";
+import "@karinjs/md-html";
 const task = Config.app.rmmp4 && karin.task("[kkk-视频缓存自动删除]", "0 0 4 * * *", async () => {
   try {
     await removeAllFiles(Common.tempDri.video);

package/lib/apps/help.js

@@ -1,12 +1,12 @@
-import { execSync } from "node:child_process";
 import fs from "node:fs";
-import { m as markdown } from "../chunk/vendor-FI9gb_Rv.js";
-import karin, { mkdirSync, render, segment, isPackaged, updatePkg, updateGitPlugin, logger, common, restart } from "node-karin";
+import { markdown } from "@karinjs/md-html";
+import karin, { logs, mkdirSync, render, segment } from "node-karin";
 import { karinPathTemp } from "node-karin/root";
 import "sequelize";
-import "../chunk/db-BwUYgCsJ.js";
+import "../chunk/db-D3WhtbU7.js";
 import { Root } from "../root.js";
-import { R as Render, C as Config, a as Common } from "../chunk/main-NN4to0wU.js";
+import "../chunk/vendor-BXFp06D9.js";
+import { R as Render, a as Common } from "../chunk/main-ACpbO-o9.js";
 import "node-karin/axios";
 import "stream/promises";
 const help = karin.command(/^#?kkk帮助$/, async (e) => {
@@ -14,10 +14,10 @@ const help = karin.command(/^#?kkk帮助$/, async (e) => {
   await e.reply(img);
   return true;
 }, { name: "kkk-帮助" });
-const version = karin.command(/^#?kkk版本$/, async (e) => {
-  Config.douyin.push.switch = false;
-  const changelogs2 = fs.readFileSync(Root.pluginPath + "/CHANGELOG.md", "utf8");
-  const html = markdown(changelogs2, {
+const version = karin.command(/^#?kkk(版本|更新日志)$/, async (e) => {
+  const changelogContent = fs.readFileSync(Root.pluginPath + "/CHANGELOG.md", "utf8");
+  const forwardLogs = logs(Root.pluginVersion, changelogContent, 8, false);
+  const html = markdown(forwardLogs, {
     gitcss: Common.useDarkTheme() ? "github-markdown-dark.css" : "github-markdown-light.css"
   });
   mkdirSync(`${karinPathTemp}/html/${Root.pluginName}/version`);
@@ -27,95 +27,7 @@ const version = karin.command(/^#?kkk版本$/, async (e) => {
   await e.reply(segment.image("base64://" + img));
   return true;
 }, { name: "kkk-版本" });
-const changelogs = karin.command(/^#?kkk更新日志$/, async (e) => {
-  const commits = getLatestCommitsSync();
-  let htmlString = "";
-  for (const commit of commits) {
-    htmlString += `
-<div align="center" style="padding: 3em; border: ${setColor(commit.message)}; border-radius: 0 50px 25px 100px;">
-<p align="left" style="font-size: 1.5em; font-weight: 700;">${commit.message}</p>
-<p align="right" style="font-size: 1.15em">COMMITTER: ${commit.committer}</p>
-<p align="right" style="font-size: 1em">SHA: ${commit.sha}</p>
-</div><br>
-`;
-  }
-  const html = markdown(htmlString, {
-    gitcss: Common.useDarkTheme() ? "github-markdown-dark.css" : "github-markdown-light.css"
-  });
-  mkdirSync(`${karinPathTemp}/html/${Root.pluginName}/version`);
-  const htmlPath = `${karinPathTemp}/html/${Root.pluginName}/version/changelogs.html`;
-  fs.writeFileSync(htmlPath, html);
-  const img = await render.renderHtml(htmlPath);
-  await e.reply(segment.image("base64://" + img));
-  return true;
-}, { name: "kkk-更新日志" });
-const update = karin.command(/^#?kkk更新(预览版)?$/, async (e) => {
-  let status = "failed";
-  let data = "";
-  if (isPackaged) {
-    if (e.msg.includes("预览版")) {
-      const resolve = await updatePkg(Root.pluginName, "beta");
-      status = resolve.status;
-      data = resolve.data;
-    } else {
-      const resolve = await updatePkg(Root.pluginName);
-      status = resolve.status;
-      data = resolve.data;
-    }
-  } else {
-    let cmd = "git pull";
-    if (e.msg.includes("强制")) {
-      cmd = "git reset --hard && git pull --allow-unrelated-histories";
-    }
-    const resolve = await updateGitPlugin(Root.pluginPath, cmd);
-    status = resolve.status;
-    data = resolve.data;
-  }
-  logger.debug(data);
-  await e.bot.sendForwardMsg(e.contact, common.makeForward([segment.text(`更新 ${Root.pluginName}...
-${JSON.stringify(data)}`)], e.sender.userId, e.sender.nick));
-  if (status === "ok") {
-    try {
-      await e.reply(`
-更新完成，开始重启 本次运行时间：${common.uptime()}`, { at: true });
-      await restart(e.selfId, e.contact, e.messageId);
-      return true;
-    } catch (error) {
-      await e.reply(`${Root.pluginName}重启失败，请手动重启以应用更新！`);
-    }
-  }
-  return true;
-}, { name: "kkk-更新", perm: "master" });
-const getLatestCommitsSync = () => {
-  const command = 'git log -150 --pretty=format:"%h %an %s"';
-  const output = execSync(command, { cwd: Root.pluginPath }).toString();
-  const commits = output.trim().split("\n");
-  return commits.map((commit) => {
-    const [sha, ...rest] = commit.split(" ");
-    const spaceIndex = rest.findIndex((word) => word.includes(":"));
-    const committerAndMessage = rest.slice(0, spaceIndex);
-    const committer = committerAndMessage.join(" ");
-    const message = rest.slice(spaceIndex).join(" ").replace(/^:/, "").trim();
-    return { sha, committer, message };
-  }).slice(0, 50);
-};
-const setColor = (message) => {
-  switch (true) {
-    case message.includes("feat"):
-      return "10px solid #a9ffb9";
-    case message.includes("fix"):
-      return "10px solid #ffe96e;";
-    case message.includes("perf"):
-      return "10px solid #928eff";
-    case message.includes("refactor"):
-      return "10px solid #ff3b3b";
-    default:
-      return "2px solid";
-  }
-};
 export {
-  changelogs,
   help,
-  update,
   version
 };

package/lib/apps/push.js

@@ -1,13 +1,14 @@
-import { d as getDouyinData, g as getBilibiliData } from "../chunk/vendor-FI9gb_Rv.js";
+import { d as getDouyinData, g as getBilibiliData } from "../chunk/vendor-BXFp06D9.js";
 import karin from "node-karin";
 import "sequelize";
-import "../chunk/db-BwUYgCsJ.js";
+import "../chunk/db-D3WhtbU7.js";
 import "../root.js";
 import "node:fs";
-import { C as Config, c as DouYinpush, B as Bilibilipush } from "../chunk/main-NN4to0wU.js";
+import { C as Config, c as DouYinpush, B as Bilibilipush } from "../chunk/main-ACpbO-o9.js";
 import "node-karin/axios";
 import "stream/promises";
 import "node:path";
+import "@karinjs/md-html";
 import "node:child_process";
 import "playwright";
 const douyinPush = Config.douyin.push.switch && karin.task("抖音推送", Config.douyin.push.cron, async () => {

package/lib/apps/tools.js

@@ -1,10 +1,10 @@
 import karin, { logger } from "node-karin";
 import "sequelize";
-import "../chunk/db-BwUYgCsJ.js";
+import "../chunk/db-D3WhtbU7.js";
 import "../root.js";
 import "node:fs";
-import "../chunk/vendor-FI9gb_Rv.js";
-import { e as getDouyinID, f as DouYin, C as Config, h as getBilibiliID, i as Bilibili, j as getKuaishouID, k as fetchKuaishouData, K as Kuaishou, a as Common } from "../chunk/main-NN4to0wU.js";
+import "../chunk/vendor-BXFp06D9.js";
+import { e as getDouyinID, f as DouYin, C as Config, h as getBilibiliID, i as Bilibili, j as getKuaishouID, k as fetchKuaishouData, K as Kuaishou, a as Common } from "../chunk/main-ACpbO-o9.js";
 import "node-karin/axios";
 import "stream/promises";
 import "node:path";

package/lib/chunk/{db-BwUYgCsJ.js → db-D3WhtbU7.js}

@@ -4,8 +4,8 @@ import { logger } from "node-karin";
 import { karinPathBase } from "node-karin/root";
 import { Root } from "../root.js";
 import "node:fs";
-import "./vendor-FI9gb_Rv.js";
-import { C as Config, D as DynamicType } from "./main-NN4to0wU.js";
+import "./vendor-BXFp06D9.js";
+import { C as Config, D as DynamicType } from "./main-ACpbO-o9.js";
 import "node-karin/axios";
 import "stream/promises";
 const sequelize$1 = new Sequelize({

package/lib/chunk/{main-NN4to0wU.js → main-ACpbO-o9.js}

@@ -1,15 +1,16 @@
 import { Root } from "../root.js";
 import fs from "node:fs";
-import { C as Client, b as bilibiliErrorCodeMap, g as getBilibiliData, a as bilibiliApiUrls, w as wbi_sign, c as browserExports, i as index, d as getDouyinData, h as heicConvertExports, m as markdown } from "./vendor-FI9gb_Rv.js";
+import { C as Client, b as bilibiliErrorCodeMap, g as getBilibiliData, a as bilibiliApiUrls, w as wbi_sign, c as browserExports, i as index, d as getDouyinData, h as heicConvertExports } from "./vendor-BXFp06D9.js";
 import karin, { logger, config, segment, createNotFoundResponse, copyConfigSync, filesByExt, watch, requireFileSync, ffmpeg, ffprobe, render, common, defineConfig, components, karinPathRoot, mkdirSync, handler } from "node-karin";
 import axios, { AxiosError } from "node-karin/axios";
 import { pipeline } from "stream/promises";
 import path, { join } from "node:path";
 import "sequelize";
-import { douyinDB, bilibiliDB, cleanOldDynamicCache } from "./db-BwUYgCsJ.js";
+import { douyinDB, bilibiliDB, cleanOldDynamicCache } from "./db-D3WhtbU7.js";
 import _ from "node-karin/lodash";
 import { execSync, spawn } from "node:child_process";
 import { chromium } from "playwright";
+import { markdown } from "@karinjs/md-html";
 import { karinPathTemp, karinPathBase } from "node-karin/root";
 import YAML from "node-karin/yaml";
 class Base {
@@ -819,7 +820,7 @@ class Cfg {
   async syncConfigToDatabase() {
     try {
       const pushCfg = this.getYaml("config", "pushlist");
-      const { bilibiliDB: bilibiliDB2, douyinDB: douyinDB2 } = await import("./db-BwUYgCsJ.js");
+      const { bilibiliDB: bilibiliDB2, douyinDB: douyinDB2 } = await import("./db-D3WhtbU7.js");
       if (pushCfg.bilibili) {
         await bilibiliDB2.syncConfigSubscriptions(pushCfg.bilibili);
       }
@@ -4184,11 +4185,7 @@ async function douyinComments(data, emojidata) {
   for (const item1 of CommentData.jsonArray) {
     for (const item2 of emojidata) {
       if (item1.text.includes(item2.name)) {
-        if (item1.text.includes("[") && item1.text.includes("]")) {
-          item1.text = item1.text.replace(/\[[^\]]*\]/g, `<img src="${item2.url}"/>`).replace(/\\/g, "");
-        } else {
-          item1.text = `<img src="${item2.url}"/>`;
-        }
+        item1.text = item1.text.replaceAll(item2.name, `<img src="${item2.url}"/>`);
         item1.text += "&#160";
       }
     }
@@ -4258,6 +4255,9 @@ function br$1(data) {
   for (const i of data) {
     let text = i.text;
     text = text.replace(/\n/g, "<br>");
+    text = text.replace(/ {2,}/g, (match) => {
+      return "&nbsp;".repeat(match.length);
+    });
     i.text = text;
   }
   return data;
@@ -4475,8 +4475,8 @@ ${g_video_url}`));
           video_data.push(res);
         }
         if (Config.douyin.comment && Config.douyin.comment) {
-          const EmojiData = await this.amagi.getDouyinData("Emoji数据");
-          const list = await Emoji(EmojiData);
+          const EmojiData = await this.amagi.getDouyinData("Emoji数据", { typeMode: "strict" });
+          const list = Emoji(EmojiData);
           const commentsArray = await douyinComments(CommentsData, list);
           if (!commentsArray.jsonArray.length) {
             await this.e.reply("这个作品没有评论 ~");