koishi-plugin-rocom 1.0.18 → 1.0.19

package/lib/commands/tools.js

@@ -5,23 +5,14 @@ const koishi_1 = require("koishi");
 const activities_service_1 = require("../activities-service");
 const send_image_1 = require("../send-image");
 const subscription_send_1 = require("../subscription-send");
+const permissions_1 = require("../permissions");
+const subscription_runner_1 = require("../subscription-runner");
+const announcement_service_1 = require("../announcement-service");
 const logger = new koishi_1.Logger('rocom-tools');
 const activitiesService = new activities_service_1.ActivitiesService();
 function trimText(value) {
     return String(value ?? '').trim();
 }
-function stripHtml(value) {
-    return trimText(value)
-        .replace(/<br\s*\/?>/gi, '\n')
-        .replace(/<\/p>/gi, '\n')
-        .replace(/<[^>]+>/g, '')
-        .replace(/&nbsp;/g, ' ')
-        .replace(/&amp;/g, '&')
-        .replace(/&lt;/g, '<')
-        .replace(/&gt;/g, '>')
-        .replace(/\n{3,}/g, '\n\n')
-        .trim();
-}
 function formatDate(value) {
     const text = trimText(value);
     if (!text)
@@ -72,37 +63,52 @@ function announcementTimestamp(item) {
     return 0;
 }
 function announcementSubscriptionKey(session) {
-    const privateChat = !session?.guildId;
+    const privateChat = (0, permissions_1.isDirectSession)(session);
     return [session?.platform || '', session?.channelId || 'private', privateChat ? (session?.userId || '') : '', 'announcement'].join(':');
 }
 // 上游 v3.2.0：轮询最新公告，向订阅会话推送新公告提醒。
-async function checkAnnouncementSubscriptions(deps) {
+async function checkAnnouncementSubscriptions(deps, signal) {
     const { ctx, client, announcementSubMgr } = deps;
     const subs = announcementSubMgr.getAll();
     const subEntries = Object.entries(subs);
     if (!subEntries.length)
         return { subscriptions: 0, pushed: 0 };
-    const latest = await client.getLatestAnnouncement(ctx, { category_id: 99 });
+    if (signal?.aborted)
+        return { subscriptions: 0, pushed: 0 };
+    const latest = await client.getLatestAnnouncement(ctx, { category_id: 99 }, '', signal);
+    if (signal?.aborted)
+        return { subscriptions: 0, pushed: 0 };
     const item = latest?.detail || latest?.announcement || latest;
     const latestId = announcementId(item);
     if (!latestId)
         return { subscriptions: subEntries.length, pushed: 0 };
     const latestTs = announcementTimestamp(item);
+    const view = (0, announcement_service_1.buildAnnouncementView)(latest, deps.config.apiBaseUrl);
+    let image;
     let pushed = 0;
     for (const [key, sub] of subEntries) {
+        if (signal?.aborted)
+            break;
+        if (JSON.stringify(announcementSubMgr.getAll()[key]) !== JSON.stringify(sub))
+            continue;
         if (latestId === String(sub.last_id || ''))
             continue;
         if (latestTs && sub.since_ts && latestTs <= sub.since_ts)
             continue;
-        const message = [`【洛克王国新公告】`, buildAnnouncementDetailText(latest)].join('\n');
+        const message = (0, announcement_service_1.announcementViewText)(view);
+        if (image === undefined)
+            image = await deps.renderer.renderPages(ctx, 'announcement/detail', view, { signal });
+        if (signal?.aborted)
+            break;
         try {
-            const sent = await (0, subscription_send_1.sendScheduledMessage)(ctx, {
+            const sent = await (0, subscription_send_1.sendScheduledImageWithFallback)(ctx, {
                 platform: sub.platform,
+                selfId: sub.self_id,
                 channelId: sub.channel_id || sub.guild_id || sub.user_id || '',
                 guildId: sub.guild_id || '',
                 userId: sub.user_id || '',
-            }, message);
-            if (!sent)
+            }, image, message, false, signal);
+            if (!sent || signal?.aborted || JSON.stringify(announcementSubMgr.getAll()[key]) !== JSON.stringify(sub))
                 continue;
         }
         catch (e) {
@@ -141,36 +147,14 @@ function buildAnnouncementListText(data, page) {
     lines.push('详情：洛克.公告详情 <公告ID>');
     return lines.join('\n');
 }
-function buildAnnouncementDetailText(data) {
-    const item = data?.detail || data?.announcement || data;
-    if (!item || typeof item !== 'object')
-        return '公告详情为空。';
-    const title = trimText(item?.title) || '未命名公告';
-    const id = announcementId(item);
-    const summary = trimText(item?.summary);
-    const content = stripHtml(item?.content?.text || item?.text || item?.content);
-    const lines = [
-        `公告详情${id ? ` #${id}` : ''}`,
-        title,
-        `发布时间：${formatDate(item?.publishAt || item?.published_at || item?.createdAt)}`,
-    ];
-    if (summary)
-        lines.push(`摘要：${summary}`);
-    if (content) {
-        lines.push('');
-        lines.push(content.length > 900 ? `${content.slice(0, 900)}...` : content);
-    }
-    const images = Array.isArray(item?.content?.indexes)
-        ? item.content.indexes.flatMap((entry) => Array.isArray(entry?.imageUrl) ? entry.imageUrl : [])
-        : [];
-    if (images.length) {
-        lines.push('');
-        lines.push(`图片资源：${images.slice(0, 3).join('\n')}`);
-    }
-    return lines.join('\n');
-}
 function register(deps) {
     const { ctx, client, config, renderer } = deps;
+    const runner = (0, subscription_runner_1.createRunner)(ctx);
+    const sendDetail = async (session, data) => {
+        const view = (0, announcement_service_1.buildAnnouncementView)(data, config.apiBaseUrl);
+        const pages = await renderer.renderPages(ctx, 'announcement/detail', view);
+        await (0, send_image_1.sendImageWithFallback)(session, pages, (0, announcement_service_1.announcementViewText)(view), 'announcement:detail', config);
+    };
     ctx.command('洛克').subcommand('.日历 [mode:string]', '查看洛克活动日历')
         .alias('洛克日历')
         .action(async ({ session }, mode = '') => {
@@ -191,7 +175,8 @@ function register(deps) {
         const data = await client.getAnnouncementList(ctx, { category_id: 99, page: currentPage, limit: 10 }, session?.userId || '');
         if (!data)
             return `公告列表查询失败：${client.getLastErrorBrief()}`;
-        return buildAnnouncementListText(data, currentPage);
+        const pages = await renderer.renderPages(ctx, 'announcement/list', (0, announcement_service_1.buildAnnouncementListView)(data, currentPage));
+        await (0, send_image_1.sendImageWithFallback)(session, pages, buildAnnouncementListText(data, currentPage), 'announcement:list', config);
     });
     ctx.command('洛克').subcommand('.最新公告', '查看最新洛克公告')
         .alias('洛克最新公告')
@@ -199,7 +184,7 @@ function register(deps) {
         const data = await client.getLatestAnnouncement(ctx, { category_id: 99 }, session?.userId || '');
         if (!data)
             return `最新公告查询失败：${client.getLastErrorBrief()}`;
-        return buildAnnouncementDetailText(data);
+        await sendDetail(session, data);
     });
     ctx.command('洛克').subcommand('.公告详情 <threadId:string>', '查看公告详情')
         .alias('洛克公告详情')
@@ -210,20 +195,23 @@ function register(deps) {
         const data = await client.getAnnouncementDetail(ctx, id, session?.userId || '');
         if (!data)
             return `公告详情查询失败：${client.getLastErrorBrief()}`;
-        return buildAnnouncementDetailText(data);
+        await sendDetail(session, data);
     });
-    ctx.command('订阅洛克公告', '订阅洛克王国新公告推送')
+    ctx.command('订阅洛克公告', '订阅洛克王国新公告推送').userFields(['authority'])
         .action(async ({ session }) => {
-        const privateChat = !session?.guildId;
-        if (!privateChat && !config.adminUserIds.includes(session?.userId || ''))
-            return '此指令仅限管理员使用。';
+        const privateChat = (0, permissions_1.isDirectSession)(session);
+        if (!(0, permissions_1.canManageSubscription)(config, session))
+            return '此指令仅限群管理员或机器人管理员使用。';
         const key = announcementSubscriptionKey(session);
         // 以当前最新公告为基线，只推送之后的新公告。
         const latest = await client.getLatestAnnouncement(ctx, { category_id: 99 }, session?.userId || '');
+        if (!latest)
+            return '获取公告基线失败，请稍后重新订阅。';
         const item = latest?.detail || latest?.announcement || latest;
         deps.announcementSubMgr.upsert(key, {
             key,
             platform: session?.platform || '',
+            self_id: session?.selfId || session?.bot?.selfId || '',
             channel_id: session?.channelId || '',
             guild_id: session?.guildId || '',
             user_id: privateChat ? (session?.userId || '') : '',
@@ -234,11 +222,11 @@ function register(deps) {
         });
         return '已订阅洛克王国新公告推送，检测到新公告时会在当前会话提醒。';
     });
-    ctx.command('取消订阅洛克公告', '取消洛克王国新公告推送')
+    ctx.command('取消订阅洛克公告', '取消洛克王国新公告推送').userFields(['authority'])
         .action(async ({ session }) => {
-        const privateChat = !session?.guildId;
-        if (!privateChat && !config.adminUserIds.includes(session?.userId || ''))
-            return '此指令仅限管理员使用。';
+        const privateChat = (0, permissions_1.isDirectSession)(session);
+        if (!(0, permissions_1.canManageSubscription)(config, session))
+            return '此指令仅限群管理员或机器人管理员使用。';
         const deleted = deps.announcementSubMgr.deleteMatching({
             platform: session?.platform || '',
             channelId: session?.channelId || '',
@@ -248,7 +236,7 @@ function register(deps) {
     });
     if (config.announcementSubscriptionEnabled) {
         ctx.setInterval(() => {
-            checkAnnouncementSubscriptions(deps).catch(err => logger.warn(`公告订阅检查失败: ${err}`));
+            runner(signal => checkAnnouncementSubscriptions(deps, signal)).catch(err => logger.warn(`公告订阅检查失败: ${err}`));
         }, Math.max(1, config.announcementPollIntervalMinutes || 10) * 60000);
     }
     ctx.command('洛克').subcommand('.同步配置', '手动同步 RoCom 远端配置')

package/lib/egg-service.d.ts

@@ -27,6 +27,7 @@ export declare class EggService {
     private rangeMatchScore;
     private formatPetCard;
     private formatSizeApiCard;
+    private rangePair;
     private splitNewSizeApiItems;
     private sizeApiResultGroups;
     private mergeCardsByName;
@@ -182,6 +183,13 @@ export declare class EggService {
     };
     buildWantPetData(pet: any): {
         target: {
+            probability: number;
+            match_count: number;
+            match_info_label: string;
+            size_variant: string;
+            size_variant_label: string;
+            size_variant_class: string;
+            size_variant_hint: string;
             id: any;
             name: string;
             icon: string;
@@ -195,15 +203,19 @@ export declare class EggService {
             weight_min: number;
             weight_max: number;
             weight_label: string;
-            probability: number;
-            match_count: number;
-            match_info_label: string;
         };
         egg_groups_label: string;
         female_rate: any;
         male_rate: any;
         is_undiscovered: boolean;
         fathers: {
+            probability: number;
+            match_count: number;
+            match_info_label: string;
+            size_variant: string;
+            size_variant_label: string;
+            size_variant_class: string;
+            size_variant_hint: string;
             id: any;
             name: string;
             icon: string;
@@ -217,9 +229,6 @@ export declare class EggService {
             weight_min: number;
             weight_max: number;
             weight_label: string;
-            probability: number;
-            match_count: number;
-            match_info_label: string;
         }[];
         father_count: number;
         commandHint: string;
@@ -229,6 +238,13 @@ export declare class EggService {
         keyword: string;
         count: number;
         candidates: {
+            probability: number;
+            match_count: number;
+            match_info_label: string;
+            size_variant: string;
+            size_variant_label: string;
+            size_variant_class: string;
+            size_variant_hint: string;
             id: any;
             name: string;
             icon: string;
@@ -242,13 +258,71 @@ export declare class EggService {
             weight_min: number;
             weight_max: number;
             weight_label: string;
-            probability: number;
-            match_count: number;
+        }[];
+        commandHint: string;
+        copyright: string;
+    };
+    buildCandidatesFromEggApi(keyword: string, candidates: any[]): {
+        keyword: string;
+        count: number;
+        candidates: {
+            id: any;
+            name: string;
+            icon: any;
+            image: any;
+            type_label: string;
+            egg_group_ids: any[];
+            egg_groups_label: string;
+            height_min: number;
+            height_max: number;
+            height_label: string;
+            weight_min: number;
+            weight_max: number;
+            weight_label: string;
+            probability: any;
+            match_count: any;
             match_info_label: string;
         }[];
         commandHint: string;
         copyright: string;
     };
+    buildSearchDataFromEggApi(pet: any, compatibleByGroup?: Record<string, any>): {
+        pet_name: string;
+        pet_id: any;
+        pet_icon: any;
+        pet_image: any;
+        type_label: string;
+        egg_groups_label: string;
+        egg_groups: number[];
+        egg_group_labels: Record<number, string>;
+        male_rate: any;
+        female_rate: any;
+        hatch_label: string;
+        weight_label: string;
+        height_label: string;
+        total_compatible: number;
+        compatible_total_known: boolean;
+        is_undiscovered: boolean;
+        egg_group_sections: any[];
+        total_stats: string;
+        egg_details: {
+            has_data: boolean;
+        };
+        commandHint: string;
+        copyright: string;
+    };
+    private formatEggApiCard;
+    private formatEggApiMember;
+    private eggApiGroups;
+    private eggGroupId;
+    private eggGroupLabel;
+    private eggGroupDesc;
+    private isUndiscoveredEggGroup;
+    private eggPetDisplayName;
+    private eggApiTypeLabel;
+    private eggGroupsLabel;
+    private eggHeightRangeM;
+    private eggWeightRangeKg;
     buildSizeSearchData(height?: number, weight?: number, results?: {
         perfect: any[];
         range: any[];