update media file upload (#491)

eatmoreapple · May 1, 2024 · 59aaa46 · 59aaa46
1 parent f17a295
commit 59aaa46
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/caller.go b/caller.go
@@ -309,16 +309,15 @@ func (c *Caller) UploadMedia(ctx context.Context, file *os.File, opt *CallerUplo
 type CallerUploadMediaCommonOptions struct {
 	FromUserName string
 	ToUserName   string
-	Reader       io.Reader
 	BaseRequest  *BaseRequest
 	LoginInfo    *LoginInfo
 }
 
 type CallerWebWxSendImageMsgOptions CallerUploadMediaCommonOptions
 
 // WebWxSendImageMsg 发送图片消息接口
-func (c *Caller) WebWxSendImageMsg(ctx context.Context, opt *CallerWebWxSendImageMsgOptions) (*SentMessage, error) {
-	file, cb, err := readerToFile(opt.Reader)
+func (c *Caller) WebWxSendImageMsg(ctx context.Context, reader io.Reader, opt *CallerWebWxSendImageMsgOptions) (*SentMessage, error) {
+	file, cb, err := readerToFile(reader)
 	if err != nil {
 		return nil, err
 	}
@@ -357,8 +356,8 @@ func (c *Caller) WebWxSendImageMsg(ctx context.Context, opt *CallerWebWxSendImag
 
 type CallerWebWxSendFileOptions CallerUploadMediaCommonOptions
 
-func (c *Caller) WebWxSendFile(ctx context.Context, opt *CallerWebWxSendFileOptions) (*SentMessage, error) {
-	file, cb, err := readerToFile(opt.Reader)
+func (c *Caller) WebWxSendFile(ctx context.Context, reader io.Reader, opt *CallerWebWxSendFileOptions) (*SentMessage, error) {
+	file, cb, err := readerToFile(reader)
 	if err != nil {
 		return nil, err
 	}
@@ -387,8 +386,8 @@ func (c *Caller) WebWxSendFile(ctx context.Context, opt *CallerWebWxSendFileOpti
 
 type CallerWebWxSendAppMsgOptions CallerUploadMediaCommonOptions
 
-func (c *Caller) WebWxSendVideoMsg(ctx context.Context, opt *CallerWebWxSendAppMsgOptions) (*SentMessage, error) {
-	file, cb, err := readerToFile(opt.Reader)
+func (c *Caller) WebWxSendVideoMsg(ctx context.Context, reader io.Reader, opt *CallerWebWxSendAppMsgOptions) (*SentMessage, error) {
+	file, cb, err := readerToFile(reader)
 	if err != nil {
 		return nil, err
 	}

diff --git a/user.go b/user.go
@@ -388,35 +388,32 @@ func (s *Self) sendImageToUser(username string, file io.Reader) (*SentMessage, e
 	opt := &CallerWebWxSendImageMsgOptions{
 		FromUserName: s.UserName,
 		ToUserName:   username,
-		Reader:       file,
 		BaseRequest:  s.bot.Storage.Request,
 		LoginInfo:    s.bot.Storage.LoginInfo,
 	}
-	sentMessage, err := s.bot.Caller.WebWxSendImageMsg(s.Bot().Context(), opt)
+	sentMessage, err := s.bot.Caller.WebWxSendImageMsg(s.Bot().Context(), file, opt)
 	return s.sendMessageWrapper(sentMessage, err)
 }
 
 func (s *Self) sendVideoToUser(username string, file io.Reader) (*SentMessage, error) {
 	opt := &CallerWebWxSendAppMsgOptions{
 		FromUserName: s.UserName,
 		ToUserName:   username,
-		Reader:       file,
 		BaseRequest:  s.bot.Storage.Request,
 		LoginInfo:    s.bot.Storage.LoginInfo,
 	}
-	sentMessage, err := s.bot.Caller.WebWxSendVideoMsg(s.Bot().Context(), opt)
+	sentMessage, err := s.bot.Caller.WebWxSendVideoMsg(s.Bot().Context(), file, opt)
 	return s.sendMessageWrapper(sentMessage, err)
 }
 
 func (s *Self) sendFileToUser(username string, file io.Reader) (*SentMessage, error) {
 	opt := &CallerWebWxSendFileOptions{
 		FromUserName: s.UserName,
 		ToUserName:   username,
-		Reader:       file,
 		BaseRequest:  s.bot.Storage.Request,
 		LoginInfo:    s.bot.Storage.LoginInfo,
 	}
-	sentMessage, err := s.bot.Caller.WebWxSendFile(s.Bot().Context(), opt)
+	sentMessage, err := s.bot.Caller.WebWxSendFile(s.Bot().Context(), file, opt)
 	return s.sendMessageWrapper(sentMessage, err)
 }