onebots 0.1.13 → 0.1.15

package/lib/onebot.d.ts

@@ -27,7 +27,7 @@ export declare enum OneBotStatus {
     Good = 0,
     Bad = 1
 }
-export declare type OneBotConfig = OneBot.Config<OneBot.Version>;
+export type OneBotConfig = OneBot.Config<OneBot.Version>;
 export declare namespace OneBot {
     type Version = 'V11' | 'V12';
     type Config<V extends Version = 'V11'> = ({

package/lib/service/V12/action/friend.d.ts

@@ -12,7 +12,10 @@ export declare class FriendAction {
      * 发送私聊消息
      * @param user_id {number} 用户id
      * @param message {import('onebots/lib/service/v12').Sendable} 消息
-     * @param quote {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
+     * @param source {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
      */
-    sendPrivateMsg(this: V12, user_id: number, message: V12.Sendable, quote?: V12.SegmentElem<'reply'>): Promise<import("icqq").MessageRet>;
+    sendPrivateMsg(this: V12, user_id: number, message: V12.Sendable, source?: V12.SegmentElem<'reply'>): Promise<import("icqq").MessageRet | {
+        message_id: string;
+        message: V12.Sendable;
+    }>;
 }

package/lib/service/V12/action/friend.js

@@ -13,14 +13,24 @@ class FriendAction {
      * 发送私聊消息
      * @param user_id {number} 用户id
      * @param message {import('onebots/lib/service/v12').Sendable} 消息
-     * @param quote {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
+     * @param source {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
      */
-    async sendPrivateMsg(user_id, message, quote) {
-        let { element, quote_id } = await utils_1.processMessage.apply(this.client, [message, quote]);
-        element = await utils_1.processMusic.apply(this.client, ['friend', user_id, element]);
-        if (!element.length)
-            return;
-        return await this.client.sendPrivateMsg(user_id, element, quote_id ? await this.client.getMsg(quote_id) : undefined);
+    async sendPrivateMsg(user_id, message, source) {
+        let { element, quote, music, share } = await utils_1.processMessage.apply(this.client, [message, source]);
+        if (!element.length && (!music || !share))
+            throw new Error('发送消息不受支持');
+        if (music || share) {
+            const target = this.client.pickFriend(user_id);
+            if (music)
+                await target.shareMusic(music.data.type, music.data.id);
+            if (share)
+                await target.shareUrl(share.data);
+            return {
+                message_id: '',
+                message
+            };
+        }
+        return await this.client.sendPrivateMsg(user_id, element, quote ? await this.client.getMsg(quote.data.message_id) : undefined);
     }
 }
 exports.FriendAction = FriendAction;

package/lib/service/V12/action/group.d.ts

@@ -4,9 +4,12 @@ export declare class GroupAction {
      * 发送群聊消息
      * @param group_id {number} 群id
      * @param message {import('icqq/lib/service').Sendable} 消息
-     * @param quote {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
+     * @param source {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
      */
-    sendGroupMsg(this: V12, group_id: number, message: V12.Sendable, quote?: V12.SegmentElem<'reply'>): Promise<import("icqq").MessageRet>;
+    sendGroupMsg(this: V12, group_id: number, message: V12.Sendable, source?: V12.SegmentElem<'reply'>): Promise<import("icqq").MessageRet | {
+        message_id: string;
+        message: V12.Sendable;
+    }>;
     /**
      * 群组踢人
      * @param group_id {number} 群id

package/lib/service/V12/action/group.js

@@ -7,14 +7,24 @@ class GroupAction {
      * 发送群聊消息
      * @param group_id {number} 群id
      * @param message {import('icqq/lib/service').Sendable} 消息
-     * @param quote {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
-     */
-    async sendGroupMsg(group_id, message, quote) {
-        let { element, quote_id } = await utils_1.processMessage.apply(this.client, [message, quote]);
-        element = await utils_1.processMusic.apply(this.client, ['group', group_id, element]);
-        if (!element.length)
-            return;
-        return await this.client.sendGroupMsg(group_id, element, quote_id ? await this.client.getMsg(quote_id) : undefined);
+     * @param source {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
+     */
+    async sendGroupMsg(group_id, message, source) {
+        let { element, quote, music, share } = await utils_1.processMessage.apply(this.client, [message, source]);
+        if (!element.length && (!music || !share))
+            throw new Error('发送消息不受支持');
+        if (music || share) {
+            const target = this.client.pickGroup(group_id);
+            if (music)
+                await target.shareMusic(music.data.type, music.data.id);
+            if (share)
+                await target.shareUrl(share.data);
+            return {
+                message_id: '',
+                message
+            };
+        }
+        return await this.client.sendGroupMsg(group_id, element, quote ? await this.client.getMsg(quote.data.message_id) : undefined);
     }
     /**
      * 群组踢人

package/lib/service/V12/action/utils.d.ts

@@ -3,5 +3,7 @@ import { V12 } from "../../../service/V12";
 export declare function processMusic(this: Client, target_type: 'group' | 'friend', target_id: number, element: any[]): Promise<any[]>;
 export declare function processMessage(this: Client, message: V12.Sendable, source?: V12.SegmentElem<'reply'>): Promise<{
     element: MessageElem[];
-    quote: V12.SegmentElem<'reply'>;
+    music?: V12.SegmentElem<'music'>;
+    share?: V12.SegmentElem<'share'>;
+    quote?: V12.SegmentElem<'reply'>;
 }>;

package/lib/service/V12/action/utils.js

@@ -20,26 +20,41 @@ async function processMessage(message, source) {
             return { type: 'text', data: { text: m } };
         return m;
     });
-    const forward = segments.find(e => e.type === 'forward');
-    if (forward)
-        (0, utils_1.remove)(segments, forward);
+    const music = segments.find(e => e.type === 'music');
+    if (music)
+        (0, utils_1.remove)(segments, music);
+    if (segments.find(e => e.type === 'music'))
+        throw new Error('一次只能发送一个音乐元素');
+    if (segments.length && music)
+        throw new Error('音乐元素只能单独发送');
+    const share = segments.find(e => e.type === 'share');
+    if (share)
+        (0, utils_1.remove)(segments, share);
+    if (segments.find(e => e.type === 'share'))
+        throw new Error('一次只能发送一个分享元素');
+    if (segments.length && share)
+        throw new Error('分享元素只能单独发送');
+    const forwardNodes = segments.filter(e => e.type === 'node');
+    segments = segments.filter(s => !forwardNodes.includes(s));
+    if (forwardNodes.length && segments.length)
+        throw new Error('只能单独发送转发节点');
     let quote = segments.find(e => e.type === 'reply');
     if (quote)
         (0, utils_1.remove)(segments, quote);
     segments = segments.filter(n => [
         'face', 'text', 'image',
         'rpx', 'dice', 'poke', 'mention', 'mention_all',
-        'voice', 'file', 'audio',
+        'voice', 'file', 'record',
         'forward', 'node',
         'music', 'share', 'xml', 'json', 'location', // 分享类
     ].includes(n.type));
     const element = V12_1.V12.fromSegment(segments);
-    if (forward)
+    if (forwardNodes.length)
         element.unshift(
         // 构造抓发消息
         await this.makeForwardMsg(await Promise.all(
         // 处理转发消息段
-        forward.data.nodes.filter(n => n.type === 'node').map(async (forwardNode) => {
+        forwardNodes.map(async (forwardNode) => {
             return {
                 // 转发套转发处理
                 message: (await processMessage.apply(this, [forwardNode.data.message])).element,
@@ -48,6 +63,6 @@ async function processMessage(message, source) {
                 time: forwardNode.data.time
             };
         }))));
-    return { element, quote: quote || source };
+    return { element, quote: quote || source, music, share };
 }
 exports.processMessage = processMessage;

package/lib/types.d.ts

@@ -1,3 +1,3 @@
-export declare type LogLevel = "trace" | "debug" | "info" | "warn" | "error" | "fatal" | "mark" | "off";
-export declare type Dispose = () => any;
-export declare type MayBeArray<T extends any> = T | T[];
+export type LogLevel = "trace" | "debug" | "info" | "warn" | "error" | "fatal" | "mark" | "off";
+export type Dispose = () => any;
+export type MayBeArray<T extends any> = T | T[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"
@@ -50,7 +50,7 @@
   ],
   "dependencies": {
     "@koa/router": "^10.1.1",
-    "icqq": "^0.0.13-7",
+    "icqq": "^0.0.21",
     "icqq-cq-enable": "^1.0.0",
     "js-yaml": "^4.1.0",
     "koa": "^2.13.4",

package/lib/config.sample.yaml

@@ -1,31 +0,0 @@
-port: 6727 # 监听端口
-general: # 通用配置，在单个配置省略时的默认值
-  V11: # oneBotV11的通用配置
-    heartbeat: 3 # 心跳间隔 (秒)
-    access_token: '' # 访问api的token
-    post_timeout: 15 # 上报超时时间，(秒)
-    secret: '' # 上报数据的sha1签名密钥
-    rate_limit_interval: 4 # ws心跳间隔(秒)
-    post_message_format: string # "string"或"array"
-    reconnect_interval: 3 # 重连间隔 (秒)
-    use_http: true # 是否使用 http
-    enable_cors: true # 是否允许跨域
-    use_ws: true # 是否使用websocket
-    http_reverse: [] # http上报地址
-    ws_reverse: [] # 反向ws连接地址
-  V12: # oneBotV12的通用配置
-    heartbeat: 3 # 心跳间隔 (秒)
-    access_token: '' # 访问api的token
-    request_timeout: 15 # 上报超时时间 (秒)
-    reconnect_interval: 3 # 重连间隔 (秒)
-    enable_cors: true # 是否允许跨域
-    use_http: true # 是否启用http
-    use_ws: true # 是否启用 websocket
-    webhook: [] # http 上报地址
-    ws_reverse: [] # 反向ws连接地址
-log_level: info # 日志等级
-# 每个账号的单独配置(用于覆盖通用配置)
-123456789:
-  version: V11 # 使用的oneBot版本
-  password: abcedfghi # 账号密码，未配置则扫码登陆
-  # 。。。其他配置项参见上方对应oneBot版本的通用配置