Skip to content

Commit c8dcdbb

Browse files
committed
world: 一大波优化与功能更新
- fix #441 - 优化wsserver解析 - 完善 ctx.this 相关函数 - 自动已读: Config 的 MarkMessage
1 parent ebcd3cd commit c8dcdbb

File tree

11 files changed

+47
-72
lines changed

11 files changed

+47
-72
lines changed

README.md

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
[![go](https://goreportcard.com/badge/github.com/FloatTech/ZeroBot-Plugin?style=flat-square&logo=go)](https://goreportcard.com/badge/github.com/FloatTech/ZeroBot-Plugin)
1919
[![onebot](https://img.shields.io/badge/onebot-v11-black?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHAAAABwCAMAAADxPgR5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAxQTFRF////29vbr6+vAAAAk1hCcwAAAAR0Uk5T////AEAqqfQAAAKcSURBVHja7NrbctswDATQXfD//zlpO7FlmwAWIOnOtNaTM5JwDMa8E+PNFz7g3waJ24fviyDPgfhz8fHP39cBcBL9KoJbQUxjA2iYqHL3FAnvzhL4GtVNUcoSZe6eSHizBcK5LL7dBr2AUZlev1ARRHCljzRALIEog6H3U6bCIyqIZdAT0eBuJYaGiJaHSjmkYIZd+qSGWAQnIaz2OArVnX6vrItQvbhZJtVGB5qX9wKqCMkb9W7aexfCO/rwQRBzsDIsYx4AOz0nhAtWu7bqkEQBO0Pr+Ftjt5fFCUEbm0Sbgdu8WSgJ5NgH2iu46R/o1UcBXJsFusWF/QUaz3RwJMEgngfaGGdSxJkE/Yg4lOBryBiMwvAhZrVMUUvwqU7F05b5WLaUIN4M4hRocQQRnEedgsn7TZB3UCpRrIJwQfqvGwsg18EnI2uSVNC8t+0QmMXogvbPg/xk+Mnw/6kW/rraUlvqgmFreAA09xW5t0AFlHrQZ3CsgvZm0FbHNKyBmheBKIF2cCA8A600aHPmFtRB1XvMsJAiza7LpPog0UJwccKdzw8rdf8MyN2ePYF896LC5hTzdZqxb6VNXInaupARLDNBWgI8spq4T0Qb5H4vWfPmHo8OyB1ito+AysNNz0oglj1U955sjUN9d41LnrX2D/u7eRwxyOaOpfyevCWbTgDEoilsOnu7zsKhjRCsnD/QzhdkYLBLXjiK4f3UWmcx2M7PO21CKVTH84638NTplt6JIQH0ZwCNuiWAfvuLhdrcOYPVO9eW3A67l7hZtgaY9GZo9AFc6cryjoeFBIWeU+npnk/nLE0OxCHL1eQsc1IciehjpJv5mqCsjeopaH6r15/MrxNnVhu7tmcslay2gO2Z1QfcfX0JMACG41/u0RrI9QAAAABJRU5ErkJggg==)](https://t.me/zerobotplugin)
20-
[![zerobot](https://img.shields.io/badge/zerobot-v1.6.11-black?style=flat-square&logo=go)](https://github.com/wdvxdr1123/ZeroBot)
20+
[![zerobot](https://img.shields.io/badge/zerobot-v1.7.2-black?style=flat-square&logo=go)](https://github.com/wdvxdr1123/ZeroBot)
2121
[![license](https://img.shields.io/github/license/FloatTech/ZeroBot-Plugin.svg?style=flat-square&logo=gnu)](https://raw.githubusercontent.com/FloatTech/ZeroBot-Plugin/master/LICENSE)
2222
[![tencent-qq](https://img.shields.io/badge/group-1048452984-red?style=flat-square&logo=tencent-qq)](https://jq.qq.com/?_wv=1027&k=QMb7x1mM)
2323
[![telegram](https://img.shields.io/badge/Telegram-click%20me-informational?style=flat-square&logo=telegram)](https://t.me/zerobotplugin)
@@ -42,9 +42,10 @@
4242
## 命令行参数
4343
> `[]`代表是可选参数
4444
```bash
45-
zerobot [-h] [-n nickname] [-t token] [-u url] [-g url] [-p prefix] [-d|w] [-c|s config.json] [-l latency] [-r ringlen] [-x max process time] [qq1 qq2 qq3 ...] [&]
45+
zerobot [-h] [-m] [-n nickname] [-t token] [-u url] [-g url] [-p prefix] [-d|w] [-c|s config.json] [-l latency] [-r ringlen] [-x max process time] [qq1 qq2 qq3 ...] [&]
4646
```
4747
- **-h**: 显示帮助
48+
- **-m**: 不自动标记消息为已读
4849
- **-n nickname**: 设置默认昵称,默认为`椛椛`
4950
- **-t token**: 设置`AccessToken`,默认为空
5051
- **-u url**: 设置`Url`,默认为`ws://127.0.0.1:6700`
@@ -62,27 +63,17 @@ zerobot [-h] [-n nickname] [-t token] [-u url] [-g url] [-p prefix] [-d|w] [-c|s
6263
默认配置文件格式如下。当选择从配置文件加载时,将忽略相应命令行参数。
6364
```json
6465
{
65-
"zero": {
66-
"nickname": [
67-
"椛椛",
68-
"ATRI",
69-
"atri",
70-
"亚托莉",
71-
"アトリ"
72-
],
73-
"command_prefix": "/",
74-
"super_users": [],
75-
"ring_len": 4096,
76-
"latency": 233000000,
77-
"max_process_time": 240000000000
78-
},
79-
"ws": [
80-
{
81-
"Url": "ws://127.0.0.1:6700",
82-
"AccessToken": ""
83-
}
84-
],
85-
"wss": null
66+
"zero": {
67+
"nickname": ["椛椛", "ATRI", "atri", "亚托莉", "アトリ"],
68+
"command_prefix": "/",
69+
"super_users": [],
70+
"ring_len": 4096,
71+
"latency": 233000000,
72+
"max_process_time": 240000000000,
73+
"mark_message": true
74+
},
75+
"ws": [{ "Url": "ws://127.0.0.1:6700", "AccessToken": "" }],
76+
"wss": null
8677
}
8778
```
8879

data

Submodule data updated 1 file

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/FloatTech/sqlite v1.6.2
1313
github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b
1414
github.com/FloatTech/zbpctrl v1.5.3-0.20230514154630-b74e6fcca380
15-
github.com/FloatTech/zbputils v1.6.2-0.20230514154857-9363fdb11fd6
15+
github.com/FloatTech/zbputils v1.6.2-0.20230728055141-bf0c1f30e617
1616
github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e
1717
github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5
1818
github.com/antchfx/htmlquery v1.2.5
@@ -37,7 +37,7 @@ require (
3737
github.com/sirupsen/logrus v1.9.0
3838
github.com/tidwall/gjson v1.14.4
3939
github.com/wcharczuk/go-chart/v2 v2.1.0
40-
github.com/wdvxdr1123/ZeroBot v1.6.11
40+
github.com/wdvxdr1123/ZeroBot v1.7.2
4141
gitlab.com/gomidi/midi/v2 v2.0.25
4242
golang.org/x/image v0.3.0
4343
golang.org/x/sys v0.4.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJG
1818
github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs=
1919
github.com/FloatTech/zbpctrl v1.5.3-0.20230514154630-b74e6fcca380 h1:qmwoT8xVaND01aCdwy+5/j6z490nehQWZAVyTBN8ahU=
2020
github.com/FloatTech/zbpctrl v1.5.3-0.20230514154630-b74e6fcca380/go.mod h1:gkGC1C1eEUd/Ld/ja68zas5j2ZktIZCdnj2FMaM+Au0=
21-
github.com/FloatTech/zbputils v1.6.2-0.20230514154857-9363fdb11fd6 h1:uss0/IszBjik7LSM5Q4xQ9FaDXAC7vK7y1dAaOj4UAk=
22-
github.com/FloatTech/zbputils v1.6.2-0.20230514154857-9363fdb11fd6/go.mod h1:JXRQf2GAzpd7gp853LP6PU3O4pkRoFFuKGykcBChPNk=
21+
github.com/FloatTech/zbputils v1.6.2-0.20230728055141-bf0c1f30e617 h1:9qDcXB3ILqncMUBVqCXe6dLjNUIYCIMo5kcQHfCAXEU=
22+
github.com/FloatTech/zbputils v1.6.2-0.20230728055141-bf0c1f30e617/go.mod h1:x99mMbbJrybb0dSKHL20hHutmjWop8CFP0X6Ywn8V78=
2323
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
2424
github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e h1:wR3MXQ3VbUlPKOOUwLOYgh/QaJThBTYtsl673O3lqSA=
2525
github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w=
@@ -203,8 +203,8 @@ github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYm
203203
github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
204204
github.com/wcharczuk/go-chart/v2 v2.1.0 h1:tY2slqVQ6bN+yHSnDYwZebLQFkphK4WNrVwnt7CJZ2I=
205205
github.com/wcharczuk/go-chart/v2 v2.1.0/go.mod h1:yx7MvAVNcP/kN9lKXM/NTce4au4DFN99j6i1OwDclNA=
206-
github.com/wdvxdr1123/ZeroBot v1.6.11 h1:44Wr6CsCtWlFensK5IhuVCWkosdRw0rA8SygVD8DgoI=
207-
github.com/wdvxdr1123/ZeroBot v1.6.11/go.mod h1:y29UIOy0RD3P+0meDNIWRhcJF3jtWPN9xP9hgt/AJAU=
206+
github.com/wdvxdr1123/ZeroBot v1.7.2 h1:aSibGY9X4xXbIF7IAffsf1OqNMIM9WIi1APtFYEVxL0=
207+
github.com/wdvxdr1123/ZeroBot v1.7.2/go.mod h1:y29UIOy0RD3P+0meDNIWRhcJF3jtWPN9xP9hgt/AJAU=
208208
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
209209
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
210210
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=

main.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ func init() {
231231
late := flag.Uint("l", 233, "Response latency (ms).")
232232
rsz := flag.Uint("r", 4096, "Receiving buffer ring size.")
233233
maxpt := flag.Uint("x", 4, "Max process time (min).")
234+
markmsg := flag.Bool("m", false, "Don't mark message as read automatically")
234235

235236
flag.Parse()
236237

@@ -277,7 +278,7 @@ func init() {
277278
config.Z.Driver[i] = w
278279
}
279280
for i, s := range config.S {
280-
config.Z.Driver[i+len(config.W)] = driver.NewWebSocketServer(16, s.Url, s.AccessToken)
281+
config.Z.Driver[i+len(config.W)] = s
281282
}
282283
logrus.Infoln("[main] 从", *runcfg, "读取配置文件")
283284
return
@@ -290,6 +291,7 @@ func init() {
290291
RingLen: *rsz,
291292
Latency: time.Duration(*late) * time.Millisecond,
292293
MaxProcessTime: time.Duration(*maxpt) * time.Minute,
294+
MarkMessage: !*markmsg,
293295
Driver: []zero.Driver{config.W[0]},
294296
}
295297

plugin/antiabuse/anti.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func init() {
7070
if err := ctx.State["manager"].(*ctrl.Control[*zero.Ctx]).Manager.DoBlock(uid); err == nil {
7171
t := time.Now().Unix()
7272
cache.Set(uid, struct{}{})
73-
ctx.SetGroupBan(gid, uid, int64(bandur.Minutes()))
73+
ctx.SetThisGroupBan(uid, int64(bandur.Minutes()))
7474
ctx.SendChain(message.Text("检测到违禁词, 已封禁/屏蔽", bandur))
7575
db.Lock()
7676
defer db.Unlock()

plugin/baiduaudit/model.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func (bdres *baiduRes) audit(ctx *zero.Ctx, configpath string) {
6868
bantime = group.BANTime * 60
6969
}
7070
// 执行禁言
71-
ctx.SetGroupBan(ctx.Event.GroupID, ctx.Event.UserID, bantime)
71+
ctx.SetThisGroupBan(ctx.Event.UserID, bantime)
7272
}
7373
// 查看是否开启撤回提示
7474
if group.DMRemind {

plugin/event/event.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ func init() {
3939
userid := ctx.Event.UserID
4040
username := ctx.CardOrNickName(userid)
4141
data := (storage)(c.GetData(-su))
42+
groupname := ctx.GetThisGroupInfo(true).Name
4243
groupid := ctx.Event.GroupID
43-
groupname := ctx.GetGroupInfo(groupid, true).Name
4444
logrus.Info("[event]收到来自[", username, "](", userid, ")的群聊邀请,群:[", groupname, "](", groupid, ")")
4545
if data.isinviteon() || (!data.ismasteroff() && zero.SuperUserPermission(ctx)) {
4646
ctx.SetGroupAddRequest(ctx.Event.Flag, "invite", true, "")

plugin/guessmusic/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ func getlist(pathOfMusic string) (list []listinfo, err error) {
527527

528528
// 遍历群文件
529529
func getFileURLbyFileName(ctx *zero.Ctx, fileName string) (fileSearchName, fileURL string) {
530-
filesOfGroup := ctx.GetThisGroupRootFiles(ctx.Event.GroupID)
530+
filesOfGroup := ctx.GetThisGroupRootFiles()
531531
files := filesOfGroup.Get("files").Array()
532532
folders := filesOfGroup.Get("folders").Array()
533533
// 遍历当前目录的文件名

plugin/manager/manager.go

Lines changed: 18 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,11 @@ func init() { // 插件主体
9595
// 升为管理
9696
engine.OnRegex(`^升为管理.*?(\d+)`, zero.OnlyGroup, zero.SuperUserPermission).SetBlock(true).
9797
Handle(func(ctx *zero.Ctx) {
98-
ctx.SetGroupAdmin(
99-
ctx.Event.GroupID,
98+
ctx.SetThisGroupAdmin(
10099
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被升为管理的人的qq
101100
true,
102101
)
103-
nickname := ctx.GetGroupMemberInfo( // 被升为管理的人的昵称
104-
ctx.Event.GroupID,
102+
nickname := ctx.GetThisGroupMemberInfo( // 被升为管理的人的昵称
105103
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被升为管理的人的qq
106104
false,
107105
).Get("nickname").Str
@@ -110,13 +108,11 @@ func init() { // 插件主体
110108
// 取消管理
111109
engine.OnRegex(`^取消管理.*?(\d+)`, zero.OnlyGroup, zero.SuperUserPermission).SetBlock(true).
112110
Handle(func(ctx *zero.Ctx) {
113-
ctx.SetGroupAdmin(
114-
ctx.Event.GroupID,
111+
ctx.SetThisGroupAdmin(
115112
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被取消管理的人的qq
116113
false,
117114
)
118-
nickname := ctx.GetGroupMemberInfo( // 被取消管理的人的昵称
119-
ctx.Event.GroupID,
115+
nickname := ctx.GetThisGroupMemberInfo( // 被取消管理的人的昵称
120116
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被取消管理的人的qq
121117
false,
122118
).Get("nickname").Str
@@ -125,13 +121,11 @@ func init() { // 插件主体
125121
// 踢出群聊
126122
engine.OnRegex(`^踢出群聊.*?(\d+)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
127123
Handle(func(ctx *zero.Ctx) {
128-
ctx.SetGroupKick(
129-
ctx.Event.GroupID,
124+
ctx.SetThisGroupKick(
130125
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被踢出群聊的人的qq
131126
false,
132127
)
133-
nickname := ctx.GetGroupMemberInfo( // 被踢出群聊的人的昵称
134-
ctx.Event.GroupID,
128+
nickname := ctx.GetThisGroupMemberInfo( // 被踢出群聊的人的昵称
135129
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被踢出群聊的人的qq
136130
false,
137131
).Get("nickname").Str
@@ -148,19 +142,13 @@ func init() { // 插件主体
148142
// 开启全体禁言
149143
engine.OnRegex(`^开启全员禁言$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
150144
Handle(func(ctx *zero.Ctx) {
151-
ctx.SetGroupWholeBan(
152-
ctx.Event.GroupID,
153-
true,
154-
)
145+
ctx.SetThisGroupWholeBan(true)
155146
ctx.SendChain(message.Text("全员自闭开始~"))
156147
})
157148
// 解除全员禁言
158149
engine.OnRegex(`^解除全员禁言$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
159150
Handle(func(ctx *zero.Ctx) {
160-
ctx.SetGroupWholeBan(
161-
ctx.Event.GroupID,
162-
false,
163-
)
151+
ctx.SetThisGroupWholeBan(false)
164152
ctx.SendChain(message.Text("全员自闭结束~"))
165153
})
166154
// 禁言
@@ -180,8 +168,7 @@ func init() { // 插件主体
180168
if duration >= 43200 {
181169
duration = 43199 // qq禁言最大时长为一个月
182170
}
183-
ctx.SetGroupBan(
184-
ctx.Event.GroupID,
171+
ctx.SetThisGroupBan(
185172
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 要禁言的人的qq
186173
duration*60, // 要禁言的时间(分钟)
187174
)
@@ -190,8 +177,7 @@ func init() { // 插件主体
190177
// 解除禁言
191178
engine.OnRegex(`^解除禁言.*?(\d+)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
192179
Handle(func(ctx *zero.Ctx) {
193-
ctx.SetGroupBan(
194-
ctx.Event.GroupID,
180+
ctx.SetThisGroupBan(
195181
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 要解除禁言的人的qq
196182
0,
197183
)
@@ -214,8 +200,7 @@ func init() { // 插件主体
214200
if duration >= 43200 {
215201
duration = 43199 // qq禁言最大时长为一个月
216202
}
217-
ctx.SetGroupBan(
218-
ctx.Event.GroupID,
203+
ctx.SetThisGroupBan(
219204
ctx.Event.UserID,
220205
duration*60, // 要自闭的时间(分钟)
221206
)
@@ -228,8 +213,7 @@ func init() { // 插件主体
228213
ctx.SendChain(message.Text("名字太长啦!"))
229214
return
230215
}
231-
ctx.SetGroupCard(
232-
ctx.Event.GroupID,
216+
ctx.SetThisGroupCard(
233217
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被修改群名片的人
234218
ctx.State["regex_matched"].([]string)[2], // 修改成的群名片
235219
)
@@ -246,8 +230,7 @@ func init() { // 插件主体
246230
ctx.SendChain(message.Text("头衔太长啦!"))
247231
return
248232
}
249-
ctx.SetGroupSpecialTitle(
250-
ctx.Event.GroupID,
233+
ctx.SetThisGroupSpecialTitle(
251234
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被修改群头衔的人
252235
sptitle, // 修改成的群头衔
253236
)
@@ -264,8 +247,7 @@ func init() { // 插件主体
264247
ctx.SendChain(message.Text("头衔太长啦!"))
265248
return
266249
}
267-
ctx.SetGroupSpecialTitle(
268-
ctx.Event.GroupID,
250+
ctx.SetThisGroupSpecialTitle(
269251
ctx.Event.UserID, // 被修改群头衔的人
270252
sptitle, // 修改成的群头衔
271253
)
@@ -445,7 +427,7 @@ func init() { // 插件主体
445427
case <-time.After(time.Minute):
446428
cancel()
447429
ctx.SendChain(message.Text("拜拜啦~"))
448-
ctx.SetGroupKick(ctx.Event.GroupID, uid, false)
430+
ctx.SetThisGroupKick(uid, false)
449431
case <-recv:
450432
cancel()
451433
ctx.SendChain(message.Text("答对啦~"))
@@ -594,7 +576,7 @@ func init() { // 插件主体
594576
if ok {
595577
ctx.SetGroupAddRequest(ctx.Event.Flag, "add", true, "")
596578
process.SleepAbout1sTo2s()
597-
ctx.SetGroupCard(ctx.Event.GroupID, ctx.Event.UserID, ghun)
579+
ctx.SetThisGroupCard(ctx.Event.UserID, ghun)
598580
} else {
599581
ctx.SetGroupAddRequest(ctx.Event.Flag, "add", false, reason)
600582
}
@@ -618,7 +600,7 @@ func init() { // 插件主体
618600
}
619601
})
620602
engine.OnCommand("精华列表", zero.OnlyGroup, zero.AdminPermission).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
621-
list := ctx.GetGroupEssenceMessageList(ctx.Event.GroupID).Array()
603+
list := ctx.GetThisGroupEssenceMessageList().Array()
622604
msg := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Text("本群精华列表:"))}
623605
n := len(list)
624606
if n > 30 {
@@ -675,7 +657,7 @@ func welcometocq(ctx *zero.Ctx, welcome string) string {
675657
at := "[CQ:at,qq=" + uid + "]" // at用户
676658
avatar := "[CQ:image,file=" + "http://q4.qlogo.cn/g?b=qq&nk=" + uid + "&s=640]" // 用户头像
677659
gid := strconv.FormatInt(ctx.Event.GroupID, 10) // 群id
678-
groupname := ctx.GetGroupInfo(ctx.Event.GroupID, true).Name // 群名
660+
groupname := ctx.GetThisGroupInfo(true).Name // 群名
679661
cqstring := strings.ReplaceAll(welcome, "{at}", at)
680662
cqstring = strings.ReplaceAll(cqstring, "{nickname}", nickname)
681663
cqstring = strings.ReplaceAll(cqstring, "{avatar}", avatar)

0 commit comments

Comments
 (0)