Skip to content

Commit 4b64997

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents deb57d1 + a48d544 commit 4b64997

File tree

7 files changed

+29
-9
lines changed

7 files changed

+29
-9
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## [1.0.2](https://github.com/zhinjs/qq-official-bot/compare/v1.0.1...v1.0.2) (2024-08-26)
4+
5+
6+
### Bug Fixes
7+
8+
* 接收频道消息表态后无法响应消息 ([9ed7cb9](https://github.com/zhinjs/qq-official-bot/commit/9ed7cb942c6cafc745807ebce579d080ca298648))
9+
10+
## [1.0.1](https://github.com/zhinjs/qq-official-bot/compare/v1.0.0...v1.0.1) (2024-08-09)
11+
12+
13+
### Bug Fixes
14+
15+
* event_id不能发送media富媒体 ([1d45ae3](https://github.com/zhinjs/qq-official-bot/commit/1d45ae31817b89813c98f7574be446a837cac927))
16+
317
## 1.0.0 (2024-07-05)
418

519

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "qq-official-bot",
3-
"version": "1.0.0",
3+
"version": "1.0.2",
44
"description": "qq机器人开发SDK",
55
"main": "lib/index.js",
66
"engines": {

src/entries/sender.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export class Sender {
126126
case 'image':
127127
case 'audio':
128128
case 'video':
129-
if (this.messagePayload.msg_id) {
129+
if (this.messagePayload.msg_id || this.messagePayload.event_id) {
130130
if (!this.baseUrl.startsWith('/v2')) {
131131
const fileData = await this.fixGuildMediaData(elem)
132132
if (typeof fileData !== 'string') {

src/event/notice.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ export class MessageReactionNoticeEvent extends NoticeEvent{
499499
this.guild_id = payload.guild_id
500500
this.channel_id = payload.channel_id
501501
this.user_id = payload.user_id
502-
if(payload.target.type!==ReactionTargetType.Message) throw new Error(`unsupported reaction target type: ${payload.target.type}`)
502+
if(![ReactionTargetType.Message, ReactionTargetType.ReactionTargetType_MSG].includes(payload.target.type)) throw new Error(`unsupported reaction target type: ${payload.target.type}`)
503503
this.message_id = payload.target.id
504504
this.emoji = payload.emoji
505505
}

src/qqBot.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,14 @@ export class QQBot extends EventEmitter {
9494
const event_id = wsRes.id || '';
9595
if (!payload || !event) return;
9696
const transformEvent = QQEvent[event] || 'system'
97-
const result=this.processPayload(event_id,transformEvent,payload)
98-
if(!result) return this.logger.debug('解析事件失败',wsRes)
99-
this.em(transformEvent, result);
97+
98+
try {
99+
const result=this.processPayload(event_id,transformEvent,payload)
100+
if(!result) return this.logger.debug('解析事件失败',wsRes)
101+
this.em(transformEvent, result);
102+
} catch (error) {
103+
return this.logger.debug('解析事件失败',wsRes)
104+
}
100105
}
101106
/**
102107
* 上传多媒体文件

src/types.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ export enum ReactionTargetType{
166166
Message,
167167
Thread,
168168
Comment,
169-
Reply
169+
Reply,
170+
ReactionTargetType_MSG = 'ReactionTargetType_MSG'
170171
}
171172

0 commit comments

Comments
 (0)