koishi-plugin-rocom 1.0.10 → 1.0.12

package/lib/commands/community.js

@@ -0,0 +1,323 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCommunityHandlers = createCommunityHandlers;
+const koishi_1 = require("koishi");
+const logger = new koishi_1.Logger('rocom-community');
+function trimText(value) {
+    return String(value ?? '').trim();
+}
+function formatPostTime(value) {
+    const text = trimText(value);
+    if (!text)
+        return '未知时间';
+    const date = new Date(text);
+    if (Number.isNaN(date.getTime()))
+        return text;
+    const pad = (num) => String(num).padStart(2, '0');
+    return `${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
+}
+function pageNumber(value, defaultValue = 1) {
+    const num = Number(value);
+    if (!Number.isFinite(num) || num < 1)
+        return defaultValue;
+    return Math.min(50, Math.floor(num));
+}
+function normalizeItems(payload) {
+    if (Array.isArray(payload?.items))
+        return payload.items;
+    if (Array.isArray(payload?.posts))
+        return payload.posts;
+    if (Array.isArray(payload?.data?.items))
+        return payload.data.items;
+    return [];
+}
+function postId(item) {
+    return trimText(item?.post_id || item?.id || item?.postId);
+}
+function buildExchangeListText(data, pageNo) {
+    const items = normalizeItems(data);
+    if (!items.length)
+        return pageNo > 1 ? '该页没有更多换蛋帖了。' : '当前换蛋广场暂无帖子。';
+    const lines = ['换蛋广场'];
+    for (const [index, item] of items.entries()) {
+        const pinned = trimText(item?.pinned_until) ? '[置顶]' : '';
+        const roleId = trimText(item?.id) || '-';
+        const have = trimText(item?.have_text) || '未填写';
+        const want = trimText(item?.want_text) || '未填写';
+        const note = trimText(item?.want_note);
+        const remark = trimText(item?.remark);
+        const id = postId(item);
+        lines.push(`${index + 1}. ${pinned}[${id || roleId}] 我有：${have} -> 想要：${want}`);
+        if (note)
+            lines.push(`   补充：${note}`);
+        if (remark)
+            lines.push(`   备注：${remark}`);
+        lines.push(`   学号：${roleId} | ${formatPostTime(item?.created_at)}`);
+    }
+    const total = Number(data?.total);
+    const totalPages = Number(data?.total_pages);
+    const current = Number(data?.page_no) || pageNo;
+    if (Number.isFinite(totalPages) && totalPages > 1) {
+        lines.push(`第 ${current}/${totalPages} 页，共 ${Number.isFinite(total) ? total : items.length} 条`);
+    }
+    lines.push('翻页：换蛋广场 <页码>');
+    return lines.join('\n');
+}
+function statusLabel(value) {
+    const map = {
+        active: '生效中',
+        closed: '已关闭',
+        deleted: '已删除',
+    };
+    return map[value] || value || '未知';
+}
+function reviewLabel(value) {
+    const map = {
+        pending: '待审核',
+        manual_pending: '人工审核中',
+        approved: '已通过',
+        rejected: '已拒绝',
+    };
+    return map[value] || value || '未知';
+}
+function buildMyPostsText(data) {
+    const items = normalizeItems(data);
+    if (!items.length)
+        return '你当前没有换蛋帖。';
+    const lines = ['我的换蛋帖'];
+    for (const [index, item] of items.entries()) {
+        const have = trimText(item?.have_text) || '未填写';
+        const want = trimText(item?.want_text) || '未填写';
+        const id = postId(item);
+        lines.push(`${index + 1}. [${id || '-'}] 我有：${have} -> 想要：${want}`);
+        lines.push(`   状态：${statusLabel(item?.status)} | 审核：${reviewLabel(item?.review_status)} | ${formatPostTime(item?.created_at)}`);
+    }
+    lines.push('关闭帖子：关闭换蛋帖 <帖子ID> [traded/cancel]');
+    return lines.join('\n');
+}
+function parsePostArgs(raw) {
+    const text = trimText(raw);
+    const match = text.match(/^(\d{4,20})\s+(.+)$/);
+    if (!match) {
+        throw new Error('格式：发布换蛋帖 <学号> <我有>|<想要>|[补充]|[备注]');
+    }
+    const parts = match[2].split(/[|｜]/).map(part => trimText(part)).filter(Boolean);
+    if (parts.length < 2) {
+        throw new Error('请用 | 分隔“我有”和“想要”，例如：发布换蛋帖 470557585 雪怪果实|上岸蛙|固执|全天在线');
+    }
+    return {
+        id: match[1],
+        have_text: parts[0],
+        want_text: parts[1],
+        want_note: parts[2] || '',
+        remark: parts.slice(3).join(' | '),
+    };
+}
+function parseSubscribeFilters(raw) {
+    const filters = {};
+    const keyMap = {
+        '想要': 'want_text',
+        '我有': 'have_text',
+        '补充': 'want_note',
+        '学号': 'id',
+        '搜索': 'q',
+    };
+    for (const token of trimText(raw).split(/\s+/).filter(Boolean)) {
+        const match = token.match(/^(.+?)[:：](.+)$/);
+        if (match) {
+            const key = keyMap[trimText(match[1])] || trimText(match[1]);
+            const value = trimText(match[2]);
+            if (key && value)
+                filters[key] = value;
+            continue;
+        }
+        filters.want_text = filters.want_text ? `${filters.want_text} ${token}` : token;
+    }
+    return filters;
+}
+function buildSubscriptionsText(data) {
+    const subscriptions = Array.isArray(data?.subscriptions) ? data.subscriptions : [];
+    if (!subscriptions.length)
+        return '当前没有换蛋订阅。';
+    const lines = ['换蛋订阅列表'];
+    subscriptions.forEach((subscription, index) => {
+        const id = trimText(subscription?.subscription_id);
+        const filters = subscription?.filters && typeof subscription.filters === 'object'
+            ? Object.entries(subscription.filters).map(([key, value]) => `${key}=${value}`).join('、')
+            : '无筛选';
+        lines.push(`${index + 1}. [${id || '-'}] ${filters}`);
+        lines.push(`   状态：${subscription?.status || '未知'} | ${formatPostTime(subscription?.updated_at || subscription?.created_at)}`);
+    });
+    return lines.join('\n');
+}
+function buildEventsText(data) {
+    const items = Array.isArray(data?.items) ? data.items : [];
+    if (!items.length)
+        return `暂未拉取到新的换蛋事件。next_event_id=${data?.next_event_id ?? 0}`;
+    const lines = [`换蛋订阅事件 next_event_id=${data?.next_event_id ?? '-'}`];
+    for (const item of items) {
+        const post = item?.post || {};
+        lines.push(`[${item?.event_id ?? '-'}] ${formatPostTime(item?.created_at)} 我有：${trimText(post?.have_text) || '未填写'} -> 想要：${trimText(post?.want_text) || '未填写'}`);
+        if (post?.want_note)
+            lines.push(`   补充：${post.want_note}`);
+        if (postId(post))
+            lines.push(`   帖子ID：${postId(post)}`);
+    }
+    if (data?.has_more)
+        lines.push('还有更多事件，可继续使用 next_event_id 拉取。');
+    return lines.join('\n');
+}
+function ensureGroupAdmin(session, adminUserIds) {
+    if (!session?.guildId)
+        return '';
+    if (adminUserIds.includes(session?.userId || ''))
+        return '';
+    return '群聊中仅 Bot 管理员可以管理换蛋订阅。';
+}
+function createCommunityHandlers(deps) {
+    const { ctx, client, config } = deps;
+    const queryExchangeList = async ({ session }, page = 1) => {
+        const pageNo = pageNumber(page);
+        const data = await client.getEggExchanges(ctx, { page_no: pageNo, page_size: 10 }, session?.userId || '');
+        if (!data)
+            return `换蛋广场查询失败：${client.getLastErrorBrief()}`;
+        return buildExchangeListText(data, pageNo);
+    };
+    const postExchange = async ({ session }, args = '') => {
+        try {
+            const payload = parsePostArgs(args);
+            const data = await client.postEggExchange(ctx, payload, session?.userId || '');
+            if (!data)
+                return `发布换蛋帖失败：${client.getLastErrorBrief()}`;
+            const id = trimText(data?.post_id || data?.id || data?.post?.post_id);
+            const similarPosts = Array.isArray(data?.similar_posts) ? data.similar_posts : [];
+            const lines = [
+                '换蛋帖发布成功，帖子已进入审核。',
+                `学号：${payload.id}`,
+                `我有：${payload.have_text}`,
+                `想要：${payload.want_text}`,
+            ];
+            if (payload.want_note)
+                lines.push(`补充：${payload.want_note}`);
+            if (payload.remark)
+                lines.push(`备注：${payload.remark}`);
+            if (id)
+                lines.push(`帖子ID：${id}`);
+            if (similarPosts.length) {
+                lines.push('相似帖子：');
+                similarPosts.slice(0, 3).forEach((post) => {
+                    lines.push(`  [${postId(post) || '-'}] 我有：${trimText(post?.have_text)} -> 想要：${trimText(post?.want_text)}`);
+                });
+            }
+            return lines.join('\n');
+        }
+        catch (error) {
+            logger.warn(`发布换蛋帖失败: ${error}`);
+            return `发布换蛋帖失败：${error?.message || error}`;
+        }
+    };
+    const queryMyPosts = async ({ session }) => {
+        const data = await client.getMyEggExchanges(ctx, { page_no: 1, page_size: 20 }, session?.userId || '');
+        if (!data)
+            return `查询我的换蛋帖失败：${client.getLastErrorBrief()}`;
+        return buildMyPostsText(data);
+    };
+    const closePost = async ({ session }, postIdArg, reason = 'cancel') => {
+        const id = trimText(postIdArg);
+        if (!id)
+            return '请提供帖子 ID。用法：关闭换蛋帖 <帖子ID> [traded/cancel]';
+        const normalizedReason = reason === 'traded' ? 'traded' : 'cancel';
+        const data = await client.closeEggExchange(ctx, id, normalizedReason, session?.userId || '');
+        if (!data)
+            return `关闭换蛋帖失败：${client.getLastErrorBrief()}`;
+        return `换蛋帖 ${id} 已关闭，原因：${normalizedReason === 'traded' ? '成交关闭' : '取消关闭'}。`;
+    };
+    const reviewStatus = async ({ session }, postIdArg) => {
+        const id = trimText(postIdArg);
+        if (!id)
+            return '请提供帖子 ID。用法：换蛋审核 <帖子ID>';
+        const data = await client.getEggExchangeReviewStatus(ctx, id, session?.userId || '');
+        if (!data)
+            return `查询换蛋审核状态失败：${client.getLastErrorBrief()}`;
+        const post = data?.post || data;
+        return [
+            `帖子ID：${id}`,
+            `状态：${statusLabel(post?.status)}`,
+            `审核：${reviewLabel(post?.review_status)}`,
+            post?.review_reason ? `原因：${post.review_reason}` : '',
+        ].filter(Boolean).join('\n');
+    };
+    const subscribeEgg = async ({ session }, filtersText = '') => {
+        const adminError = ensureGroupAdmin(session, config.adminUserIds);
+        if (adminError)
+            return adminError;
+        const filters = parseSubscribeFilters(filtersText);
+        if (!Object.keys(filters).length) {
+            return '用法：订阅换蛋 想要:上岸蛙 补充:固执\n支持筛选键：想要、我有、补充、学号、搜索';
+        }
+        const data = await client.createEggExchangeSubscription(ctx, filters, session?.userId || '');
+        if (!data)
+            return `订阅换蛋失败：${client.getLastErrorBrief()}`;
+        const subscription = data?.subscription || data;
+        const id = trimText(subscription?.subscription_id);
+        const filterText = Object.entries(filters).map(([key, value]) => `${key}=${value}`).join('、');
+        return [
+            '换蛋订阅创建成功。',
+            `筛选条件：${filterText}`,
+            id ? `订阅ID：${id}` : '',
+            '可使用“换蛋事件 <订阅ID>”手动拉取新通过帖子。',
+        ].filter(Boolean).join('\n');
+    };
+    const listSubscriptions = async ({ session }) => {
+        const data = await client.getEggExchangeSubscriptions(ctx, session?.userId || '');
+        if (!data)
+            return `查询换蛋订阅失败：${client.getLastErrorBrief()}`;
+        return buildSubscriptionsText(data);
+    };
+    const unsubscribeEgg = async ({ session }, subscriptionId = '') => {
+        const adminError = ensureGroupAdmin(session, config.adminUserIds);
+        if (adminError)
+            return adminError;
+        const id = trimText(subscriptionId);
+        if (id) {
+            const ok = await client.deleteEggExchangeSubscription(ctx, id, session?.userId || '');
+            return ok ? `已取消换蛋订阅 ${id}。` : `取消换蛋订阅失败：${client.getLastErrorBrief()}`;
+        }
+        const data = await client.getEggExchangeSubscriptions(ctx, session?.userId || '');
+        if (!data)
+            return `查询换蛋订阅失败：${client.getLastErrorBrief()}`;
+        const subscriptions = Array.isArray(data?.subscriptions) ? data.subscriptions : [];
+        if (!subscriptions.length)
+            return '当前没有换蛋订阅。';
+        let deleted = 0;
+        for (const subscription of subscriptions) {
+            const subId = trimText(subscription?.subscription_id);
+            if (!subId)
+                continue;
+            const ok = await client.deleteEggExchangeSubscription(ctx, subId, session?.userId || '');
+            if (ok)
+                deleted++;
+        }
+        return deleted ? `已取消 ${deleted} 个换蛋订阅。` : '没有成功取消任何换蛋订阅。';
+    };
+    const queryEvents = async ({ session }, subscriptionId, afterEventId = '') => {
+        const id = trimText(subscriptionId);
+        if (!id)
+            return '请提供订阅 ID。用法：换蛋事件 <订阅ID> [after_event_id]';
+        const data = await client.getEggExchangeEvents(ctx, id, afterEventId, 20, session?.userId || '');
+        if (!data)
+            return `拉取换蛋事件失败：${client.getLastErrorBrief()}`;
+        return buildEventsText(data);
+    };
+    return {
+        queryExchangeList,
+        postExchange,
+        queryMyPosts,
+        closePost,
+        reviewStatus,
+        subscribeEgg,
+        listSubscriptions,
+        unsubscribeEgg,
+        queryEvents,
+    };
+}

package/lib/commands/egg.js

@@ -110,10 +110,18 @@ function register(deps) {
             let data = null;
             let fallback = '';
             if (height != null && weight != null) {
-                const backendResults = await client.queryPetSize(ctx, heightMeters ?? height / 100, weight);
-                if (backendResults) {
-                    data = eggService.buildSizeSearchDataFromApi(height, weight, backendResults, heightDisplay);
-                    fallback = eggService.buildSizeSearchTextFromApi(height, weight, backendResults, heightDisplay);
+                const heightInMeters = heightMeters ?? height / 100;
+                const eggSearchResults = await client.getEggSearch(ctx, heightInMeters, weight, 1, 20, session?.userId || '');
+                if (eggSearchResults) {
+                    data = eggService.buildEggSearchData(heightInMeters, weight, eggSearchResults, heightDisplay);
+                    fallback = eggService.buildEggSearchText(heightInMeters, weight, eggSearchResults, heightDisplay);
+                }
+                if (!data) {
+                    const backendResults = await client.queryPetSize(ctx, heightInMeters, weight, false, session?.userId || '');
+                    if (backendResults) {
+                        data = eggService.buildSizeSearchDataFromApi(height, weight, backendResults, heightDisplay);
+                        fallback = eggService.buildSizeSearchTextFromApi(height, weight, backendResults, heightDisplay);
+                    }
                 }
             }
             if (!data) {

package/lib/commands/merchant.js

@@ -15,6 +15,49 @@ const TEXT = {
     defaultSource: '\u9ed8\u8ba4',
     customSource: '\u81ea\u5b9a\u4e49',
 };
+const CATEGORY_ORDER = ['normal', 'round', 'weekend'];
+const CATEGORY_LABELS = {
+    normal: '热销商品',
+    round: '常规商品',
+    weekend: '周末限定',
+};
+const CHINA_TIMEZONE = 'Asia/Shanghai';
+const chinaPartsFormatter = new Intl.DateTimeFormat('zh-CN', {
+    timeZone: CHINA_TIMEZONE,
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    hour12: false,
+});
+function getChinaParts(timestampMs) {
+    const parts = {};
+    for (const item of chinaPartsFormatter.formatToParts(new Date(timestampMs))) {
+        if (item.type !== 'literal')
+            parts[item.type] = item.value;
+    }
+    return {
+        hour: Number(parts.hour || '0'),
+        minute: Number(parts.minute || '0'),
+    };
+}
+function classifyMerchantItem(item) {
+    const start = normalizeTimestamp(item?.start_time);
+    const end = normalizeTimestamp(item?.end_time);
+    if (!start || !end)
+        return 'normal';
+    const durationDays = (end - start) / (1000 * 60 * 60 * 24);
+    if (durationDays >= 2)
+        return 'weekend';
+    const startParts = getChinaParts(start);
+    const endParts = getChinaParts(end);
+    const startHour = startParts.hour + startParts.minute / 60;
+    const endHour = endParts.hour + endParts.minute / 60;
+    if (startHour <= 8 && endHour >= 23.5)
+        return 'normal';
+    return 'round';
+}
 function normalizeTimestamp(value) {
     if (value === null || value === undefined || value === '')
         return null;
@@ -54,13 +97,34 @@ function getMerchantActivity(res) {
 }
 function getActiveProducts(res) {
     const activity = getMerchantActivity(res);
-    const products = activity?.products || activity?.product_list || activity?.get_props || [];
-    return products.filter((p) => {
-        const now = Date.now();
-        const start = normalizeTimestamp(p.start_time) ?? 0;
-        const end = normalizeTimestamp(p.end_time) ?? Infinity;
-        return now >= start && now < end;
-    });
+    const groups = [];
+    if (Array.isArray(activity?.products))
+        groups.push(activity.products);
+    if (Array.isArray(activity?.product_list))
+        groups.push(activity.product_list);
+    if (Array.isArray(activity?.get_props))
+        groups.push(activity.get_props);
+    if (Array.isArray(activity?.get_extra_props))
+        groups.push(activity.get_extra_props);
+    if (Array.isArray(activity?.get_pets))
+        groups.push(activity.get_pets);
+    const merged = [];
+    const seen = new Set();
+    const now = Date.now();
+    for (const list of groups) {
+        for (const item of list) {
+            const start = normalizeTimestamp(item?.start_time) ?? 0;
+            const end = normalizeTimestamp(item?.end_time) ?? Infinity;
+            if (now < start || now >= end)
+                continue;
+            const key = `${item?.id ?? ''}|${item?.name ?? ''}|${start}|${end === Infinity ? 'inf' : end}`;
+            if (seen.has(key))
+                continue;
+            seen.add(key);
+            merged.push(item);
+        }
+    }
+    return merged;
 }
 function getCurrentMerchantRound() {
     const now = new Date();
@@ -132,23 +196,56 @@ function buildMerchantRenderPayload(res) {
     const products = getActiveProducts(res);
     const roundInfo = getCurrentMerchantRound();
     const activity = getMerchantActivity(res);
+    const renderedProducts = products.map((p) => ({
+        name: p.name || TEXT.unknown,
+        image: p.icon_url || '',
+        time_label: formatProductWindow(p),
+        category: classifyMerchantItem(p),
+    }));
+    const categoryMap = {
+        normal: [],
+        round: [],
+        weekend: [],
+    };
+    for (const product of renderedProducts) {
+        categoryMap[product.category].push(product);
+    }
+    const categories = CATEGORY_ORDER
+        .filter(key => categoryMap[key].length > 0)
+        .map(key => ({
+        key,
+        label: CATEGORY_LABELS[key],
+        products: categoryMap[key],
+    }));
     const data = {
         background: '',
         title: activity.name || TEXT.merchant,
         subtitle: activity.start_date || '\u6bcf\u65e5 08:00 / 12:00 / 16:00 / 20:00 \u5237\u65b0',
         titleIcon: true,
-        product_count: products.length,
+        product_count: renderedProducts.length,
         round_info: roundInfo,
-        products: products.map((p) => ({
-            name: p.name || TEXT.unknown,
-            image: p.icon_url || '',
-            time_label: formatProductWindow(p),
-        })),
+        categories,
+        products: renderedProducts,
     };
-    const fallback = products.length
-        ? `\u8fdc\u884c\u5546\u4eba\u5f53\u524d\u5546\u54c1\uff1a${products.map((p) => p.name || TEXT.unknown).join('\u3001')}\n\u8f6e\u6b21\uff1a${roundInfo.current || TEXT.notOpen}\n\u5269\u4f59\uff1a${roundInfo.countdown}`
-        : '\u5f53\u524d\u8fdc\u884c\u5546\u4eba\u6682\u65e0\u5546\u54c1\u3002';
-    return { products, roundInfo, data, fallback };
+    const fallbackLines = [];
+    if (renderedProducts.length) {
+        fallbackLines.push(`\u8fdc\u884c\u5546\u4eba\u5f53\u524d\u5546\u54c1\uff08\u5171 ${renderedProducts.length} \u4ef6\uff09`);
+        fallbackLines.push(`\u8f6e\u6b21\uff1a${roundInfo.current || TEXT.notOpen}\uff0c\u5269\u4f59\uff1a${roundInfo.countdown}`);
+        fallbackLines.push('');
+        for (const cat of categories) {
+            fallbackLines.push(`\u3010${cat.label}\u3011`);
+            cat.products.forEach((product, index) => {
+                const tail = product.time_label ? ` (${product.time_label})` : '';
+                fallbackLines.push(`  ${index + 1}. ${product.name}${tail}`);
+            });
+            fallbackLines.push('');
+        }
+    }
+    else {
+        fallbackLines.push('\u5f53\u524d\u8fdc\u884c\u5546\u4eba\u6682\u65e0\u5546\u54c1\u3002');
+    }
+    const fallback = fallbackLines.join('\n').trimEnd();
+    return { products: renderedProducts, roundInfo, data, fallback };
 }
 async function checkMerchantSubscriptions(deps) {
     const { ctx, client, merchantSubMgr, renderer, config } = deps;
@@ -158,7 +255,7 @@ async function checkMerchantSubscriptions(deps) {
     const { products, roundInfo, data, fallback } = buildMerchantRenderPayload(res);
     const productNames = products.map((p) => p.name || '').filter(Boolean);
     const rendered = await renderer.renderHtml(ctx, 'yuanxing-shangren', data);
-    const renderedPng = rendered ? (0, send_image_1.compressPngImage)(rendered, config) : null;
+    const renderedImage = rendered ? (0, send_image_1.compressPngImage)(rendered, config) : null;
     const subs = merchantSubMgr.getAll();
     let matchedCount = 0;
     let pushedCount = 0;
@@ -195,7 +292,7 @@ async function checkMerchantSubscriptions(deps) {
             channelId,
             guildId: sub.group_id || '',
             userId: sub.user_id || '',
-        }, renderedPng, fallbackText, !!sub.mention_all);
+        }, renderedImage, fallbackText, !!sub.mention_all);
         if (!sent)
             continue;
         pushedCount++;
@@ -271,8 +368,24 @@ function register(deps) {
         return `远行商人订阅检查完成：订阅 ${result.subscriptions} 条，命中 ${result.matched} 条，推送 ${result.pushed} 条。`;
     });
     if (config.merchantSubscriptionEnabled) {
-        ctx.setInterval(async () => {
-            await checkMerchantSubscriptions(deps);
-        }, config.merchantCheckInterval);
+        if (config.merchantCheckMode === 'times' && config.merchantCheckTimes.length > 0) {
+            let lastMerchantCheckKey = '';
+            ctx.setInterval(async () => {
+                const now = new Date();
+                const timeStr = `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
+                if (!config.merchantCheckTimes.includes(timeStr))
+                    return;
+                const checkKey = `${now.toDateString()}-${timeStr}`;
+                if (checkKey === lastMerchantCheckKey)
+                    return;
+                lastMerchantCheckKey = checkKey;
+                await checkMerchantSubscriptions(deps);
+            }, 60000);
+        }
+        else {
+            ctx.setInterval(async () => {
+                await checkMerchantSubscriptions(deps);
+            }, config.merchantCheckInterval);
+        }
     }
 }