@zhin.js/adapter-qq 1.0.6 → 1.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +15 -0
- package/lib/index.d.ts +3 -4
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +15 -16
- package/lib/index.js.map +1 -1
- package/package.json +3 -3
- package/src/index.ts +16 -15
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# @zhin.js/adapter-qq
|
|
2
2
|
|
|
3
|
+
## 1.0.8
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 551c4d2: fix: 插件支持配置文件读取,优化 test 用例
|
|
8
|
+
- Updated dependencies [551c4d2]
|
|
9
|
+
- @zhin.js/types@1.0.3
|
|
10
|
+
- zhin.js@1.0.8
|
|
11
|
+
|
|
12
|
+
## 1.0.7
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- zhin.js@1.0.7
|
|
17
|
+
|
|
3
18
|
## 1.0.6
|
|
4
19
|
|
|
5
20
|
### Patch Changes
|
package/lib/index.d.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { Bot, PrivateMessageEvent, GroupMessageEvent, ReceiverMode, ApplicationPlatform } from "qq-official-bot";
|
|
2
2
|
export { ReceiverMode, } from 'qq-official-bot';
|
|
3
3
|
export type { ApplicationPlatform, Intent, } from 'qq-official-bot';
|
|
4
|
-
import { Bot as ZhinBot,
|
|
4
|
+
import { Bot as ZhinBot, Adapter, Message, SendOptions } from "zhin.js";
|
|
5
5
|
declare module '@zhin.js/types' {
|
|
6
6
|
interface RegisteredAdapters {
|
|
7
7
|
qq: Adapter<QQBot<ReceiverMode>>;
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
|
-
export type QQBotConfig<T extends ReceiverMode, M extends ApplicationPlatform = ApplicationPlatform> =
|
|
10
|
+
export type QQBotConfig<T extends ReceiverMode, M extends ApplicationPlatform = ApplicationPlatform> = ZhinBot.Config & Bot.Config<T, M> & {
|
|
11
11
|
context: 'qq';
|
|
12
12
|
name: `${number}`;
|
|
13
13
|
};
|
|
@@ -15,9 +15,8 @@ export interface QQBot<T extends ReceiverMode, M extends ApplicationPlatform = A
|
|
|
15
15
|
$config: QQBotConfig<T, M>;
|
|
16
16
|
}
|
|
17
17
|
export declare class QQBot<T extends ReceiverMode, M extends ApplicationPlatform = ApplicationPlatform> extends Bot implements ZhinBot<PrivateMessageEvent | GroupMessageEvent, QQBotConfig<T, M>> {
|
|
18
|
-
private plugin;
|
|
19
18
|
$connected?: boolean;
|
|
20
|
-
constructor(
|
|
19
|
+
constructor(config: QQBotConfig<T, M>);
|
|
21
20
|
private handleQQMessage;
|
|
22
21
|
$connect(): Promise<void>;
|
|
23
22
|
$disconnect(): Promise<void>;
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,GAAG,EACH,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,EAAE,mBAAmB,EACpC,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACH,YAAY,GACf,MAAM,iBAAiB,CAAA;AACxB,YAAY,EACR,mBAAmB,EACnB,MAAM,GACT,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACH,GAAG,IAAI,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,GAAG,EACH,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,EAAE,mBAAmB,EACpC,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACH,YAAY,GACf,MAAM,iBAAiB,CAAA;AACxB,YAAY,EACR,mBAAmB,EACnB,MAAM,GACT,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACH,GAAG,IAAI,OAAO,EAEd,OAAO,EAGP,OAAO,EACP,WAAW,EAGd,MAAM,SAAS,CAAC;AAEjB,OAAO,QAAQ,gBAAgB,CAAA;IAC3B,UAAU,kBAAkB;QACxB,EAAE,EAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAA;KAClC;CACJ;AACD,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,IAAI,OAAO,CAAC,MAAM,GAAE,GAAG,CAAC,MAAM,CAAC,CAAC,EAAC,CAAC,CAAC,GAAE;IACpI,OAAO,EAAC,IAAI,CAAA;IACZ,IAAI,EAAC,GAAG,MAAM,EAAE,CAAA;CACnB,CAAA;AACD,MAAM,WAAW,KAAK,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,mBAAmB,GAAG,mBAAmB;IAC9F,OAAO,EAAC,WAAW,CAAC,CAAC,EAAC,CAAC,CAAC,CAAA;CAC3B;AAED,qBAAa,KAAK,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CAAE,SAAQ,GAAI,YAAW,OAAO,CAAC,mBAAmB,GAAC,iBAAiB,EAAC,WAAW,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;IAClL,UAAU,CAAC,EAAC,OAAO,CAAA;gBACP,MAAM,EAAC,WAAW,CAAC,CAAC,EAAC,CAAC,CAAC;IAKnC,OAAO,CAAC,eAAe;IAMjB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAQzB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAIlC,cAAc,CAAC,GAAG,EAAC,mBAAmB,GAAC,iBAAiB;IAkClD,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAoCnD,cAAc,CAAC,EAAE,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;CAShD"}
|
package/lib/index.js
CHANGED
|
@@ -1,22 +1,21 @@
|
|
|
1
1
|
import { Bot } from "qq-official-bot";
|
|
2
2
|
import path from "path";
|
|
3
3
|
export { ReceiverMode, } from 'qq-official-bot';
|
|
4
|
-
import { Adapter, registerAdapter, Message, segment } from "zhin.js";
|
|
4
|
+
import { usePlugin, Adapter, registerAdapter, Message, segment } from "zhin.js";
|
|
5
|
+
const plugin = usePlugin();
|
|
5
6
|
export class QQBot extends Bot {
|
|
6
|
-
plugin;
|
|
7
7
|
$connected;
|
|
8
|
-
constructor(
|
|
8
|
+
constructor(config) {
|
|
9
9
|
if (!config.data_dir)
|
|
10
10
|
config.data_dir = path.join(process.cwd(), 'data');
|
|
11
11
|
super(config);
|
|
12
|
-
this.plugin = plugin;
|
|
13
12
|
this.$config = config;
|
|
14
13
|
}
|
|
15
14
|
handleQQMessage(msg) {
|
|
16
15
|
const message = this.$formatMessage(msg);
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
plugin.dispatch('message.receive', message);
|
|
17
|
+
plugin.logger.info(`recv ${message.$channel.type}(${message.$channel.id}):${segment.raw(message.$content)}`);
|
|
18
|
+
plugin.dispatch(`message.${message.$channel.type}.receive`, message);
|
|
20
19
|
}
|
|
21
20
|
async $connect() {
|
|
22
21
|
this.on('message.group', this.handleQQMessage.bind(this));
|
|
@@ -68,35 +67,35 @@ export class QQBot extends Bot {
|
|
|
68
67
|
return result;
|
|
69
68
|
}
|
|
70
69
|
async $sendMessage(options) {
|
|
71
|
-
options = await
|
|
70
|
+
options = await plugin.app.handleBeforeSend(options);
|
|
72
71
|
switch (options.type) {
|
|
73
72
|
case 'private': {
|
|
74
73
|
if (options.id.startsWith('direct:')) {
|
|
75
74
|
const id = options.id.replace('direct:', '');
|
|
76
75
|
const result = await this.sendDirectMessage(id, options.content);
|
|
77
|
-
|
|
78
|
-
|
|
76
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
|
|
77
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
|
|
79
78
|
return `direct-${options.id}:${result.message_id.toString()}`;
|
|
80
79
|
}
|
|
81
80
|
else {
|
|
82
81
|
const result = await this.sendPrivateMessage(options.id, options.content);
|
|
83
|
-
|
|
84
|
-
|
|
82
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
|
|
83
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
|
|
85
84
|
return `private-${options.id}:${result.message_id.toString()}`;
|
|
86
85
|
}
|
|
87
86
|
break;
|
|
88
87
|
}
|
|
89
88
|
case "group": {
|
|
90
89
|
const result = await this.sendGroupMessage(options.id, options.content);
|
|
91
|
-
|
|
92
|
-
|
|
90
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
|
|
91
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
|
|
93
92
|
return `group-${options.id}:${result.message_id.toString()}`;
|
|
94
93
|
break;
|
|
95
94
|
}
|
|
96
95
|
case 'channel': {
|
|
97
96
|
const result = await this.sendGuildMessage(options.id, options.content);
|
|
98
|
-
|
|
99
|
-
|
|
97
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
|
|
98
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`);
|
|
100
99
|
return `channel-${options.id}:${result.message_id.toString()}`;
|
|
101
100
|
break;
|
|
102
101
|
}
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,GAAG,EAIN,MAAM,iBAAiB,CAAC;AACzB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EACH,YAAY,GACf,MAAM,iBAAiB,CAAA;AAKxB,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zhin.js/adapter-qq",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.8",
|
|
4
4
|
"description": "zhin adapter for qq",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"typescript": "^5.3.0"
|
|
24
24
|
},
|
|
25
25
|
"peerDependencies": {
|
|
26
|
-
"zhin.js": "1.0.
|
|
27
|
-
"@zhin.js/types": "1.0.
|
|
26
|
+
"zhin.js": "1.0.8",
|
|
27
|
+
"@zhin.js/types": "1.0.3"
|
|
28
28
|
},
|
|
29
29
|
"peerDependenciesMeta": {
|
|
30
30
|
"@zhin.js/types": {
|
package/src/index.ts
CHANGED
|
@@ -14,7 +14,7 @@ export type {
|
|
|
14
14
|
} from 'qq-official-bot'
|
|
15
15
|
import {
|
|
16
16
|
Bot as ZhinBot,
|
|
17
|
-
|
|
17
|
+
usePlugin,
|
|
18
18
|
Adapter,
|
|
19
19
|
Plugin,
|
|
20
20
|
registerAdapter,
|
|
@@ -29,25 +29,26 @@ declare module '@zhin.js/types'{
|
|
|
29
29
|
qq:Adapter<QQBot<ReceiverMode>>
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
|
-
export type QQBotConfig<T extends ReceiverMode, M extends ApplicationPlatform = ApplicationPlatform> =
|
|
32
|
+
export type QQBotConfig<T extends ReceiverMode, M extends ApplicationPlatform = ApplicationPlatform> = ZhinBot.Config &Bot.Config<T,M> &{
|
|
33
33
|
context:'qq'
|
|
34
34
|
name:`${number}`
|
|
35
35
|
}
|
|
36
36
|
export interface QQBot<T extends ReceiverMode, M extends ApplicationPlatform = ApplicationPlatform>{
|
|
37
37
|
$config:QQBotConfig<T,M>
|
|
38
38
|
}
|
|
39
|
+
const plugin=usePlugin()
|
|
39
40
|
export class QQBot<T extends ReceiverMode, M extends ApplicationPlatform = ApplicationPlatform> extends Bot implements ZhinBot<PrivateMessageEvent|GroupMessageEvent,QQBotConfig<T,M>>{
|
|
40
41
|
$connected?:boolean
|
|
41
|
-
constructor(
|
|
42
|
+
constructor(config:QQBotConfig<T,M>) {
|
|
42
43
|
if(!config.data_dir) config.data_dir=path.join(process.cwd(),'data')
|
|
43
44
|
super(config);
|
|
44
45
|
this.$config=config
|
|
45
46
|
}
|
|
46
47
|
private handleQQMessage(msg: PrivateMessageEvent|GroupMessageEvent): void {
|
|
47
48
|
const message =this.$formatMessage(msg) ;
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
49
|
+
plugin.dispatch('message.receive',message)
|
|
50
|
+
plugin.logger.info(`recv ${message.$channel.type}(${message.$channel.id}):${segment.raw(message.$content)}`)
|
|
51
|
+
plugin.dispatch(`message.${message.$channel.type}.receive`,message)
|
|
51
52
|
}
|
|
52
53
|
async $connect(): Promise<void> {
|
|
53
54
|
this.on('message.group',this.handleQQMessage.bind(this))
|
|
@@ -96,34 +97,34 @@ export class QQBot<T extends ReceiverMode, M extends ApplicationPlatform = Appli
|
|
|
96
97
|
}
|
|
97
98
|
|
|
98
99
|
async $sendMessage(options: SendOptions): Promise<string> {
|
|
99
|
-
options=await
|
|
100
|
+
options=await plugin.app.handleBeforeSend(options)
|
|
100
101
|
switch (options.type){
|
|
101
102
|
case 'private':{
|
|
102
103
|
if(options.id.startsWith('direct:')){
|
|
103
104
|
const id=options.id.replace('direct:','')
|
|
104
105
|
const result= await this.sendDirectMessage(id,options.content)
|
|
105
|
-
|
|
106
|
-
|
|
106
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`)
|
|
107
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`)
|
|
107
108
|
return `direct-${options.id}:${result.message_id.toString()}`
|
|
108
109
|
}else{
|
|
109
110
|
const result= await this.sendPrivateMessage(options.id,options.content)
|
|
110
|
-
|
|
111
|
-
|
|
111
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`)
|
|
112
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`)
|
|
112
113
|
return `private-${options.id}:${result.message_id.toString()}`
|
|
113
114
|
}
|
|
114
115
|
break;
|
|
115
116
|
}
|
|
116
117
|
case "group":{
|
|
117
118
|
const result= await this.sendGroupMessage(options.id,options.content)
|
|
118
|
-
|
|
119
|
-
|
|
119
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`)
|
|
120
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`)
|
|
120
121
|
return `group-${options.id}:${result.message_id.toString()}`
|
|
121
122
|
break;
|
|
122
123
|
}
|
|
123
124
|
case 'channel':{
|
|
124
125
|
const result= await this.sendGuildMessage(options.id,options.content)
|
|
125
|
-
|
|
126
|
-
|
|
126
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`)
|
|
127
|
+
plugin.logger.info(`send ${options.type}(${options.id}):${segment.raw(options.content)}`)
|
|
127
128
|
return `channel-${options.id}:${result.message_id.toString()}`
|
|
128
129
|
break;
|
|
129
130
|
}
|