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:
idranme 2024-10-13 23:48:22 +08:00
parent dbd71d4376
commit 4ced7fa3cf
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ntqqapi/native/index.ts
View File

@ -1,6 +1,9 @@
import { Context } from 'cordis' import { Context } from 'cordis'
import { Dict } from 'cosmokit' import { Dict } from 'cosmokit'
import { getBuildVersion } from '@/common/utils/misc' import { getBuildVersion } from '@/common/utils/misc'
import { TEMP_DIR } from '@/common/globalVars'
import { copyFile } from 'fs/promises'
import path from 'node:path'
import addon from './external/crychic-win32-x64.node?asset' import addon from './external/crychic-win32-x64.node?asset'
export class Native { export class Native {
@ -18,11 +21,11 @@ export class Native {
checkVersion() { checkVersion() {
const version = getBuildVersion() const version = getBuildVersion()
// 27187—27597 // 27333—27597
return version >= 27187 && version < 28060 return version >= 27333 && version < 28060
} }
start() { async start() {
if (this.crychic) { if (this.crychic) {
return return
} }
@ -33,7 +36,10 @@ export class Native {
return return
} }
try { try {
this.crychic = require(addon) const fileName = path.basename(addon)
const dest = path.join(TEMP_DIR, fileName)
await copyFile(addon, dest)
this.crychic = require(dest)
this.crychic!.init() this.crychic!.init()
} catch (e) { } catch (e) {
this.ctx.logger.warn('crychic 加载失败', e) this.ctx.logger.warn('crychic 加载失败', e)

2
src/onebot11/action/llonebot/FriendPoke.ts
View File

@ -17,7 +17,7 @@ export class FriendPoke extends BaseAction<Payload, null> {
throw new Error('当前系统平台或架构不支持') throw new Error('当前系统平台或架构不支持')
} }
if (!this.ctx.app.native.checkVersion()) { if (!this.ctx.app.native.checkVersion()) {
throw new Error(`当前 QQ 版本 ${getBuildVersion()} 不支持，可尝试其他版本 27187—27597`) throw new Error(`当前 QQ 版本 ${getBuildVersion()} 不支持，可尝试其他版本 27333—27597`)
} }
await this.ctx.app.native.sendFriendPoke(+payload.user_id) await this.ctx.app.native.sendFriendPoke(+payload.user_id)
return null return null

2
src/onebot11/action/llonebot/GroupPoke.ts
View File

@ -19,7 +19,7 @@ export class GroupPoke extends BaseAction<Payload, null> {
throw new Error('当前系统平台或架构不支持') throw new Error('当前系统平台或架构不支持')
} }
if (!this.ctx.app.native.checkVersion()) { if (!this.ctx.app.native.checkVersion()) {
throw new Error(`当前 QQ 版本 ${getBuildVersion()} 不支持，可尝试其他版本 27187—27597`) throw new Error(`当前 QQ 版本 ${getBuildVersion()} 不支持，可尝试其他版本 27333—27597`)
} }
await this.ctx.app.native.sendGroupPoke(+payload.group_id, +payload.user_id) await this.ctx.app.native.sendGroupPoke(+payload.group_id, +payload.user_id)
return null return null

13
src/onebot11/entities.ts
View File

@ -79,11 +79,14 @@ export namespace OB11Entities {
if (msg.chatType === ChatType.Group) { if (msg.chatType === ChatType.Group) {
resMsg.sub_type = 'normal' resMsg.sub_type = 'normal'
resMsg.group_id = parseInt(msg.peerUin) resMsg.group_id = parseInt(msg.peerUin)
const member = await ctx.ntGroupApi.getGroupMember(msg.peerUin, msg.senderUid) // 284840486: 合并转发内部
if (member) { if (msg.peerUin !== '284840486') {
resMsg.sender.role = groupMemberRole(member.role) const member = await ctx.ntGroupApi.getGroupMember(msg.peerUin, msg.senderUid)
resMsg.sender.nickname = member.nick if (member) {
resMsg.sender.title = member.memberSpecialTitle ?? '' resMsg.sender.role = groupMemberRole(member.role)
resMsg.sender.nickname = member.nick
resMsg.sender.title = member.memberSpecialTitle ?? ''
}
} }
} }
else if (msg.chatType === ChatType.C2C) { else if (msg.chatType === ChatType.C2C) {