GuanM/LLOneBot
1
0
Fork 0
mirror of https://github.com/LLOneBot/LLOneBot.git synced 2024-11-22 01:56:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
student_2333 2024-04-30 13:05:08 +08:00
parent 6ff49722d8
commit 1d7100a053
No known key found for this signature in database
GPG Key ID: B36E8DF853C33EE1
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/utils/sign.ts
View File

@ -14,6 +14,8 @@ export interface CustomMusicSignPostData {
singer?: string singer?: string
} }
export type MusicSignPostData = IdMusicSignPostData | CustomMusicSignPostData
export class MusicSign { export class MusicSign {
private readonly url: string private readonly url: string
@ -21,7 +23,7 @@ export class MusicSign {
this.url = url this.url = url
} }
async sign(postData: CustomMusicSignPostData | IdMusicSignPostData): Promise<any> { async sign(postData: MusicSignPostData): Promise<any> {
const resp = await fetch(this.url, { const resp = await fetch(this.url, {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },

16
src/onebot11/action/msg/SendMsg.ts
View File

@ -33,7 +33,7 @@ import { sleep } from '../../../common/utils/helper'
import { uri2local } from '../../../common/utils' import { uri2local } from '../../../common/utils'
import { crychic } from '../../../ntqqapi/external/crychic' import { crychic } from '../../../ntqqapi/external/crychic'
import { NTQQGroupApi } from '../../../ntqqapi/api' import { NTQQGroupApi } from '../../../ntqqapi/api'
import { MusicSign } from '../../../common/utils/sign' import { CustomMusicSignPostData, MusicSign, MusicSignPostData } from '../../../common/utils/sign'
function checkSendMessage(sendMsgList: OB11MessageData[]) { function checkSendMessage(sendMsgList: OB11MessageData[]) {
function checkUri(uri: string): boolean { function checkUri(uri: string): boolean {
@ -304,6 +304,13 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
message: '转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素', message: '转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素',
} }
} }
const musicNum = this.getSpecialMsgNum(payload, OB11MessageDataType.music)
if (musicNum > 1 || fmNum != messages.length) {
return {
valid: false,
message: '音乐消息不可以和其他消息混在一起发送',
}
}
if (payload.message_type !== 'private' && payload.group_id && !(await getGroup(payload.group_id))) { if (payload.message_type !== 'private' && payload.group_id && !(await getGroup(payload.group_id))) {
return { return {
valid: false, valid: false,
@ -388,9 +395,14 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
if (!['qq', '163', 'custom'].includes(type)) { if (!['qq', '163', 'custom'].includes(type)) {
throw `不支持的音乐类型 ${type}` throw `不支持的音乐类型 ${type}`
} }
const postData: MusicSignPostData = { ...music.data }
if (type === 'custom' && music.data.content) {
;(postData as CustomMusicSignPostData).singer = music.data.content
delete (postData as OB11MessageCustomMusic['data']).content
}
let jsonContent: string let jsonContent: string
try { try {
jsonContent = await new MusicSign(musicSignUrl).sign(music.data) jsonContent = await new MusicSign(musicSignUrl).sign(postData)
} catch (e) { } catch (e) {
throw `签名音乐消息失败：${e}` throw `签名音乐消息失败：${e}`
} }