karin-plugin-kkk 1.0.4 → 1.0.6

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [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)
+
+
+### Bug Fixes
+
+* 合辑解析 ([3cd2c9e](https://github.com/ikenxuan/karin-plugin-kkk/commit/3cd2c9e583770f624ed3ff34bf666f2dce8326f6))
+
+
+### Performance Improvements
+
+* 更新解析库版本 ([6dd3a77](https://github.com/ikenxuan/karin-plugin-kkk/commit/6dd3a777ded088f00cf52cddf9d21ba2f7b88037))
+
 ## [1.0.4](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.0.3...v1.0.4) (2025-01-19)
 
 

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/douyin.js

@@ -137,14 +137,12 @@ export class DouYin extends Base {
             }
             case 'user_mix_videos': {
                 const emojiData = await getDouyinData('Emoji数据');
-                const commentsData = await douyinComments(data.CommentsData, emojiData);
+                const commentsData = await douyinComments(data.CommentsData, Emoji(emojiData));
                 const commentImage = await Render('douyin/comment', {
                     Type: '合辑作品',
                     CommentsData: commentsData,
                     CommentLength: String(commentsData.jsonArray?.length ? commentsData.jsonArray.length : 0),
-                    share_url: this.is_mp4
-                        ? `https://aweme.snssdk.com/aweme/v1/play/?video_id=${data.VideoData.aweme_detail.video.play_addr.uri}&ratio=1080p&line=0`
-                        : data.VideoData.aweme_detail.share_url,
+                    share_url: data.LiveImageData.aweme_details[0].share_url,
                     VideoSize: '？？？',
                     VideoFPS: '？？？',
                     ImageLength: '？？？'

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

@@ -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.4",
+  "version": "1.0.6",
   "description": "a Karin video parsing tool",
   "keywords": [
     "karin-plugin",
@@ -50,7 +50,7 @@
     "watch": "karin watch"
   },
   "dependencies": {
-    "@ikenxuan/amagi": "4.2.4",
+    "@ikenxuan/amagi": "4.2.5",
     "@karinjs/md-html": "^1.1.6",
     "cors": "^2.8.5",
     "heic-convert": "^2.1.0",

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>