@zhin.js/adapter-icqq 1.1.15 → 1.1.17

package/src/icqq-login-assist.ts

@@ -1,3 +1,5 @@
+import type { Locale } from 'zhin.js/i18n';
+import { messages as t } from './i18n.js';
 import type { LoginAssist, LoginAssistType, PendingLoginTaskPayload } from '@zhin.js/core';
 import { formatCompact } from '@zhin.js/logger';
 
@@ -27,11 +29,12 @@ export async function runIcqqLoginAssistStep(input: {
   logger: Logger;
   step: LoginAssistType;
   event: unknown;
+  locale?: Locale;
 }): Promise<void> {
   const { assist, client, adapter, endpointKey, owner, logger, step, event } = input;
   assist.cancelOwned(owner, `replaced_by_${step}`);
 
-  const payload = buildPayload(step, event);
+  const payload = buildPayload(step, event, input.locale);
   logger.info(formatCompact({
     op: 'login_assist_pending',
     endpoint: endpointKey,
@@ -82,33 +85,33 @@ export async function runIcqqLoginAssistStep(input: {
   }
 }
 
-function buildPayload(step: LoginAssistType, event: unknown): PendingLoginTaskPayload {
+function buildPayload(step: LoginAssistType, event: unknown, locale?: Locale): PendingLoginTaskPayload {
   const raw = event && typeof event === 'object' ? event as Record<string, unknown> : {};
   switch (step) {
     case 'qrcode':
       return {
-        message: '扫码登录：请在手机 QQ 扫描二维码，完成后在 Console / 终端确认继续',
+        message: t(locale, 'loginQr'),
         image: bufferToDataUrl(raw.image),
       };
     case 'slider':
       return {
-        message: '滑动验证：打开链接完成滑块，将返回的 ticket（可含 randstr）提交继续',
+        message: t(locale, 'loginSlider'),
         url: typeof raw.url === 'string' ? raw.url : undefined,
       };
     case 'device':
       return {
-        message: '设备锁：已请求短信验证码，请提交短信验证码继续',
+        message: t(locale, 'loginSms'),
         url: typeof raw.url === 'string' ? raw.url : undefined,
         phone: raw.phone,
       };
     case 'auth':
       return {
-        message: '身份验证：完成后在 Console / 终端确认继续',
+        message: t(locale, 'loginAuth'),
         url: typeof raw.url === 'string' ? raw.url : undefined,
         device: raw.device,
       };
     default:
-      return { message: `登录辅助（${step}）` };
+      return { message: t(locale, 'loginOther', { step }) };
   }
 }
 

package/src/protocol.ts

@@ -269,6 +269,7 @@ export interface ResolvedIcqqConfig {
 export interface IcqqWireSegment {
   readonly type: string;
   readonly data?: Record<string, unknown>;
+  readonly platform?: Readonly<Record<string, unknown>>;
 }
 
 export interface IcqqInboundMessage {
@@ -341,6 +342,8 @@ export function icqqInboundConversation(endpointKey: string, input: {
   readonly channelId: string;
   readonly channelParentGroupId?: string;
   readonly guildId?: string;
+  /** 群名（仅 group 会话使用） */
+  readonly name?: string;
 }): ConversationRef {
   const endpoint = { id: endpointKey, adapter: ICQQ_ADAPTER_NAME };
   if (input.channelType === 'private' && input.channelParentGroupId) {
@@ -359,7 +362,8 @@ export function icqqInboundConversation(endpointKey: string, input: {
       parent: { kind: 'channel', id: input.guildId },
     };
   }
-  return { endpoint, kind: input.channelType, id: input.channelId };
+  const name = input.channelType === 'group' ? input.name?.trim() : undefined;
+  return { endpoint, kind: input.channelType, id: input.channelId, ...(name ? { name } : {}) };
 }
 
 /**
@@ -394,6 +398,7 @@ const ICQQ_STANDALONE_ELEMENTS = new Set([
   'json',
   'share',
   'long_msg',
+  'multimsg',
 ] as const);
 
 /** Normalize inline image bytes before either temporary-file or native-base64 delivery. */
@@ -461,7 +466,7 @@ export function formatOutboundMessages(payload: unknown): Sendable[] {
   }
   const messages = groups.filter(group => group.some(element => typeof element === 'string'
     ? element.trim() !== ''
-    : element.type !== 'reply'));
+    : element.type !== 'reply' && element.type !== 'quote'));
   if (messages.length === 0) return ['\u200b'];
   return messages.map(group => group.length === 1 ? group[0]! : group);
 }
@@ -485,7 +490,8 @@ function formatOutboundElements(payload: readonly unknown[]): (string | MessageE
         if (!Number.isSafeInteger(qq) || qq <= 0) {
           throw new TypeError(`Invalid ICQQ mention target: ${String(target ?? '')}`);
         }
-        return { type: 'at', qq };
+        const name = typeof item.data?.name === 'string' ? item.data.name.trim() : '';
+        return name ? { type: 'at', qq, text: name.startsWith('@') ? name : `@${name}` } : { type: 'at', qq };
       }
       case 'image': {
         const arg = resolveIcqqMediaFile(normalizeIcqqImageData(item.data));
@@ -502,6 +508,13 @@ function formatOutboundElements(payload: readonly unknown[]): (string | MessageE
       case 'reply': {
         const id = String(item.data?.message_id ?? item.data?.id ?? '').trim();
         if (!id) throw new TypeError('ICQQ reply segment requires message_id');
+        const quote = item.platform?.icqqQuote as Record<string, unknown> | undefined;
+        if (quote) {
+          const { user_id, seq, rand, time, message } = quote;
+          if (typeof user_id !== 'number' || typeof seq !== 'number' || typeof rand !== 'number'
+            || typeof time !== 'number' || typeof message !== 'string') throw new TypeError('Invalid ICQQ quote source');
+          return { type: 'quote', user_id, seq, rand, time, message };
+        }
         return { type: 'reply', id };
       }
       case 'record':
@@ -528,6 +541,9 @@ function formatOutboundElements(payload: readonly unknown[]): (string | MessageE
       case 'forward': {
         const resid = String(item.data?.forward_id ?? item.data?.resid ?? item.data?.id ?? '').trim();
         if (!resid) throw new TypeError('ICQQ forward segment requires forward_id');
+        // Prepared merged forwards need their filename; a long_msg would expand inline.
+        const filename = item.platform?.icqqForwardFilename;
+        if (typeof filename === 'string' && filename) return { type: 'multimsg', resid, filename };
         return { type: 'long_msg', resid };
       }
       case 'share':