update dep

.gitignore

@@ -13,4 +13,5 @@ DDBOT
 /qq-logs
 /session.token
 /dist/
-/template
+/template
+/version*.json

UPDATE.md

@@ -1,5 +1,7 @@
 ## DDBOT最近更新日志
 
+- 2023-03-21 v1.1.0
+  - 适配新miraigo和登录代码 
 - 2022-10-19 v1.0.9.2
   - 修复grant命令
 - 2022-10-02 v1.0.9

requests/requests.go

@@ -6,7 +6,7 @@ import (
 	"github.com/Sora233/MiraiGo-Template/utils"
 	"github.com/guonaihong/gout"
 	"github.com/guonaihong/gout/dataflow"
-	middleware "github.com/guonaihong/gout/interface"
+	"github.com/guonaihong/gout/middler"
 	"io"
 	"net/http"
 	"strings"
@@ -27,7 +27,7 @@ type option struct {
 	Retry               int
 	ProxyCallbackOption func(out interface{}, proxy string)
 	CookieJar           http.CookieJar
-	ResponseMiddleware  []middleware.ResponseMiddler
+	ResponseMiddleware  []middler.ResponseMiddler
 	AutoHeaderHost      bool
 	NotIgnoreEmpty      bool
 }
@@ -162,7 +162,7 @@ func WithCookieJar(jar http.CookieJar) Option {
 	}
 }
 
-func WithResponseMiddleware(middler middleware.ResponseMiddler) Option {
+func WithResponseMiddleware(middler middler.ResponseMiddler) Option {
 	return func(o *option) {
 		o.ResponseMiddleware = append(o.ResponseMiddleware, middler)
 	}
@@ -172,7 +172,7 @@ func GetResponseCookieOption(cookies *[]*http.Cookie) Option {
 	if cookies == nil {
 		return empty
 	}
-	return WithResponseMiddleware(middleware.WithResponseMiddlerFunc(
+	return WithResponseMiddleware(middler.WithResponseMiddlerFunc(
 		func(response *http.Response) error {
 			*cookies = response.Cookies()
 			return nil

utils/miraigo.go

@@ -32,7 +32,11 @@ func UploadGroupImage(groupCode int64, img []byte, isNorm bool) (image *message.
 	if !GetBot().IsOnline() {
 		return nil, errors.New("bot offline")
 	}
-	return bot.Instance.UploadGroupImage(groupCode, bytes.NewReader(img))
+	e, err := bot.Instance.UploadImage(message.Source{SourceType: message.SourceGroup, PrimaryID: groupCode}, bytes.NewReader(img))
+	if err != nil {
+		return nil, err
+	}
+	return e.(*message.GroupImageElement), nil
 }
 
 func UploadPrivateImage(uin int64, img []byte, isNorm bool) (*message.FriendImageElement, error) {
@@ -46,7 +50,11 @@ func UploadPrivateImage(uin int64, img []byte, isNorm bool) (*message.FriendImag
 	if !GetBot().IsOnline() {
 		return nil, errors.New("bot offline")
 	}
-	return bot.Instance.UploadPrivateImage(uin, bytes.NewReader(img))
+	e, err := bot.Instance.UploadImage(message.Source{SourceType: message.SourcePrivate, PrimaryID: uin}, bytes.NewReader(img))
+	if err != nil {
+		return nil, err
+	}
+	return e.(*message.FriendImageElement), nil
 }
 
 const (