karin-plugin-kkk 1.0.5 → 1.0.7

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [1.0.7](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.0.6...v1.0.7) (2025-01-30)
+
+
+### Bug Fixes
+
+* 抖音推送图集解析 ([0ccc71a](https://github.com/ikenxuan/karin-plugin-kkk/commit/0ccc71a0bdb2e302a00a28bc9bbeeee415af4dba))
+* 移除无用导入 ([3a3aac3](https://github.com/ikenxuan/karin-plugin-kkk/commit/3a3aac37291dae65cad66f0a9fc80850ad95c265))
+
+## [1.0.6](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.0.5...v1.0.6) (2025-01-21)
+
+
+### Bug Fixes
+
+* **bilibili/douyin:** 优化用户列表渲染逻辑 ([dde7ee0](https://github.com/ikenxuan/karin-plugin-kkk/commit/dde7ee04d1f209d6da15ae06fe5e6590fae1bb1a))
+* 移除无用导入 ([3a3aac3](https://github.com/ikenxuan/karin-plugin-kkk/commit/3a3aac37291dae65cad66f0a9fc80850ad95c265))
+
 ## [1.0.5](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.0.4...v1.0.5) (2025-01-20)
 
 

package/README.md

@@ -88,19 +88,17 @@ git clone https://github.com/你的GitHub用户名/karin-plugin-kkk.git
 ```sh
 cd karin-plugin-kkk/
 ```
-4. 安装依赖
+4. 初始化开发环境
+```sh
+pnpm run init
+```
+5. 安装依赖
 ```sh
 pnpm install
 ```
-5. 启动开发环境
-
-两条命令任选一条执行
-
+6. 启动开发环境 
 ```sh
-# 自动重载 apps 目录下的所有文件
-pnpm ts
-# 保存 src 目录下的文件后自动重启
-pnpm watch
+pnpm dev
 ```
 </details>
 

package/lib/apps/admin.js

@@ -36,30 +36,29 @@ export const setbilick = karin.command(/^#?(kkk)?s*设置s*(B站)ck$/i, async (e
     await e.reply('设置成功！', { at: true });
     return true;
 }, { perm: 'master', name: 'kkk-ck管理', event: 'message.friend' });
-const authFailMsg = '你暂时没有这个权限使用这个功能啦 ~ 只有主人可以使用哦';
 // 插件类
 export class Admin extends Plugin {
     constructor() {
         super({
             name: 'kkk-管理',
             rule: [
-                { reg: createSwitchRegExp('app'), fnc: 'ConfigSwitch', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('app'), fnc: 'ConfigNumber', permission: 'master', authFailMsg },
-                { reg: createCustomRegExp('app'), fnc: 'ConfigCustom', permission: 'master', authFailMsg },
-                { reg: createSwitchRegExp('douyin'), fnc: 'ConfigSwitch', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('douyin'), fnc: 'ConfigNumber', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('douyin'), fnc: 'ConfigCustom', permission: 'master', authFailMsg },
-                { reg: createSwitchRegExp('bilibili'), fnc: 'ConfigSwitch', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('bilibili'), fnc: 'ConfigNumber', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('bilibili'), fnc: 'ConfigCustom', permission: 'master', authFailMsg },
-                { reg: createSwitchRegExp('upload'), fnc: 'ConfigSwitch', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('upload'), fnc: 'ConfigNumber', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('upload'), fnc: 'ConfigCustom', permission: 'master', authFailMsg },
-                { reg: createSwitchRegExp('kuaishou'), fnc: 'ConfigSwitch', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('kuaishou'), fnc: 'ConfigNumber', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('kuaishou'), fnc: 'ConfigCustom', permission: 'master', authFailMsg },
-                { reg: /^#kkk设置$/, fnc: 'index_Settings', permission: 'master', authFailMsg },
-                { reg: /^#?kkk删除缓存$/, fnc: 'deleteCache', permission: 'master', authFailMsg }
+                { reg: createSwitchRegExp('app'), fnc: 'ConfigSwitch', permission: 'master' },
+                { reg: createNumberRegExp('app'), fnc: 'ConfigNumber', permission: 'master' },
+                { reg: createCustomRegExp('app'), fnc: 'ConfigCustom', permission: 'master' },
+                { reg: createSwitchRegExp('douyin'), fnc: 'ConfigSwitch', permission: 'master' },
+                { reg: createNumberRegExp('douyin'), fnc: 'ConfigNumber', permission: 'master' },
+                { reg: createNumberRegExp('douyin'), fnc: 'ConfigCustom', permission: 'master' },
+                { reg: createSwitchRegExp('bilibili'), fnc: 'ConfigSwitch', permission: 'master' },
+                { reg: createNumberRegExp('bilibili'), fnc: 'ConfigNumber', permission: 'master' },
+                { reg: createNumberRegExp('bilibili'), fnc: 'ConfigCustom', permission: 'master' },
+                { reg: createSwitchRegExp('upload'), fnc: 'ConfigSwitch', permission: 'master' },
+                { reg: createNumberRegExp('upload'), fnc: 'ConfigNumber', permission: 'master' },
+                { reg: createNumberRegExp('upload'), fnc: 'ConfigCustom', permission: 'master' },
+                { reg: createSwitchRegExp('kuaishou'), fnc: 'ConfigSwitch', permission: 'master' },
+                { reg: createNumberRegExp('kuaishou'), fnc: 'ConfigNumber', permission: 'master' },
+                { reg: createNumberRegExp('kuaishou'), fnc: 'ConfigCustom', permission: 'master' },
+                { reg: /^#kkk设置$/, fnc: 'index_Settings', permission: 'master' },
+                { reg: /^#?kkk删除缓存$/, fnc: 'deleteCache', permission: 'master' }
             ]
         });
     }

package/lib/module/utils/Networks.d.ts

@@ -29,7 +29,7 @@ export declare class Networks {
     getfetch(): Promise<AxiosResponse | boolean>;
     returnResult(): Promise<AxiosResponse>;
     /** 最终地址（跟随重定向） */
-    getLongLink(): Promise<string>;
+    getLongLink(url?: string): Promise<string>;
     /** 获取首个302链接 */
     getLocation(): Promise<AxiosResponse['headers']['location']>;
     /** 获取数据并处理数据的格式化，默认json */

package/lib/module/utils/Networks.js

@@ -156,19 +156,20 @@ export class Networks {
         return response;
     }
     /** 最终地址（跟随重定向） */
-    async getLongLink() {
+    async getLongLink(url = '') {
         try {
-            const response = await this.axiosInstance({
-                method: 'GET',
-                url: this.url
-            });
-            return response.request.res.responseUrl; // axios中获取最终的请求URL
+            const response = await this.axiosInstance.get(this.url || url);
+            return response.request.res.responseUrl;
         }
         catch (error) {
-            if (error instanceof AxiosError) {
-                throw new Error(error.stack);
+            const axiosError = error;
+            if (axiosError.response && axiosError.response.status === 302) {
+                // 获取重定向地址
+                const redirectUrl = axiosError.response.headers.location;
+                // 递归调用，直到获取最终地址
+                return this.getLongLink(redirectUrl);
             }
-            return '';
+            throw error;
         }
     }
     /** 获取首个302链接 */

package/lib/platform/bilibili/push.d.ts

@@ -81,9 +81,8 @@ export declare class Bilibilipush extends Base {
     /**
      * 渲染推送列表图片
      * @param pushList B站配置文件的推送列表
-     * @param host_mid 优先展示的UP主的UID
      * @returns
      */
-    renderPushList(pushList: bilibiliPushItem[], host_mid?: string): Promise<true | undefined>;
+    renderPushList(pushList: bilibiliPushItem[]): Promise<void>;
 }
 export {};

package/lib/platform/bilibili/push.js

@@ -536,7 +536,7 @@ export class Bilibilipush extends Base {
                     await this.e.reply('请发送「#kkk设置B站推送开启」以进行推送');
                 logger.info(`\n设置成功！${data.data.card.name}\nUID：${host_mid}`);
                 // 渲染状态图片
-                await this.renderPushList(config.bilibili, host_mid);
+                await this.renderPushList(config.bilibili);
             }
         }
         else {
@@ -550,7 +550,7 @@ export class Bilibilipush extends Base {
             if (Config.bilibili.push.switch === false)
                 await this.e.reply('请发送「#kkk设置B站推送开启」以进行推送');
             // 渲染状态图片
-            await this.renderPushList(config.bilibili, host_mid);
+            await this.renderPushList(config.bilibili);
         }
         // 更新配置文件
         Config.Modify('pushlist', 'bilibili', config.bilibili);
@@ -605,35 +605,28 @@ export class Bilibilipush extends Base {
     /**
      * 渲染推送列表图片
      * @param pushList B站配置文件的推送列表
-     * @param host_mid 优先展示的UP主的UID
      * @returns
      */
-    async renderPushList(pushList, host_mid) {
+    async renderPushList(pushList) {
         const groupInfo = await this.e.bot.getGroupInfo('groupId' in this.e && this.e.groupId ? this.e.groupId : '');
+        /** 排除出有e.groupId的推送用户 */
         const filteredList = pushList.filter(item => item.group_id.some(group => group.split(':')[0] === groupInfo.groupId));
         if (filteredList.length === 0) {
             await this.e.reply(`当前群：${groupInfo.groupName}(${groupInfo.groupId})\n没有设置任何B站UP推送！\n可使用「#设置B站推送 + UP主UID」进行设置`);
-            return true;
         }
         /** 用户的今日动态列表 */
-        const DynamicList = await this.getDynamicList(filteredList);
         const renderOpt = [];
-        for (const dynamic_id in removeDuplicateHostMid(DynamicList.willbepushlist)) {
-            const item = DynamicList.willbepushlist[dynamic_id];
+        for (const item of filteredList) {
             const userInfo = await getBilibiliData('用户主页数据', Config.cookies.bilibili, { host_mid: item.host_mid });
             renderOpt.push({
                 avatar_img: userInfo.data.card.face,
                 username: userInfo.data.card.name,
-                host_mid: host_mid ?? userInfo.data.card.mid,
+                host_mid: userInfo.data.card.mid,
                 fans: this.count(userInfo.data.follower),
                 total_favorited: this.count(userInfo.data.like_num),
-                following_count: this.count(userInfo.data.card.attention),
-                willPushNum: 999
+                following_count: this.count(userInfo.data.card.attention)
             });
         }
-        // 将此次设置推送的用户排序到首位
-        if (host_mid)
-            renderOpt.sort((a, b) => (a.host_mid === host_mid ? -1 : b.host_mid === host_mid ? 1 : 0));
         const img = await Render('bilibili/userlist', { renderOpt });
         await this.e.reply(img);
     }
@@ -698,15 +691,3 @@ const skipDynamic = (Dynamic_Data) => {
     }
     return false;
 };
-const removeDuplicateHostMid = (willBePushList) => {
-    const result = {};
-    const seenHostMids = new Set();
-    for (const key in willBePushList) {
-        const item = willBePushList[key];
-        if (!seenHostMids.has(item.host_mid)) {
-            result[key] = item;
-            seenHostMids.add(item.host_mid);
-        }
-    }
-    return result;
-};

package/lib/platform/douyin/getID.js

@@ -7,7 +7,12 @@ import { Networks } from '../../module/utils/index.js';
  * @returns
  */
 export async function getDouyinID(url, log = true) {
-    const longLink = await new Networks({ url }).getLongLink();
+    const longLink = await new Networks({
+        url,
+        headers: {
+            'User-Agent': 'Apifox/1.0.0 (https://apifox.com)'
+        }
+    }).getLongLink();
     let result = {};
     switch (true) {
         case /https:\/\/(?:www\.iesdouyin\.com)\/share\/slides/.test(longLink):

package/lib/platform/douyin/push.d.ts

@@ -69,6 +69,11 @@ export declare class DouYinpush extends Base {
      * @returns 操作成功或失败的消息字符串。
      */
     setting(data: any): Promise<void>;
-    renderPushList(pushList: douyinPushItem[], short_id?: string): Promise<true | undefined>;
+    /**
+     * 渲染推送列表图片
+     * @param pushList 抖音推送列表
+     * @returns
+     */
+    renderPushList(pushList: douyinPushItem[]): Promise<void>;
 }
 export {};

package/lib/platform/douyin/push.js

@@ -130,7 +130,7 @@ export class DouYinpush extends Base {
                             else if (!iddata.is_mp4 && iddata.type === 'one_work') { // 如果新作品是图集
                                 const imageres = [];
                                 let image_url;
-                                for (const item of Detail_Data.aweme_detail.images) {
+                                for (const item of Detail_Data.images) {
                                     image_url = item.url_list[2] || item.url_list[1]; // 图片地址
                                     imageres.push(segment.image(image_url));
                                 }
@@ -496,7 +496,7 @@ export class DouYinpush extends Base {
                         await this.e.reply('请发送「#kkk设置B站推送开启」以进行推送');
                     logger.info(`\n设置成功！${UserInfoData.user.nickname}\n抖音号：${user_shortid}\nsec_uid${UserInfoData.user.sec_uid}`);
                     // 渲染状态图片
-                    await this.renderPushList(config.douyin, user_shortid);
+                    await this.renderPushList(config.douyin);
                 }
             }
             else {
@@ -510,7 +510,7 @@ export class DouYinpush extends Base {
                 if (Config.douyin.push.switch === false)
                     await this.e.reply('请发送「#kkk设置B站推送开启」以进行推送');
                 // 渲染状态图片
-                await this.renderPushList(config.douyin, user_shortid);
+                await this.renderPushList(config.douyin);
             }
             Config.Modify('pushlist', 'douyin', config.douyin);
         }
@@ -518,18 +518,20 @@ export class DouYinpush extends Base {
             logger.error(error);
         }
     }
-    async renderPushList(pushList, short_id) {
+    /**
+     * 渲染推送列表图片
+     * @param pushList 抖音推送列表
+     * @returns
+     */
+    async renderPushList(pushList) {
         const groupInfo = await this.e.bot.getGroupInfo('groupId' in this.e && this.e.groupId ? this.e.groupId : '');
+        /** 排除出有e.groupId的推送用户 */
         const filteredList = pushList.filter(item => item.group_id.some(group => group.split(':')[0] === groupInfo.groupId));
         if (filteredList.length === 0) {
             await this.e.reply(`当前群：${groupInfo.groupName}(${groupInfo.groupId})\n没有设置任何抖音博主推送！\n可使用「#设置抖音推送 + 抖音号」进行设置`);
-            return true;
         }
-        /** 用户的今日动态列表 */
-        const DynamicList = await this.getDynamicList(filteredList);
         const renderOpt = [];
-        for (const dynamic_id in removeDuplicateHostMid(DynamicList.willbepushlist)) {
-            const item = DynamicList.willbepushlist[dynamic_id];
+        for (const item of filteredList) {
             const userInfo = await getDouyinData('用户主页数据', Config.cookies.douyin, { sec_uid: item.sec_uid });
             renderOpt.push({
                 avatar_img: userInfo.user.avatar_larger.url_list[0],
@@ -537,13 +539,9 @@ export class DouYinpush extends Base {
                 short_id: userInfo.user.unique_id === '' ? userInfo.user.short_id : userInfo.user.unique_id,
                 fans: this.count(userInfo.user.follower_count),
                 total_favorited: this.count(userInfo.user.total_favorited),
-                following_count: this.count(userInfo.user.following_count),
-                willPushNum: 999
+                following_count: this.count(userInfo.user.following_count)
             });
         }
-        // 将此次设置推送的用户排序到首位
-        if (short_id)
-            renderOpt.sort((a, b) => (a.short_id === short_id ? -1 : b.short_id === short_id ? 1 : 0));
         const img = await Render('douyin/userlist', { renderOpt });
         await this.e.reply(img);
     }
@@ -631,15 +629,3 @@ const findMatchingSecUid = (DBdata, secUidToCheck) => {
     }
     return '';
 };
-const removeDuplicateHostMid = (willBePushList) => {
-    const result = {};
-    const seenHostMids = new Set();
-    for (const key in willBePushList) {
-        const item = willBePushList[key];
-        if (!seenHostMids.has(item.sec_uid)) {
-            result[key] = item;
-            seenHostMids.add(item.sec_uid);
-        }
-    }
-    return result;
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-kkk",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "a Karin video parsing tool",
   "keywords": [
     "karin-plugin",
@@ -36,18 +36,9 @@
     "pub": "npm publish --access public",
     "pub-beta": "npm publish --tag beta",
     "sort": "npx sort-package-json",
-    "karin": "karin",
-    "app": "karin app",
     "start": "karin start",
-    "pm2": "karin pm2",
-    "stop": "karin stop",
-    "rs": "karin rs",
-    "log": "karin log",
-    "up": "karin up",
     "init": "karin init",
-    "dev": "tsx watch --include \"src/**/*.ts\" src/index.ts",
-    "ts": "karin ts",
-    "watch": "karin watch"
+    "dev": "tsx watch --include \"src/**/*.ts\" src/index.ts"
   },
   "dependencies": {
     "@ikenxuan/amagi": "4.2.5",

package/resources/template/bilibili/html/userlist.html

@@ -17,11 +17,6 @@
           <span>关注: {{val.following_count}}</span>
         </div>
       </div>
-      <!-- {{if val.willPushNum > 0}}
-      <span class="pending-push active">待推送: {{val.willPushNum}}</span>
-      {{else}}
-      <span class="pending-push inactive">待推送: {{val.willPushNum}}</span>
-      {{/if}} -->
     </div>
   </li>
   <div style="height: 40px;"></div>

package/resources/template/douyin/html/userlist.html

@@ -11,7 +11,7 @@
       <div class="user-details">
         <span class="user-name">{{val.username}}</span>
         <div class="user-stats">
-          <span>UID: {{val.short_id}}</span>
+          <span>抖音号: {{val.short_id}}</span>
           <span>粉丝: {{val.fans}}</span>
           <span>获赞: {{val.total_favorited}}</span>
           <span>关注: {{val.following_count}}</span>