This commit is contained in:
cdle
2021-09-28 10:34:15 +08:00
parent 3d977e817f
commit 8ff1a94080
4 changed files with 18 additions and 4 deletions
+8 -1
View File
@@ -35,7 +35,8 @@ func InitReplies() {
Rules: []string{"^打赏", "^赞赏"}, Rules: []string{"^打赏", "^赞赏"},
Type: "url", 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.ResponseType = "image"
appreciate.Request.Disappear = true appreciate.Request.Disappear = true
Config.Replies = append(Config.Replies, appreciate) Config.Replies = append(Config.Replies, appreciate)
@@ -125,6 +126,9 @@ func InitReplies() {
s.Reply(err) s.Reply(err)
return true return true
} }
if appreciate.Request.Url != recommand {
f += "\n" + Tail
}
s.Reply(f) s.Reply(f)
case "template": case "template":
data := data() data := data()
@@ -197,6 +201,9 @@ func InitReplies() {
content = strings.Replace(content, v, "", -1) content = strings.Replace(content, v, "", -1)
} }
content = strings.Replace(content, `[d]`, ",", -1) content = strings.Replace(content, `[d]`, ",", -1)
if appreciate.Request.Url != recommand {
content += "\n" + Tail
}
s.Reply(content) s.Reply(content)
default: default:
d := data() d := data()
+5
View File
@@ -8,6 +8,11 @@ func init() {
Server = gin.New() Server = gin.New()
} }
var Tail = "--来自sillyGirl,傻妞技术交流群654346133。"
func RunServer() { func RunServer() {
Server.GET("/", func(c *gin.Context) {
c.String(200, Tail)
})
Server.Run(":" + sillyGirl.Get("port", "8080")) Server.Run(":" + sillyGirl.Get("port", "8080"))
} }
-2
View File
@@ -168,7 +168,6 @@ func (sender *Sender) Reply(msgs ...interface{}) (int, error) {
options = []interface{}{&tb.SendOptions{ReplyTo: sender.Message}} options = []interface{}{&tb.SendOptions{ReplyTo: sender.Message}}
} }
} }
fmt.Println(msg, "+++")
var err error var err error
switch msg.(type) { switch msg.(type) {
case error: case error:
@@ -198,7 +197,6 @@ func (sender *Sender) Reply(msgs ...interface{}) (int, error) {
} }
rt, err = b.Send(r, msg.(string), options...) rt, err = b.Send(r, msg.(string), options...)
case core.ImageUrl: case core.ImageUrl:
fmt.Println(msg.(core.ImageUrl), "+++")
rsp, err := httplib.Get(string(msg.(core.ImageUrl))).Response() rsp, err := httplib.Get(string(msg.(core.ImageUrl))).Response()
if err != nil { if err != nil {
sender.Reply(err) sender.Reply(err)
+5 -1
View File
@@ -43,6 +43,10 @@ func init() {
if end == "" { if end == "" {
return nil 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)} return &message.Reply{MsgType: message.MsgTypeText, MsgData: message.NewText(end)}
}) })
err := server.Serve() err := server.Serve()
@@ -135,13 +139,13 @@ func (sender *Sender) IsMedia() bool {
} }
func (sender *Sender) Reply(msgs ...interface{}) (int, error) { func (sender *Sender) Reply(msgs ...interface{}) (int, error) {
fmt.Println(msgs...)
for _, item := range msgs { for _, item := range msgs {
switch item.(type) { switch item.(type) {
case string: case string:
sender.Responses = append(sender.Responses, item.(string)) sender.Responses = append(sender.Responses, item.(string))
case []byte: case []byte:
sender.Responses = append(sender.Responses, string(item.([]byte))) sender.Responses = append(sender.Responses, string(item.([]byte)))
case core.ImageUrl:
} }
} }
return 0, nil return 0, nil