diff --git a/core/reply.go b/core/reply.go index 6ee039e..271a070 100644 --- a/core/reply.go +++ b/core/reply.go @@ -35,7 +35,8 @@ func InitReplies() { Rules: []string{"^打赏", "^赞赏"}, Type: "url", } - appreciate.Request.Url = sillyGirl.Get("appreciate", "https://gitee.com/aiancandle/sillyGirl/raw/main/appreciate.jpg") + recommand := "https://gitee.com/aiancandle/sillyGirl/raw/main/appreciate.jpg" + appreciate.Request.Url = sillyGirl.Get("appreciate", recommand) appreciate.Request.ResponseType = "image" appreciate.Request.Disappear = true Config.Replies = append(Config.Replies, appreciate) @@ -125,6 +126,9 @@ func InitReplies() { s.Reply(err) return true } + if appreciate.Request.Url != recommand { + f += "\n" + Tail + } s.Reply(f) case "template": data := data() @@ -197,6 +201,9 @@ func InitReplies() { content = strings.Replace(content, v, "", -1) } content = strings.Replace(content, `[d]`, ",", -1) + if appreciate.Request.Url != recommand { + content += "\n" + Tail + } s.Reply(content) default: d := data() diff --git a/core/server.go b/core/server.go index d97db1f..6f3fafe 100644 --- a/core/server.go +++ b/core/server.go @@ -8,6 +8,11 @@ func init() { Server = gin.New() } +var Tail = "--来自sillyGirl,傻妞技术交流群654346133。" + func RunServer() { + Server.GET("/", func(c *gin.Context) { + c.String(200, Tail) + }) Server.Run(":" + sillyGirl.Get("port", "8080")) } diff --git a/im/tg/tg.go b/im/tg/tg.go index b584761..1497814 100644 --- a/im/tg/tg.go +++ b/im/tg/tg.go @@ -168,7 +168,6 @@ func (sender *Sender) Reply(msgs ...interface{}) (int, error) { options = []interface{}{&tb.SendOptions{ReplyTo: sender.Message}} } } - fmt.Println(msg, "+++") var err error switch msg.(type) { case error: @@ -198,7 +197,6 @@ func (sender *Sender) Reply(msgs ...interface{}) (int, error) { } rt, err = b.Send(r, msg.(string), options...) case core.ImageUrl: - fmt.Println(msg.(core.ImageUrl), "+++") rsp, err := httplib.Get(string(msg.(core.ImageUrl))).Response() if err != nil { sender.Reply(err) diff --git a/im/wxmp/init.go b/im/wxmp/init.go index ac9194e..84fc2c1 100644 --- a/im/wxmp/init.go +++ b/im/wxmp/init.go @@ -43,6 +43,10 @@ func init() { if end == "" { return nil } + // { + // wechat.AddMaterial(message.MsgTypeText, filename string) + // } + // return &message.Reply{MsgType: message.MsgTypeImage, MsgData: message.NewText(end)} return &message.Reply{MsgType: message.MsgTypeText, MsgData: message.NewText(end)} }) err := server.Serve() @@ -135,13 +139,13 @@ func (sender *Sender) IsMedia() bool { } func (sender *Sender) Reply(msgs ...interface{}) (int, error) { - fmt.Println(msgs...) for _, item := range msgs { switch item.(type) { case string: sender.Responses = append(sender.Responses, item.(string)) case []byte: sender.Responses = append(sender.Responses, string(item.([]byte))) + case core.ImageUrl: } } return 0, nil