Skip to content

Commit f5936d9

Browse files
fumiamafumiama
committed
✨ 🎨 某些发图应用合并转发
1 parent 27e69ef commit f5936d9

File tree

6 files changed

+36
-15
lines changed

6 files changed

+36
-15
lines changed

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/FloatTech/ZeroBot-Plugin
33
go 1.17
44

55
require (
6-
github.com/FloatTech/AnimeAPI v1.3.1-0.20220301092207-292c2a0d9971
6+
github.com/FloatTech/AnimeAPI v1.3.1-0.20220301113905-02d4dd59812a
77
github.com/FloatTech/sqlite v0.2.0
8-
github.com/FloatTech/zbputils v1.3.1-0.20220301091616-3ace908b3d25
8+
github.com/FloatTech/zbputils v1.3.1-0.20220301113826-6b9656b3fd31
99
github.com/antchfx/htmlquery v1.2.4
1010
github.com/corona10/goimagehash v1.0.3
1111
github.com/fogleman/gg v1.3.0
@@ -21,7 +21,7 @@ require (
2121
github.com/shirou/gopsutil/v3 v3.21.12
2222
github.com/sirupsen/logrus v1.8.1
2323
github.com/tidwall/gjson v1.13.0
24-
github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220227065946-629493e7d2bf
24+
github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220301103916-37a3108954a3
2525
golang.org/x/image v0.0.0-20211028202545-6944b10bf410
2626
)
2727

‎go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
github.com/FloatTech/AnimeAPI v1.3.1-0.20220301092207-292c2a0d9971 h1:IVYw7zzffBYPSLGcSf7kv0P4OOfFRYrl6+Fyiv3ZQRY=
2-
github.com/FloatTech/AnimeAPI v1.3.1-0.20220301092207-292c2a0d9971/go.mod h1:yAmOcbDWxEZYQyLY919C5A/YJ4KX+aaQkpDaVQDVtlQ=
1+
github.com/FloatTech/AnimeAPI v1.3.1-0.20220301113905-02d4dd59812a h1:jenYdKRVcTZ7yG42ecJNRWqNQhEy9++iRmmMOLrlnRo=
2+
github.com/FloatTech/AnimeAPI v1.3.1-0.20220301113905-02d4dd59812a/go.mod h1:5IMAjYuV6td2s4Oui1HGJWMVy1b7QLxuO0GRZ8Cr9Zo=
33
github.com/FloatTech/bot-manager v1.0.0/go.mod h1:8YYRJ16oroGHQGD2En0oVnmcKJkxR9O/jd5BPSfWfOQ=
44
github.com/FloatTech/sqlite v0.2.0 h1:x3uls/hExXH1+bbaNLkvilce6ATtWlDx4IqoxBW/bv8=
55
github.com/FloatTech/sqlite v0.2.0/go.mod h1:xIDWIvpOFl8AXmZm0FC8t3PZjiR6ZutytCpBv2EWCns=
6-
github.com/FloatTech/zbputils v1.3.1-0.20220301091616-3ace908b3d25 h1:n88oTj/5QpJuA0NkUCbYvYlka7vwtke+FvaU3VrEtjg=
7-
github.com/FloatTech/zbputils v1.3.1-0.20220301091616-3ace908b3d25/go.mod h1:NXv73hWyC4Q4S4wg01DEwLzznSHSmde0o03PnsS1DtY=
6+
github.com/FloatTech/zbputils v1.3.1-0.20220301113826-6b9656b3fd31 h1:/7LrjHqRoxpur5zmLS5QZGj71ZGV2zQL5CN3fXJ6yzg=
7+
github.com/FloatTech/zbputils v1.3.1-0.20220301113826-6b9656b3fd31/go.mod h1:em9/r7X8/yLPSnkxM/Y3Ygg90+h/DMIPgLPQhd5ani8=
88
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
99
github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc h1:AAx50/fb/xS4lvsdQg+bFbGvqSDhyV1MF+p2PLCamZ0=
1010
github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc/go.mod h1:OMmITAib6POA37xCichWM0aRnoVpSMZO1rB/G01wrr0=
@@ -156,8 +156,8 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM
156156
github.com/ugorji/go v1.2.6/go.mod h1:anCg0y61KIhDlPZmnH+so+RQbysYVyDko0IMgJv0Nn0=
157157
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
158158
github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxWFFpvxTw=
159-
github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220227065946-629493e7d2bf h1:oUAVOzsRw5vrrZgBUEgG1BJ3hvjCUXykiVFqj0nfQ6o=
160-
github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220227065946-629493e7d2bf/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
159+
github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220301103916-37a3108954a3 h1:40usIs1ErLWl9NQTohon9gKh6UBWx4XBfUFUusnkTjw=
160+
github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220301103916-37a3108954a3/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
161161
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
162162
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
163163
github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=

‎plugin/acgimage/classify.go

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,13 @@ func init() { // 插件主体
7777
} else {
7878
url = randapi
7979
}
80-
setLastMsg(ctx.Event.GroupID, ctx.SendChain(message.Image(url).Add("cache", "0")))
80+
setLastMsg(ctx.Event.GroupID, message.NewMessageID(
81+
ctx.SendGroupForwardMessage(ctx.Event.GroupID,
82+
message.Message{
83+
ctxext.FakeSenderForwardNode(ctx,
84+
message.Image(url).Add("cache", "0"),
85+
),
86+
}).Get("message_id").String()))
8187
block = false
8288
}
8389
})
@@ -149,9 +155,19 @@ func reply(ctx *zero.Ctx, class int, dhash string, comment string) error {
149155
}
150156
} else {
151157
send = func(msg interface{}) int64 {
152-
return ctx.Send(append(msg.(message.Message), message.Text(comment))).ID()
158+
return int64(ctx.SendGroupForwardMessage(ctx.Event.GroupID, message.Message{
159+
ctxext.FakeSenderForwardNode(ctx, append(
160+
msg.(message.Message),
161+
message.Text(comment))...,
162+
),
163+
}).Get("message_id").Int())
153164
}
154165
}
155166

156-
return pool.SendRemoteImageFromPool(b14, u, send, ctxext.GetMessage(ctx))
167+
return pool.SendRemoteImageFromPool(b14, u, send, func(i int64) zero.Message {
168+
if class > 5 {
169+
return ctxext.GetMessage(ctx)(i)
170+
}
171+
return ctxext.GetFirstMessageInForward(ctx)(i)
172+
})
157173
}

‎plugin/image_finder/keyword.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func init() {
5959
err = pool.SendImageFromPool(n, f, func() error {
6060
// 下载图片
6161
return illust.DownloadToCache(0)
62-
}, ctxext.Send(ctx), ctxext.GetMessage(ctx))
62+
}, ctxext.SendFakeForwardToGroup(ctx), ctxext.GetFirstMessageInForward(ctx))
6363
if err != nil {
6464
ctx.SendChain(message.Text("ERROR: ", err))
6565
return

‎plugin/nativesetu/main.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@ func init() {
5454
ctx.SendChain(message.Text("ERROR: ", err))
5555
} else {
5656
p := "file:///" + setupath + "/" + sc.Path
57+
if ctx.Event.GroupID != 0 {
58+
ctx.SendGroupForwardMessage(ctx.Event.GroupID, message.Message{
59+
ctxext.FakeSenderForwardNode(ctx,
60+
message.Text(imgtype, ": ", sc.Name, "\n"), message.Image(p),
61+
)})
62+
return
63+
}
5764
ctx.SendChain(message.Text(imgtype, ": ", sc.Name, "\n"), message.Image(p))
5865
}
5966
})

‎plugin/ymgal/ymgal.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
package ymgal
33

44
import (
5-
"log"
65
"strings"
76

87
"github.com/FloatTech/zbputils/control"
@@ -24,7 +23,6 @@ func init() {
2423
defer order.DoneOnExit()()
2524
_, _ = file.GetLazyData(dbfile, false, false)
2625
gdb = initialize(dbfile)
27-
log.Println("[ymgal]加载月幕gal数据库")
2826
}()
2927
engine.OnRegex("^随机gal(CG|表情包)$").Limit(ctxext.LimitByUser).SetBlock(true).
3028
Handle(func(ctx *zero.Ctx) {

0 commit comments

Comments
 (0)