Merge pull request #461 from LLOneBot/dev

release: 4.0.2
This commit is contained in:
idranme
2024-10-08 21:26:39 +08:00
committed by GitHub
4 changed files with 8 additions and 13 deletions

View File

@@ -4,7 +4,7 @@
"name": "LLOneBot", "name": "LLOneBot",
"slug": "LLOneBot", "slug": "LLOneBot",
"description": "实现 OneBot 11 和 Satori 协议,用于 QQ 机器人开发", "description": "实现 OneBot 11 和 Satori 协议,用于 QQ 机器人开发",
"version": "4.0.1", "version": "4.0.2",
"icon": "./icon.webp", "icon": "./icon.webp",
"authors": [ "authors": [
{ {

View File

@@ -55,7 +55,7 @@ export class NTQQGroupApi extends Service {
} }
async getGroupMember(groupCode: string, uid: string, forceUpdate = false) { async getGroupMember(groupCode: string, uid: string, forceUpdate = false) {
invoke('nodeIKernelGroupListener/onMemberInfoChange', [], { await invoke('nodeIKernelGroupListener/onMemberInfoChange', [], {
registerEvent: true registerEvent: true
}) })

View File

@@ -155,20 +155,15 @@ export async function decodeMessage(
} }
message.user = decodeMessageUser(data) message.user = decodeMessageUser(data)
message.created_at = +data.msgTime * 1000 message.created_at = +data.msgTime * 1000
if (message.channel.type === Universal.Channel.Type.DIRECT) { if (!message.user.name) {
const info = await ctx.ntUserApi.getUserSimpleInfo(data.senderUid) const info = await ctx.ntUserApi.getUserSimpleInfo(data.senderUid)
message.channel.name = info.nick
message.user.name = info.nick message.user.name = info.nick
message.user.nick = info.remark || info.nick message.user.nick = info.remark || info.nick
if (message.channel.type === Universal.Channel.Type.DIRECT) {
message.channel.name = info.nick
}
} }
if (guildId) { if (guildId) {
let nick = data.sendMemberName || data.sendNickName
if (!data.sendNickName) {
const info = await ctx.ntGroupApi.getGroupMember(guildId, data.senderUid)
message.user.name = info.nick
message.user.nick = info.remark || info.nick
nick = info.cardName || info.nick
}
message.guild = { message.guild = {
id: guildId, id: guildId,
name: data.peerName, name: data.peerName,
@@ -176,7 +171,7 @@ export async function decodeMessage(
} }
message.member = { message.member = {
user: message.user, user: message.user,
nick nick: data.sendMemberName || message.user.name
} }
} }

View File

@@ -1 +1 @@
export const version = '4.0.1' export const version = '4.0.2'