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

修改message.Bot为私有属性

Browse Source
This commit is contained in:
eatmoreapple 2022-12-30 12:48:50 +08:00
parent 806085b712
commit 5f14a13c62
2 changed files with 54 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bot.go
View File

@ -341,7 +341,7 @@ func (b *Bot) MessageOnSuccess(h func(msg *Message)) {
b.MessageHandler = h b.MessageHandler = h
} }
// MessageOnError setter for Bot.GetMessageErrorHandler // MessageOnError setter for bot.GetMessageErrorHandler
func (b *Bot) MessageOnError(h func(err error) bool) { func (b *Bot) MessageOnError(h func(err error) bool) {
b.MessageErrorHandler = h b.MessageErrorHandler = h
} }

96
message.go
View File

@ -50,7 +50,7 @@ type Message struct {
Url string Url string
senderInGroupUserName string senderInGroupUserName string
RecommendInfo RecommendInfo RecommendInfo RecommendInfo
Bot *Bot `json:"-"` bot *Bot
mu sync.RWMutex mu sync.RWMutex
Context context.Context `json:"-"` Context context.Context `json:"-"`
item map[string]interface{} item map[string]interface{}
@ -60,18 +60,18 @@ type Message struct {
// Sender 获取消息的发送者 // Sender 获取消息的发送者
func (m *Message) Sender() (*User, error) { func (m *Message) Sender() (*User, error) {
if m.FromUserName == m.Bot.self.User.UserName { if m.FromUserName == m.bot.self.User.UserName {
return m.Bot.self.User, nil return m.bot.self.User, nil
} }
// 首先尝试从缓存里面查找, 如果没有找到则从服务器获取 // 首先尝试从缓存里面查找, 如果没有找到则从服务器获取
members, err := m.Bot.self.Members() members, err := m.bot.self.Members()
if err != nil { if err != nil {
return nil, err return nil, err
} }
user, exist := members.GetByUserName(m.FromUserName) user, exist := members.GetByUserName(m.FromUserName)
if !exist { if !exist {
// 找不到, 从服务器获取 // 找不到, 从服务器获取
user = &User{Self: m.Bot.self, UserName: m.FromUserName} user = &User{Self: m.bot.self, UserName: m.FromUserName}
err = user.Detail() err = user.Detail()
} }
if m.IsSendByGroup() && len(user.MemberList) == 0 { if m.IsSendByGroup() && len(user.MemberList) == 0 {
@ -89,8 +89,8 @@ func (m *Message) SenderInGroup() (*User, error) {
// https://github.com/eatmoreapple/openwechat/issues/66 // https://github.com/eatmoreapple/openwechat/issues/66
if m.IsSystem() { if m.IsSystem() {
// 判断是否有自己发送 // 判断是否有自己发送
if m.FromUserName == m.Bot.self.User.UserName { if m.FromUserName == m.bot.self.User.UserName {
return m.Bot.self.User, nil return m.bot.self.User, nil
} }
return nil, errors.New("can not found sender from system message") return nil, errors.New("can not found sender from system message")
} }
@ -110,15 +110,15 @@ func (m *Message) SenderInGroup() (*User, error) {
// 如果消息是好友消息，则返回好友 // 如果消息是好友消息，则返回好友
// 如果消息是系统消息，则返回当前用户 // 如果消息是系统消息，则返回当前用户
func (m *Message) Receiver() (*User, error) { func (m *Message) Receiver() (*User, error) {
if m.IsSystem() || m.ToUserName == m.Bot.self.UserName { 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 // https://github.com/eatmoreapple/openwechat/issues/113
if m.ToUserName == m.Bot.self.fileHelper.UserName { if m.ToUserName == m.bot.self.fileHelper.UserName {
return m.Bot.self.fileHelper.User, nil 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 {
return nil, err return nil, err
} }
@ -132,7 +132,7 @@ func (m *Message) Receiver() (*User, error) {
} }
return users.First().User, nil return users.First().User, nil
} else { } else {
user, exist := m.Bot.self.MemberList.GetByUserName(m.ToUserName) user, exist := m.bot.self.MemberList.GetByUserName(m.ToUserName)
if !exist { if !exist {
return nil, ErrNoSuchUserFoundError return nil, ErrNoSuchUserFoundError
} }
@ -142,7 +142,7 @@ func (m *Message) Receiver() (*User, error) {
// IsSendBySelf 判断消息是否由自己发送 // IsSendBySelf 判断消息是否由自己发送
func (m *Message) IsSendBySelf() bool { func (m *Message) IsSendBySelf() bool {
return m.FromUserName == m.Bot.self.User.UserName return m.FromUserName == m.bot.self.User.UserName
} }
// IsSendByFriend 判断消息是否由好友发送 // IsSendByFriend 判断消息是否由好友发送
@ -157,35 +157,35 @@ func (m *Message) IsSendByGroup() bool {
// ReplyText 回复文本消息 // ReplyText 回复文本消息
func (m *Message) ReplyText(content string) (*SentMessage, error) { func (m *Message) ReplyText(content string) (*SentMessage, error) {
msg := NewSendMessage(MsgTypeText, content, m.Bot.self.User.UserName, m.FromUserName, "") msg := NewSendMessage(MsgTypeText, content, m.bot.self.User.UserName, m.FromUserName, "")
info := m.Bot.Storage.LoginInfo info := m.bot.Storage.LoginInfo
request := m.Bot.Storage.Request request := m.bot.Storage.Request
sentMessage, err := m.Bot.Caller.WebWxSendMsg(msg, info, request) sentMessage, err := m.bot.Caller.WebWxSendMsg(msg, info, request)
return m.Bot.self.sendMessageWrapper(sentMessage, err) return m.bot.self.sendMessageWrapper(sentMessage, err)
} }
// ReplyImage 回复图片消息 // ReplyImage 回复图片消息
func (m *Message) ReplyImage(file *os.File) (*SentMessage, error) { func (m *Message) ReplyImage(file *os.File) (*SentMessage, error) {
info := m.Bot.Storage.LoginInfo info := m.bot.Storage.LoginInfo
request := m.Bot.Storage.Request request := m.bot.Storage.Request
sentMessage, err := m.Bot.Caller.WebWxSendImageMsg(file, request, info, m.Bot.self.UserName, m.FromUserName) sentMessage, err := m.bot.Caller.WebWxSendImageMsg(file, request, info, m.bot.self.UserName, m.FromUserName)
return m.Bot.self.sendMessageWrapper(sentMessage, err) return m.bot.self.sendMessageWrapper(sentMessage, err)
} }
// ReplyVideo 回复视频消息 // ReplyVideo 回复视频消息
func (m *Message) ReplyVideo(file *os.File) (*SentMessage, error) { func (m *Message) ReplyVideo(file *os.File) (*SentMessage, error) {
info := m.Bot.Storage.LoginInfo info := m.bot.Storage.LoginInfo
request := m.Bot.Storage.Request request := m.bot.Storage.Request
sentMessage, err := m.Bot.Caller.WebWxSendVideoMsg(file, request, info, m.Bot.self.UserName, m.FromUserName) sentMessage, err := m.bot.Caller.WebWxSendVideoMsg(file, request, info, m.bot.self.UserName, m.FromUserName)
return m.Bot.self.sendMessageWrapper(sentMessage, err) return m.bot.self.sendMessageWrapper(sentMessage, err)
} }
// ReplyFile 回复文件消息 // ReplyFile 回复文件消息
func (m *Message) ReplyFile(file *os.File) (*SentMessage, error) { func (m *Message) ReplyFile(file *os.File) (*SentMessage, error) {
info := m.Bot.Storage.LoginInfo info := m.bot.Storage.LoginInfo
request := m.Bot.Storage.Request request := m.bot.Storage.Request
sentMessage, err := m.Bot.Caller.WebWxSendFile(file, request, info, m.Bot.self.UserName, m.FromUserName) sentMessage, err := m.bot.Caller.WebWxSendFile(file, request, info, m.bot.self.UserName, m.FromUserName)
return m.Bot.self.sendMessageWrapper(sentMessage, err) return m.bot.self.sendMessageWrapper(sentMessage, err)
} }
func (m *Message) IsText() bool { func (m *Message) IsText() bool {
@ -290,16 +290,16 @@ func (m *Message) GetFile() (*http.Response, error) {
return nil, errors.New("invalid message type") return nil, errors.New("invalid message type")
} }
if m.IsPicture() || m.IsEmoticon() { if m.IsPicture() || m.IsEmoticon() {
return m.Bot.Caller.Client.WebWxGetMsgImg(m, m.Bot.Storage.LoginInfo) return m.bot.Caller.Client.WebWxGetMsgImg(m, m.bot.Storage.LoginInfo)
} }
if m.IsVoice() { if m.IsVoice() {
return m.Bot.Caller.Client.WebWxGetVoice(m, m.Bot.Storage.LoginInfo) return m.bot.Caller.Client.WebWxGetVoice(m, m.bot.Storage.LoginInfo)
} }
if m.IsVideo() { if m.IsVideo() {
return m.Bot.Caller.Client.WebWxGetVideo(m, m.Bot.Storage.LoginInfo) return m.bot.Caller.Client.WebWxGetVideo(m, m.bot.Storage.LoginInfo)
} }
if m.IsMedia() { if m.IsMedia() {
return m.Bot.Caller.Client.WebWxGetMedia(m, m.Bot.Storage.LoginInfo) return m.bot.Caller.Client.WebWxGetMedia(m, m.bot.Storage.LoginInfo)
} }
return nil, errors.New("unsupported type") return nil, errors.New("unsupported type")
} }
@ -309,7 +309,7 @@ func (m *Message) GetPicture() (*http.Response, error) {
if !(m.IsPicture() || m.IsEmoticon()) { if !(m.IsPicture() || m.IsEmoticon()) {
return nil, errors.New("picture message required") return nil, errors.New("picture message required")
} }
return m.Bot.Caller.Client.WebWxGetMsgImg(m, m.Bot.Storage.LoginInfo) return m.bot.Caller.Client.WebWxGetMsgImg(m, m.bot.Storage.LoginInfo)
} }
// GetVoice 获取录音消息的响应 // GetVoice 获取录音消息的响应
@ -317,7 +317,7 @@ func (m *Message) GetVoice() (*http.Response, error) {
if !m.IsVoice() { if !m.IsVoice() {
return nil, errors.New("voice message required") return nil, errors.New("voice message required")
} }
return m.Bot.Caller.Client.WebWxGetVoice(m, m.Bot.Storage.LoginInfo) return m.bot.Caller.Client.WebWxGetVoice(m, m.bot.Storage.LoginInfo)
} }
// GetVideo 获取视频消息的响应 // GetVideo 获取视频消息的响应
@ -325,7 +325,7 @@ func (m *Message) GetVideo() (*http.Response, error) {
if !m.IsVideo() { if !m.IsVideo() {
return nil, errors.New("video message required") return nil, errors.New("video message required")
} }
return m.Bot.Caller.Client.WebWxGetVideo(m, m.Bot.Storage.LoginInfo) return m.bot.Caller.Client.WebWxGetVideo(m, m.bot.Storage.LoginInfo)
} }
// GetMedia 获取媒体消息的响应 // GetMedia 获取媒体消息的响应
@ -333,7 +333,7 @@ func (m *Message) GetMedia() (*http.Response, error) {
if !m.IsMedia() { if !m.IsMedia() {
return nil, errors.New("media message required") return nil, errors.New("media message required")
} }
return m.Bot.Caller.Client.WebWxGetMedia(m, m.Bot.Storage.LoginInfo) return m.bot.Caller.Client.WebWxGetMedia(m, m.bot.Storage.LoginInfo)
} }
// SaveFile 保存文件到指定的 io.Writer // SaveFile 保存文件到指定的 io.Writer
@ -392,11 +392,11 @@ func (m *Message) Agree(verifyContents ...string) (*Friend, error) {
if !m.IsFriendAdd() { if !m.IsFriendAdd() {
return nil, errors.New("friend add message required") return nil, errors.New("friend add message required")
} }
err := m.Bot.Caller.WebWxVerifyUser(m.Bot.Storage, m.RecommendInfo, strings.Join(verifyContents, "")) err := m.bot.Caller.WebWxVerifyUser(m.bot.Storage, m.RecommendInfo, strings.Join(verifyContents, ""))
if err != nil { if err != nil {
return nil, err return nil, err
} }
friend := newFriend(m.RecommendInfo.UserName, m.Bot.self) friend := newFriend(m.RecommendInfo.UserName, m.bot.self)
if err = friend.Detail(); err != nil { if err = friend.Detail(); err != nil {
return nil, err return nil, err
} }
@ -405,7 +405,7 @@ func (m *Message) Agree(verifyContents ...string) (*Friend, error) {
// AsRead 将消息设置为已读 // AsRead 将消息设置为已读
func (m *Message) AsRead() error { func (m *Message) AsRead() error {
return m.Bot.Caller.WebWxStatusAsRead(m.Bot.Storage.Request, m.Bot.Storage.LoginInfo, m) return m.bot.Caller.WebWxStatusAsRead(m.bot.Storage.Request, m.bot.Storage.LoginInfo, m)
} }
// IsArticle 判断当前的消息类型是否为文章 // IsArticle 判断当前的消息类型是否为文章
@ -447,7 +447,7 @@ func (m *Message) Get(key string) (value interface{}, exist bool) {
// 消息初始化,根据不同的消息作出不同的处理 // 消息初始化,根据不同的消息作出不同的处理
func (m *Message) init(bot *Bot) { func (m *Message) init(bot *Bot) {
m.Bot = bot m.bot = bot
raw, _ := json.Marshal(m) raw, _ := json.Marshal(m)
m.Raw = raw m.Raw = raw
m.RawContent = m.Content m.RawContent = m.Content
@ -807,3 +807,13 @@ func (m *Message) IsTickled() bool {
func (m *Message) IsVoipInvite() bool { func (m *Message) IsVoipInvite() bool {
return m.MsgType == MsgTypeVoipInvite return m.MsgType == MsgTypeVoipInvite
} }
// Bot 返回当前消息所属的Bot
func (m *Message) Bot() *Bot {
return m.bot
}
// Owner 返回当前消息的拥有者
func (m *Message) Owner() *Self {
return m.Bot().self
}