1
0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-04 11:07:40 +08:00

Merge pull request #228 from wfjsw/patch-2

GuildSender的nickname给“我的频道昵称”
This commit is contained in:
Mrs4s 2021-12-25 17:56:25 +08:00 committed by GitHub
commit 8ba8d118ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -330,6 +330,10 @@ func (s *GuildService) parseGuildChannelMessage(msg *channel.ChannelMsgContent)
return nil return nil
} }
// mem := guild.FindMember(msg.Head.RoutingHead.GetFromTinyid()) // mem := guild.FindMember(msg.Head.RoutingHead.GetFromTinyid())
memberName := msg.ExtInfo.GetMemberName()
if memberName == nil {
memberName = msg.ExtInfo.GetFromNick()
}
return &message.GuildChannelMessage{ return &message.GuildChannelMessage{
Id: msg.Head.ContentHead.GetSeq(), Id: msg.Head.ContentHead.GetSeq(),
InternalId: msg.Head.ContentHead.GetRandom(), InternalId: msg.Head.ContentHead.GetRandom(),
@ -338,7 +342,7 @@ func (s *GuildService) parseGuildChannelMessage(msg *channel.ChannelMsgContent)
Time: int64(msg.Head.ContentHead.GetTime()), Time: int64(msg.Head.ContentHead.GetTime()),
Sender: &message.GuildSender{ Sender: &message.GuildSender{
TinyId: msg.Head.RoutingHead.GetFromTinyid(), TinyId: msg.Head.RoutingHead.GetFromTinyid(),
Nickname: string(msg.ExtInfo.GetFromNick()), Nickname: string(memberName),
}, },
Elements: message.ParseMessageElems(msg.Body.RichText.Elems), Elements: message.ParseMessageElems(msg.Body.RichText.Elems),
} }