From c199a0ac6d4a8d84cb09660d7e9d209711fac16a Mon Sep 17 00:00:00 2001 From: fumiama Date: Thu, 3 Jun 2021 23:46:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=8C=96=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E3=80=81=E5=A2=9E=E5=8A=A0=E7=AE=80=E6=98=93?= =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 1 + manager/manager.go | 5 +++-- manager/timer.go | 23 ----------------------- msgext/msgext.go | 26 ++++++++++++++++++++++++++ randimg/setu_geter.go | 29 +++++++++++++++++++++++++++++ 5 files changed, 59 insertions(+), 25 deletions(-) create mode 100644 msgext/msgext.go create mode 100644 randimg/setu_geter.go diff --git a/main.go b/main.go index 716ff478..c065ed9a 100644 --- a/main.go +++ b/main.go @@ -24,6 +24,7 @@ import ( // 娱乐类 _ "github.com/Yiwen-Chan/ZeroBot-Plugin/music" // 点歌 + _ "github.com/Yiwen-Chan/ZeroBot-Plugin/randimg" //简易随机图片 _ "github.com/Yiwen-Chan/ZeroBot-Plugin/setutime" // 涩图 _ "github.com/Yiwen-Chan/ZeroBot-Plugin/shindan" // 测定 ) diff --git a/manager/manager.go b/manager/manager.go index 7e103974..81e5cc66 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -4,6 +4,7 @@ import ( "strconv" "strings" + "github.com/Yiwen-Chan/ZeroBot-Plugin/msgext" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" ) @@ -238,9 +239,9 @@ func init() { // 插件主体 if ts.enable { go timer(ts, func() { if ts.url == "" { - ctx.SendChain(AtAll(), message.Text(ts.alert)) + ctx.SendChain(msgext.AtAll(), message.Text(ts.alert)) } else { - ctx.SendChain(AtAll(), message.Text(ts.alert), ImageNoCache(ts.url)) + ctx.SendChain(msgext.AtAll(), message.Text(ts.alert), msgext.ImageNoCache(ts.url)) } }) ctx.Send("记住了~") diff --git a/manager/timer.go b/manager/timer.go index a42916da..5bed7bae 100644 --- a/manager/timer.go +++ b/manager/timer.go @@ -6,8 +6,6 @@ import ( "strings" "time" "unicode" - - "github.com/wdvxdr1123/ZeroBot/message" ) type TimeStamp struct { @@ -175,24 +173,3 @@ func chineseChar2Int(c rune) int { return 0 } } - -//@全体成员 -func AtAll() message.MessageSegment { - return message.MessageSegment{ - Type: "at", - Data: map[string]string{ - "qq": "all", - }, - } -} - -//无缓存发送图片 -func ImageNoCache(url string) message.MessageSegment { - return message.MessageSegment{ - Type: "image", - Data: map[string]string{ - "file": url, - "cache": "0", - }, - } -} diff --git a/msgext/msgext.go b/msgext/msgext.go new file mode 100644 index 00000000..b0f1dacb --- /dev/null +++ b/msgext/msgext.go @@ -0,0 +1,26 @@ +package msgext + +import ( + "github.com/wdvxdr1123/ZeroBot/message" +) + +//@全体成员 +func AtAll() message.MessageSegment { + return message.MessageSegment{ + Type: "at", + Data: map[string]string{ + "qq": "all", + }, + } +} + +//无缓存发送图片 +func ImageNoCache(url string) message.MessageSegment { + return message.MessageSegment{ + Type: "image", + Data: map[string]string{ + "file": url, + "cache": "0", + }, + } +} diff --git a/randimg/setu_geter.go b/randimg/setu_geter.go new file mode 100644 index 00000000..2f8cb31c --- /dev/null +++ b/randimg/setu_geter.go @@ -0,0 +1,29 @@ +package randimg + +import ( + "strings" + + "github.com/Yiwen-Chan/ZeroBot-Plugin/msgext" + zero "github.com/wdvxdr1123/ZeroBot" +) + +var RANDOM_API_URL = "https://api.pixivweb.com/anime18r.php?return=img" + +func init() { // 插件主体 + zero.OnRegex(`^设置随机图片网址(.*)$`, zero.SuperUserPermission).SetBlock(true).SetPriority(20). + Handle(func(ctx *zero.Ctx) { + url := ctx.State["regex_matched"].([]string)[1] + if !strings.HasPrefix(url, "http") { + ctx.Send("URL非法!") + } else { + RANDOM_API_URL = url + } + return + }) + // 随机图片 + zero.OnFullMatchGroup([]string{"随机图片"}).SetBlock(true).SetPriority(24). + Handle(func(ctx *zero.Ctx) { + ctx.Send(msgext.ImageNoCache(RANDOM_API_URL)) + return + }) +}