From 8f4146b7bb79fb7dcf2063dd86cf60a791408148 Mon Sep 17 00:00:00 2001 From: cdle <798731886@qq.com> Date: Thu, 2 Sep 2021 22:23:14 +0800 Subject: [PATCH] update --- core/function.go | 2 +- develop/jd_asset/asset.go | 2 +- develop/jd_cookie/cookie.go | 5 +++++ develop/qinglong/init.go | 2 +- im/tg/tg.go | 10 ++++++---- 5 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 develop/jd_cookie/cookie.go diff --git a/core/function.go b/core/function.go index 659b033..726df7a 100644 --- a/core/function.go +++ b/core/function.go @@ -132,7 +132,7 @@ func handleMessage(sender im.Sender) { } } if matched { - if function.Admin && sender.IsAdmin() { + if function.Admin && !sender.IsAdmin() { sender.Reply("没有权限操作") return } diff --git a/develop/jd_asset/asset.go b/develop/jd_asset/asset.go index 906d5ff..fb41867 100644 --- a/develop/jd_asset/asset.go +++ b/develop/jd_asset/asset.go @@ -33,7 +33,7 @@ var ua = `Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_2 like Mac OS X; en-us) Appl func init() { core.AddCommand([]core.Function{ { - Rules: []string{`^asset\s+(.+)$`}, + Rules: []string{`^asset\s+(.+)$`, `^查询\s+(.+)$`}, Handle: func(s im.Sender) interface{} { a := s.Get() envs, err := qinglong.GetEnvs("JD_COOKIE") diff --git a/develop/jd_cookie/cookie.go b/develop/jd_cookie/cookie.go new file mode 100644 index 0000000..1df23a3 --- /dev/null +++ b/develop/jd_cookie/cookie.go @@ -0,0 +1,5 @@ +package jdcookie + +func init() { + +} diff --git a/develop/qinglong/init.go b/develop/qinglong/init.go index 5e44cab..cfb2cda 100644 --- a/develop/qinglong/init.go +++ b/develop/qinglong/init.go @@ -55,7 +55,7 @@ func getToken() (string, error) { req := httplib.Get(fmt.Sprintf("%s/open/auth/token?client_id=%s&client_secret=%s", Config.Host, Config.ClientID, Config.ClientSecret)) data, err := req.Bytes() if err != nil { - msg := fmt.Sprintf("青龙链接失败:%v", err) + msg := fmt.Sprintf("青龙连接失败:%v", err) logs.Warn(msg) return "", errors.New(msg) } diff --git a/im/tg/tg.go b/im/tg/tg.go index 194cbf9..161749f 100644 --- a/im/tg/tg.go +++ b/im/tg/tg.go @@ -121,21 +121,23 @@ func (sender *Sender) IsMedia() bool { func (sender *Sender) Reply(rt interface{}) error { var r tb.Recipient + var options = []interface{}{} if !sender.Message.FromGroup() { r = sender.Message.Sender } else { r = sender.Message.Chat + options = []interface{}{&tb.SendOptions{ReplyTo: sender.Message}} } var err error switch rt.(type) { case error: - _, err = b.Send(r, fmt.Sprintf("%v", rt), &tb.SendOptions{ReplyTo: sender.Message}) + _, err = b.Send(r, fmt.Sprintf("%v", rt), options...) case []byte: - _, err = b.Send(r, string(rt.([]byte)), &tb.SendOptions{ReplyTo: sender.Message}) + _, err = b.Send(r, string(rt.([]byte)), options...) case string: - _, err = b.Send(r, rt.(string), &tb.SendOptions{ReplyTo: sender.Message}) + _, err = b.Send(r, rt.(string), options...) case *http.Response: - _, err = b.SendAlbum(r, tb.Album{&tb.Photo{File: tb.FromReader(rt.(*http.Response).Body)}}, &tb.SendOptions{ReplyTo: sender.Message}) + _, err = b.SendAlbum(r, tb.Album{&tb.Photo{File: tb.FromReader(rt.(*http.Response).Body)}}, options...) } if err != nil { sender.Reply(err)