github/openwechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #129 from eatmoreapple/update-receiver

Browse Source 
修复 receiver 为 文件传输助手的时候 receiver 找不到的问题
This commit is contained in:
多吃点苹果 2022-11-18 16:33:35 +07:00 committed by GitHub
commit 68d965c390
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
message.go
View File

@ -105,9 +105,13 @@ func (m *Message) SenderInGroup() (*User, error) {
// 如果消息是好友消息，则返回好友 // 如果消息是好友消息，则返回好友
// 如果消息是系统消息，则返回当前用户 // 如果消息是系统消息，则返回当前用户
func (m *Message) Receiver() (*User, error) { func (m *Message) Receiver() (*User, error) {
if m.IsSystem() { if m.IsSystem() || m.ToUserName == m.Bot.self.UserName {
return m.Bot.self.User, nil return m.Bot.self.User, nil
} }
// https://github.com/eatmoreapple/openwechat/issues/113
if m.ToUserName == m.Bot.self.fileHelper.UserName {
return m.Bot.self.fileHelper.User, nil
}
if m.IsSendByGroup() { if m.IsSendByGroup() {
groups, err := m.Bot.self.Groups() groups, err := m.Bot.self.Groups()
if err != nil { if err != nil {
@ -122,8 +126,6 @@ func (m *Message) Receiver() (*User, error) {
return nil, ErrNoSuchUserFoundError return nil, ErrNoSuchUserFoundError
} }
return users.First().User, nil return users.First().User, nil
} else if m.ToUserName == m.Bot.self.UserName {
return m.Bot.self.User, nil
} else { } else {
user, exist := m.Bot.self.MemberList.GetByRemarkName(m.ToUserName) user, exist := m.Bot.self.MemberList.GetByRemarkName(m.ToUserName)
if !exist { if !exist {