[style]: rename Storage to Session (#331)

This commit is contained in:
多吃点苹果
2023-04-16 10:44:31 +08:00
committed by GitHub
parent d823746a4b
commit 4f8f853b3b
5 changed files with 16 additions and 15 deletions

4
bot.go
View File

@@ -19,8 +19,8 @@ type Bot struct {
MessageHandler MessageHandler // 获取消息成功的handle
MessageErrorHandler func(err error) bool // 获取消息发生错误的handle, 返回true则尝试继续监听
Serializer Serializer // 序列化器, 默认为json
Storage *Storage
Caller *Caller
Storage *Session
err error
context context.Context
cancel func()
@@ -366,7 +366,7 @@ func NewBot(c context.Context) *Bot {
ctx, cancel := context.WithCancel(c)
return &Bot{
Caller: caller,
Storage: &Storage{},
Storage: &Session{},
Serializer: &JsonSerializer{},
context: ctx,
cancel: cancel,

View File

@@ -367,8 +367,8 @@ func (c *Caller) RemoveFriendFromChatRoom(req *BaseRequest, info *LoginInfo, gro
}
// WebWxVerifyUser 同意加好友请求
func (c *Caller) WebWxVerifyUser(storage *Storage, info RecommendInfo, verifyContent string) error {
resp, err := c.Client.WebWxVerifyUser(storage, info, verifyContent)
func (c *Caller) WebWxVerifyUser(session *Session, info RecommendInfo, verifyContent string) error {
resp, err := c.Client.WebWxVerifyUser(session, info, verifyContent)
if err != nil {
return err
}

View File

@@ -617,8 +617,8 @@ func (c *Client) WebWxOplog(request *BaseRequest, remarkName, userName string) (
}
// WebWxVerifyUser 添加用户为好友接口
func (c *Client) WebWxVerifyUser(storage *Storage, info RecommendInfo, verifyContent string) (*http.Response, error) {
loginInfo := storage.LoginInfo
func (c *Client) WebWxVerifyUser(session *Session, info RecommendInfo, verifyContent string) (*http.Response, error) {
loginInfo := session.LoginInfo
path, err := url.Parse(c.Domain.BaseHost() + webwxverifyuser)
if err != nil {
return nil, err
@@ -629,7 +629,7 @@ func (c *Client) WebWxVerifyUser(storage *Storage, info RecommendInfo, verifyCon
params.Add("pass_ticket", loginInfo.PassTicket)
path.RawQuery = params.Encode()
content := map[string]interface{}{
"BaseRequest": storage.Request,
"BaseRequest": session.Request,
"Opcode": 3,
"SceneList": [1]int{33},
"SceneListCount": 1,
@@ -639,7 +639,7 @@ func (c *Client) WebWxVerifyUser(storage *Storage, info RecommendInfo, verifyCon
"VerifyUserTicket": info.Ticket,
}},
"VerifyUserListSize": 1,
"skey": storage.Request.Skey,
"skey": session.Request.Skey,
}
body, err := jsonEncode(content)
if err != nil {

8
session.go Normal file
View File

@@ -0,0 +1,8 @@
package openwechat
// Session 会话信息,包含登录信息、请求信息、响应信息
type Session struct {
LoginInfo *LoginInfo
Request *BaseRequest
Response *WebInitResponse
}

View File

@@ -6,13 +6,6 @@ import (
"sync"
)
// Storage 身份信息, 维持整个登陆的Session会话
type Storage struct {
LoginInfo *LoginInfo
Request *BaseRequest
Response *WebInitResponse
}
type HotReloadStorageItem struct {
Jar *Jar
BaseRequest *BaseRequest