Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(qq): support msg_seq #180

Merged
merged 2 commits into from
Nov 20, 2023
Merged

fix(qq): support msg_seq #180

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de7005a
fix(qq): `msg_seq`
XxLittleCxX Nov 20, 2023
9e34997
fix(qq): error log
XxLittleCxX Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions adapters/qq/src/message.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as QQ from './types'
import { Context, Dict, h, MessageEncoder } from '@satorijs/satori'
import { Context, Dict, h, MessageEncoder, Quester } from '@satorijs/satori'
import { QQBot } from './bot'
import FormData from 'form-data'
import { escape } from '@satorijs/element'
Expand Down Expand Up @@ -154,11 +154,11 @@ export class QQMessageEncoder<C extends Context = Context> extends MessageEncode
async flush() {
if (!this.content.trim() && !this.rows.flat().length) return
this.trimButtons()
let msg_id = this.options?.session?.messageId, msg_seq: number
this.options.session['seq'] ||= 0
let msg_id = this.options?.session?.messageId, msg_seq: number = ++this.options.session['seq']
if (this.options?.session && (Date.now() - this.options?.session?.timestamp) > MSG_TIMEOUT) {
msg_id = null
this.options.session['seq'] ||= 0
msg_seq = ++this.options.session['seq']
msg_seq = null
}
const data: QQ.SendMessageParams = {
content: this.content,
Expand Down Expand Up @@ -190,11 +190,15 @@ export class QQMessageEncoder<C extends Context = Context> extends MessageEncode
session.messageId = msg_id
} else {
// FIXME: missing message id
await this.bot.internal.sendMessage(this.guildId, data)
const resp = await this.bot.internal.sendMessage(this.guildId, data)
if (resp.msg !== 'success') {
this.bot.logger.warn(resp)
}
}
} catch (e) {
this.bot.logger.error(e)
this.bot.logger.error('[response] %o', e.response?.data)
if (!Quester.isAxiosError(e)) throw e
this.errors.push(e)
this.bot.logger.warn('[response] %s %o', e.response?.status, e.response?.data)
}

// this.results.push(session.event.message)
Expand Down Expand Up @@ -223,10 +227,16 @@ export class QQMessageEncoder<C extends Context = Context> extends MessageEncode
url,
srv_send_msg: true,
}
if (this.session.isDirect) {
await this.bot.internal.sendFilePrivate(this.options.session.event.message.user.id, data)
} else {
await this.bot.internal.sendFileGuild(this.session.guildId, data)
try {
if (this.session.isDirect) {
await this.bot.internal.sendFilePrivate(this.options.session.event.message.user.id, data)
} else {
await this.bot.internal.sendFileGuild(this.session.guildId, data)
}
} catch (e) {
if (!Quester.isAxiosError(e)) throw e
this.errors.push(e)
this.bot.logger.warn('[response] %s %o', e.response?.status, e.response?.data)
}
entry?.dispose?.()
}
Expand Down