From 2c48ced10776515e62a5505523167bef5ea2b9ce Mon Sep 17 00:00:00 2001 From: eatmoreapple <15055461510@163.com> Date: Tue, 14 Sep 2021 21:56:07 +0800 Subject: [PATCH] =?UTF-8?q?:fire:=20=E4=BF=AE=E5=A4=8D=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E6=98=B5=E7=A7=B0=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bot.go | 8 ++++++-- user.go | 11 ++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/bot.go b/bot.go index b22cdb8..9e084c5 100644 --- a/bot.go +++ b/bot.go @@ -199,6 +199,7 @@ func (b *Bot) WebInit() error { } // 设置当前的用户 b.self = &Self{Bot: b, User: &resp.User} + b.self.formatEmoji() b.self.Self = b.self b.Storage.Response = resp @@ -249,6 +250,10 @@ func (b *Bot) asyncCall() error { // 当获取消息发生错误时, 默认的错误处理行为 func (b *Bot) stopAsyncCALL(err error) { + if IsNetworkError(err) { + log.Println(err) + return + } b.cancel() b.err = err b.self = nil @@ -263,10 +268,9 @@ func (b *Bot) getNewWechatMessage() error { } // 更新SyncKey并且重新存入storage b.Storage.Response.SyncKey = resp.SyncKey - // 异步执行,提升响应速度 // 避免单个消息处理函数阻塞,让其他的消息得不到处理 if b.MessageHandler != nil { - go b.handleMessage(resp.AddMsgList) + b.handleMessage(resp.AddMsgList) } return nil } diff --git a/user.go b/user.go index 906054e..2df7e4a 100644 --- a/user.go +++ b/user.go @@ -125,6 +125,13 @@ func (u *User) IsPin() bool { return u.ContactFlag == 2051 } +// 格式化emoji表情 +func (u *User) formatEmoji() { + u.NickName = FormatEmoji(u.NickName) + u.RemarkName = FormatEmoji(u.RemarkName) + u.DisplayName = FormatEmoji(u.DisplayName) +} + // Self 自己,当前登录用户对象 type Self struct { *User @@ -613,9 +620,7 @@ func (m Members) detail(self *Self) error { func (m Members) init(self *Self) { for _, member := range m { member.Self = self - member.NickName = FormatEmoji(member.NickName) - member.RemarkName = FormatEmoji(member.RemarkName) - member.DisplayName = FormatEmoji(member.DisplayName) + member.formatEmoji() } }