Compare commits

..

43 Commits

Author SHA1 Message Date
源文雨
0357405cdf 🐛 心跳 2023-07-28 16:29:56 +08:00
源文雨
7f264964c2 🔖 v1.7.2 2023-07-28 13:59:33 +08:00
源文雨
c8dcdbb0b2 world: 一大波优化与功能更新
- fix #441
- 优化wsserver解析
- 完善 ctx.this 相关函数
- 自动已读: Config 的 MarkMessage
2023-07-28 13:56:48 +08:00
Jiang-Red
ebcd3cdef2 fix shindan (#706) 2023-07-27 13:20:51 +08:00
Jiang-Red
eb43f84d34 fix title (#705) 2023-07-23 00:41:00 +08:00
莫思潋
5931e03c00 *update help command (#703) 2023-07-18 23:46:28 +08:00
Jiang-Red
aaf659f6d4 fix runcode (#702)
* fix runcode

* fix permission
2023-07-17 22:57:58 +08:00
weigui404
f4add826ff Update README.md (#701) 2023-07-16 15:50:45 +08:00
Jiang-Red
0d8157e2f8 修复反向ws顺便禁用新版ci的某个功能 (#700) 2023-07-13 14:23:25 +08:00
alexskim
283667cfe5 修多功能抽签不刷新列表bug (#693) 2023-06-13 11:46:06 +08:00
源文雨
6403614fa8 🐛 fix control cache 2023-05-14 23:49:46 +08:00
源文雨
bdcb833217 🐛 fix control cache 2023-05-09 13:35:50 +08:00
源文雨
278d7e0cf9 🔖 v1.7.1 2023-04-30 13:52:25 +08:00
源文雨
821f8d4949 update wife 2023-04-30 13:51:25 +08:00
源文雨
436838d2f8 fix 2023-04-22 14:53:32 +08:00
源文雨
30301f1aba 🦙请求改POST 2023-04-22 14:40:35 +08:00
源文雨
df1d71b9b2 remove 🦙 reply 2023-04-21 14:49:34 +08:00
源文雨
0315718ab7 优化 2023-04-20 01:14:32 +08:00
源文雨
971c179227 优化 2023-04-19 23:26:15 +08:00
源文雨
1c0270fda0 thesarus add 🦙 2023-04-19 23:07:43 +08:00
源文雨
5463945b6c 🔖 v1.7.1-beta3 2023-04-19 11:36:52 +08:00
莲宝坏坏坏
8eb058fb26 add 维基百科 (#673)
* add 维基百科

* make happy
2023-04-19 00:47:44 +08:00
github-actions[bot]
33e5b0286f 🎨 改进代码样式 (#669)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-04-17 16:14:17 +08:00
GenesisAN
296fd60cd7 ️ gif改为使用base64发送 (#664) 2023-04-17 04:40:45 +00:00
himawari
667c9fbcca 添加据意查句 (#660) 2023-04-17 03:23:37 +00:00
莲宝坏坏坏
3d8d0ad107 fix 权重查询 (#666) 2023-04-15 15:32:09 +08:00
源文雨
f35a89e401 update deps 2023-04-15 13:13:37 +08:00
GenesisAN
c5c63d0b64 wfapi 锁问题修复,设置TLS请求为1.2 (#663)
Co-authored-by: GenesisAN <501946815@qq.com>
2023-04-12 14:02:49 +08:00
weigui404
3e15754031 Update shindan.go (#662) 2023-04-12 00:34:33 +08:00
源文雨
c1e37b293c remove ca 2023-04-11 19:48:32 +08:00
源文雨
8edc3f6de6 update deps 2023-04-11 14:00:06 +08:00
源文雨
416cb3f2b8 Merge branch 'master' of https://github.com/FloatTech/ZeroBot-Plugin 2023-04-11 13:59:41 +08:00
源文雨
8050f12d51 db cache time to time.Hour 2023-04-11 13:59:33 +08:00
苜蓿紫
292fc311d6 fix dish.go (#661) 2023-04-11 11:56:24 +08:00
源文雨
28cb0491f7 🐛 fix ca 2023-04-10 23:28:21 +08:00
源文雨
1bad611018 🎨 优化触发权限 2023-04-10 14:21:27 +08:00
源文雨
d49224fd50 🐛 fix ca 2023-04-10 14:16:00 +08:00
源文雨
2324837052 🐛 fix ca 2023-04-10 13:52:48 +08:00
源文雨
35f8458d67 🐛 fix ca 2023-04-10 12:46:51 +08:00
源文雨
8a6b7f65c7 🐛 fix ca 2023-04-10 12:21:18 +08:00
源文雨
7b1d2b7eaa fix 设置语音模式 2023-04-10 11:57:10 +08:00
源文雨
7ced79c6bb fix 设置语音模式 2023-04-10 11:56:24 +08:00
源文雨
e224bf9252 add 插件冲突避免 2023-04-10 11:50:52 +08:00
45 changed files with 595 additions and 237 deletions

View File

@@ -18,7 +18,7 @@ linters:
fast: false
enable:
- bodyclose
- depguard
#- depguard
- dogsled
- errcheck
- exportloopref

View File

@@ -17,7 +17,7 @@
[![go](https://goreportcard.com/badge/github.com/FloatTech/ZeroBot-Plugin?style=flat-square&logo=go)](https://goreportcard.com/badge/github.com/FloatTech/ZeroBot-Plugin)
[![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)
[![zerobot](https://img.shields.io/badge/zerobot-v1.6.11-black?style=flat-square&logo=go)](https://github.com/wdvxdr1123/ZeroBot)
[![zerobot](https://img.shields.io/badge/zerobot-v1.7.2-black?style=flat-square&logo=go)](https://github.com/wdvxdr1123/ZeroBot)
[![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)
[![tencent-qq](https://img.shields.io/badge/group-1048452984-red?style=flat-square&logo=tencent-qq)](https://jq.qq.com/?_wv=1027&k=QMb7x1mM)
[![telegram](https://img.shields.io/badge/Telegram-click%20me-informational?style=flat-square&logo=telegram)](https://t.me/zerobotplugin)
@@ -42,9 +42,10 @@
## 命令行参数
> `[]`代表是可选参数
```bash
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 ...] [&]
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 ...] [&]
```
- **-h**: 显示帮助
- **-m**: 不自动标记消息为已读
- **-n nickname**: 设置默认昵称,默认为`椛椛`
- **-t token**: 设置`AccessToken`,默认为空
- **-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
默认配置文件格式如下。当选择从配置文件加载时,将忽略相应命令行参数。
```json
{
"zero": {
"nickname": [
"椛椛",
"ATRI",
"atri",
"亚托莉",
"アトリ"
],
"command_prefix": "/",
"super_users": [],
"ring_len": 4096,
"latency": 233000000,
"max_process_time": 240000000000
},
"ws": [
{
"Url": "ws://127.0.0.1:6700",
"AccessToken": ""
}
],
"wss": null
"zero": {
"nickname": ["椛椛", "ATRI", "atri", "亚托莉", "アトリ"],
"command_prefix": "/",
"super_users": [],
"ring_len": 4096,
"latency": 233000000,
"max_process_time": 240000000000,
"mark_message": true
},
"ws": [{ "Url": "ws://127.0.0.1:6700", "AccessToken": "" }],
"wss": null
}
```
@@ -436,11 +427,11 @@ print("run[CQ:image,file="+j["img"]+"]")
</details>
<details>
<summary>百度百科</summary>
<summary>百科</summary>
`import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/baidu"`
- [x] 百度/百科[xxx]
- [x] 百度/百科/维基/wiki[xxx]
</details>
<details>
@@ -1295,7 +1286,7 @@ print("run[CQ:image,file="+j["img"]+"]")
- [x] steam[添加|删除]订阅xxxxx
- [x] steam查订阅
- [x] steam查订阅
- [x] steam绑定 api key xxxxxxx
@@ -1386,7 +1377,17 @@ print("run[CQ:image,file="+j["img"]+"]")
- [x] 来份网易云热评
</details>
</details>
<details>
<summary>据意查句</summary>
`import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wantquotes"`
- [x] 据意查句 大海
- [x] 登录据意查句
</details>
<details>
<summary>星际战甲</summary>

View File

@@ -79,7 +79,7 @@ func init() {
logrus.Warnln("VT100设置失败, 将以无色模式输出")
}
err = setConsoleTitle("ZeroBot-Blugin " + banner.Version + " " + banner.Copyright)
err = setConsoleTitle("ZeroBot-Plugin " + banner.Version + " " + banner.Copyright)
if err != nil {
panic(err)
}

2
data

Submodule data updated: 1e64e7cf82...9cab8a7bae

12
go.mod
View File

@@ -4,15 +4,15 @@ go 1.20
require (
github.com/Baidu-AIP/golang-sdk v1.1.1
github.com/FloatTech/AnimeAPI v1.6.1-0.20230409024643-f25135dee0da
github.com/FloatTech/AnimeAPI v1.6.1-0.20230724165034-a3cf504fab92
github.com/FloatTech/floatbox v0.0.0-20230331064925-9af336a84944
github.com/FloatTech/gg v1.1.3-0.20230226151425-6ea91286ba08
github.com/FloatTech/imgfactory v0.2.2-0.20230322091809-b0ddbe44b94b
github.com/FloatTech/imgfactory v0.2.2-0.20230413152719-e101cc3606ef
github.com/FloatTech/rendercard v0.0.10-0.20230223064326-45d29fa4ede9
github.com/FloatTech/sqlite v1.6.2
github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b
github.com/FloatTech/zbpctrl v1.5.3-0.20230408032827-50ef967f2849
github.com/FloatTech/zbputils v1.6.2-0.20230408085317-f2f525cff6fc
github.com/FloatTech/zbpctrl v1.5.3-0.20230514154630-b74e6fcca380
github.com/FloatTech/zbputils v1.6.2-0.20230728081122-94d4d957f3bf
github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e
github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5
github.com/antchfx/htmlquery v1.2.5
@@ -24,7 +24,6 @@ require (
github.com/fumiama/go-base16384 v1.6.4
github.com/fumiama/go-registry v0.2.6
github.com/fumiama/gotracemoe v0.0.3
github.com/fumiama/imgsz v0.0.2
github.com/fumiama/jieba v0.0.0-20221203025406-36c17a10b565
github.com/fumiama/unibase2n v0.0.0-20221020155353-02876e777430
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
@@ -38,7 +37,7 @@ require (
github.com/sirupsen/logrus v1.9.0
github.com/tidwall/gjson v1.14.4
github.com/wcharczuk/go-chart/v2 v2.1.0
github.com/wdvxdr1123/ZeroBot v1.6.11
github.com/wdvxdr1123/ZeroBot v1.7.4
gitlab.com/gomidi/midi/v2 v2.0.25
golang.org/x/image v0.3.0
golang.org/x/sys v0.4.0
@@ -52,6 +51,7 @@ require (
github.com/faiface/beep v1.1.0 // indirect
github.com/fumiama/go-simple-protobuf v0.1.0 // indirect
github.com/fumiama/gofastTEA v0.0.10 // indirect
github.com/fumiama/imgsz v0.0.2 // indirect
github.com/gabriel-vasile/mimetype v1.0.4 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect

22
go.sum
View File

@@ -2,26 +2,24 @@ github.com/Baidu-AIP/golang-sdk v1.1.1 h1:RQsAmgDSAkiq22I6n7XJ2t3afgzFeqjY46FGhv
github.com/Baidu-AIP/golang-sdk v1.1.1/go.mod h1:bXnGw7xPeKt8aF7UCELKrV6UZ/46spItONK1RQBQj1Y=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
github.com/FloatTech/AnimeAPI v1.6.1-0.20230407094656-35c90555daf6 h1:hS5U1Xz6JtVyGdXOl50j9ubQxP446+TjIAhaGapGUpU=
github.com/FloatTech/AnimeAPI v1.6.1-0.20230407094656-35c90555daf6/go.mod h1:UnCPjtpIzpNBZ02yeGYp+oYVxgoi5aF2yAK2bkOVxtI=
github.com/FloatTech/AnimeAPI v1.6.1-0.20230409024643-f25135dee0da h1:QyH0zpWt3YspNNfZ+5f8+QStvtmxrzld/DoocKjF+rc=
github.com/FloatTech/AnimeAPI v1.6.1-0.20230409024643-f25135dee0da/go.mod h1:UnCPjtpIzpNBZ02yeGYp+oYVxgoi5aF2yAK2bkOVxtI=
github.com/FloatTech/AnimeAPI v1.6.1-0.20230724165034-a3cf504fab92 h1:B4IaLEhnXdr7oqszneri6ykdHggL2GvPUueBB5WxYVQ=
github.com/FloatTech/AnimeAPI v1.6.1-0.20230724165034-a3cf504fab92/go.mod h1:fWJ5hx1ggDmLyLldO53Go97zc1JpWnDpsC5qeTOcaVw=
github.com/FloatTech/floatbox v0.0.0-20230331064925-9af336a84944 h1:/eQoMa6Aj3coF5F7yhzZe1+SzX6SItul7MW8//pl18o=
github.com/FloatTech/floatbox v0.0.0-20230331064925-9af336a84944/go.mod h1:FwQm6wk+b4wuW54KCKn3zccMX47Q5apnHD/Yakzv0fI=
github.com/FloatTech/gg v1.1.3-0.20230226151425-6ea91286ba08 h1:dPLeoiTVSBlgls+66EB/UJ2e38BaASmBN5nANaycSBU=
github.com/FloatTech/gg v1.1.3-0.20230226151425-6ea91286ba08/go.mod h1:uzPzAeT35egARdRuu+1oyjU3CmTwCceoq3Vvje7LpcI=
github.com/FloatTech/imgfactory v0.2.2-0.20230322091809-b0ddbe44b94b h1:VMNci4SWBySdw/6poqF9Dn9zlT5ntTFSJOEEBjRnJ/4=
github.com/FloatTech/imgfactory v0.2.2-0.20230322091809-b0ddbe44b94b/go.mod h1:el5hGpj1C1bDRxcTXYRwEivDCr40zZeJpcrLrB1fajs=
github.com/FloatTech/imgfactory v0.2.2-0.20230413152719-e101cc3606ef h1:CJbK/2FRwPuZpeb6M4sWK2d7oXDnBEGhpkQuQrgc91A=
github.com/FloatTech/imgfactory v0.2.2-0.20230413152719-e101cc3606ef/go.mod h1:el5hGpj1C1bDRxcTXYRwEivDCr40zZeJpcrLrB1fajs=
github.com/FloatTech/rendercard v0.0.10-0.20230223064326-45d29fa4ede9 h1:hffajvmQFfP68U6wUwHemPuuwCUoss+SEFfoLYwbGwE=
github.com/FloatTech/rendercard v0.0.10-0.20230223064326-45d29fa4ede9/go.mod h1:NBFPhWae4hqVMeG8ELBBnUQkKce3nDjkljVn6PdiUNs=
github.com/FloatTech/sqlite v1.6.2 h1:FytbExjpvYalZxxITtmSenHiPGLPUvlz47LY/P0SCCw=
github.com/FloatTech/sqlite v1.6.2/go.mod h1:zFbHzRfB+CJ+VidfjuVbrcin3DAz283F7hF1hIeHzpY=
github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJGLDNIdRX3BI546D3O7k7vrVueZw=
github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs=
github.com/FloatTech/zbpctrl v1.5.3-0.20230408032827-50ef967f2849 h1:ARKWV3tXJLENWY6vcwTStEDwJckYnxoHXgZMsuJ3gUw=
github.com/FloatTech/zbpctrl v1.5.3-0.20230408032827-50ef967f2849/go.mod h1:IagyEhY38VcbbQgVRzAM9f9mhaUn90rM5BTPfudtl1g=
github.com/FloatTech/zbputils v1.6.2-0.20230408085317-f2f525cff6fc h1:myLvTVYvTaBgKoXJW1rHPFfr0W4wWPlJQ5DlKBhfHuw=
github.com/FloatTech/zbputils v1.6.2-0.20230408085317-f2f525cff6fc/go.mod h1:GLuSpLdTOCpqkR1oxqjuDz/rOif/ZrH4zGhtMzBqlqo=
github.com/FloatTech/zbpctrl v1.5.3-0.20230514154630-b74e6fcca380 h1:qmwoT8xVaND01aCdwy+5/j6z490nehQWZAVyTBN8ahU=
github.com/FloatTech/zbpctrl v1.5.3-0.20230514154630-b74e6fcca380/go.mod h1:gkGC1C1eEUd/Ld/ja68zas5j2ZktIZCdnj2FMaM+Au0=
github.com/FloatTech/zbputils v1.6.2-0.20230728081122-94d4d957f3bf h1:PwH9aMnmN+m204cVIqUrI3e7nsdQi/IGW012Fjzb1bs=
github.com/FloatTech/zbputils v1.6.2-0.20230728081122-94d4d957f3bf/go.mod h1:JRnGR7EGeEQgxOs+c0rZAhrS9Es2BTcGHdIDHXIPRzQ=
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e h1:wR3MXQ3VbUlPKOOUwLOYgh/QaJThBTYtsl673O3lqSA=
github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w=
@@ -205,8 +203,8 @@ github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYm
github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
github.com/wcharczuk/go-chart/v2 v2.1.0 h1:tY2slqVQ6bN+yHSnDYwZebLQFkphK4WNrVwnt7CJZ2I=
github.com/wcharczuk/go-chart/v2 v2.1.0/go.mod h1:yx7MvAVNcP/kN9lKXM/NTce4au4DFN99j6i1OwDclNA=
github.com/wdvxdr1123/ZeroBot v1.6.11 h1:44Wr6CsCtWlFensK5IhuVCWkosdRw0rA8SygVD8DgoI=
github.com/wdvxdr1123/ZeroBot v1.6.11/go.mod h1:y29UIOy0RD3P+0meDNIWRhcJF3jtWPN9xP9hgt/AJAU=
github.com/wdvxdr1123/ZeroBot v1.7.4 h1:+148rELpf/FCDW2EuvKqpb9bNKcwKRtoh16s2sIb5SE=
github.com/wdvxdr1123/ZeroBot v1.7.4/go.mod h1:y29UIOy0RD3P+0meDNIWRhcJF3jtWPN9xP9hgt/AJAU=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=

View File

@@ -3,13 +3,13 @@
package banner
// Version ...
var Version = "v1.7.1-beta2"
var Version = "v1.7.2"
// Copyright ...
var Copyright = "© 2020 - 2023 FloatTech"
// Banner ...
var Banner = "* OneBot + ZeroBot + Golang\n" +
"* Version " + Version + " - 2023-04-09 11:01:54 +0800 CST\n" +
"* Version " + Version + " - 2023-07-28 13:58:50 +0800 CST\n" +
"* Copyright " + Copyright + ". All Rights Reserved.\n" +
"* Project: https://github.com/FloatTech/ZeroBot-Plugin"

11
main.go
View File

@@ -142,6 +142,7 @@ import (
_ "github.com/FloatTech/ZeroBot-Plugin/plugin/vtbmusic" // vtb点歌
_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wallet" // 钱包
_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wangyiyun" // 网易云音乐热评
_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wantquotes" // 据意查句
_ "github.com/FloatTech/ZeroBot-Plugin/plugin/warframeapi" // warframeAPI插件
_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wenben" // 文本指令大全
_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wenxinAI" // 百度文心AI画图
@@ -230,6 +231,7 @@ func init() {
late := flag.Uint("l", 233, "Response latency (ms).")
rsz := flag.Uint("r", 4096, "Receiving buffer ring size.")
maxpt := flag.Uint("x", 4, "Max process time (min).")
markmsg := flag.Bool("m", false, "Don't mark message as read automatically")
flag.Parse()
@@ -257,6 +259,9 @@ func init() {
// sus = append(sus, 12345678)
// sus = append(sus, 87654321)
// 启用 webui
// go webctrl.RunGui(*g)
if *runcfg != "" {
f, err := os.Open(*runcfg)
if err != nil {
@@ -286,6 +291,7 @@ func init() {
RingLen: *rsz,
Latency: time.Duration(*late) * time.Millisecond,
MaxProcessTime: time.Duration(*maxpt) * time.Minute,
MarkMessage: !*markmsg,
Driver: []zero.Driver{config.W[0]},
}
@@ -302,9 +308,6 @@ func init() {
logrus.Infoln("[main] 配置文件已保存到", *save)
os.Exit(0)
}
// 启用 webui
// go webctrl.RunGui(*g)
}
func main() {
@@ -312,7 +315,7 @@ func main() {
rand.Seed(time.Now().UnixNano()) //nolint: staticcheck
}
// 帮助
zero.OnFullMatchGroup([]string{"/help", ".help", "菜单"}, zero.OnlyToMe).SetBlock(true).
zero.OnFullMatchGroup([]string{"help", "/help", ".help", "菜单"}, zero.OnlyToMe).SetBlock(true).
Handle(func(ctx *zero.Ctx) {
ctx.SendChain(message.Text(banner.Banner, "\n管理发送\"/服务列表\"查看 bot 功能\n发送\"/用法name\"查看功能用法"))
})

View File

@@ -104,7 +104,7 @@ func init() { // 插件主体
}
})
ent.OnRegex(`^设置语音模式\s*(.*)\s+(\d*)$`, zero.AdminPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
ent.OnRegex(`^设置语音模式\s*([\S\D]*)\s+(\d*)$`, zero.AdminPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
param := ctx.State["regex_matched"].([]string)[1]
num := ctx.State["regex_matched"].([]string)[2]
n := 0
@@ -147,7 +147,7 @@ func init() { // 插件主体
ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("设置成功"))
})
ent.OnRegex(`^设置默认语音模式\s*([\S\D]*)\s*(\d*)$`, zero.SuperUserPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
ent.OnRegex(`^设置默认语音模式\s*([\S\D]*)\s+(\d*)$`, zero.SuperUserPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
param := ctx.State["regex_matched"].([]string)[1]
num := ctx.State["regex_matched"].([]string)[2]
n := 0

View File

@@ -70,7 +70,7 @@ func init() {
if err := ctx.State["manager"].(*ctrl.Control[*zero.Ctx]).Manager.DoBlock(uid); err == nil {
t := time.Now().Unix()
cache.Set(uid, struct{}{})
ctx.SetGroupBan(gid, uid, int64(bandur.Minutes()))
ctx.SetThisGroupBan(uid, int64(bandur.Minutes()))
ctx.SendChain(message.Text("检测到违禁词, 已封禁/屏蔽", bandur))
db.Lock()
defer db.Unlock()

View File

@@ -13,7 +13,9 @@ import (
)
const (
api = "https://api.a20safe.com/api.php?api=21&key=7d06a110e9e20a684e02934549db1d3d&text=%s" // api地址
duURL = "https://api.a20safe.com/api.php?api=21&key=%s&text=%s" // api地址
wikiURL = "https://api.a20safe.com/api.php?api=23&key=%s&text=%s"
key = "7d06a110e9e20a684e02934549db1d3d"
)
type result struct {
@@ -27,11 +29,18 @@ type result struct {
func init() { // 主函数
en := control.Register("baidu", &ctrl.Options[*zero.Ctx]{
DisableOnDefault: false,
Help: "百度百科\n" +
"- 百度/百科[关键字]",
Help: "百科\n" +
"- 百度/百科/维基/wiki[关键字]",
})
en.OnRegex(`^百[度科]\s*(.+)$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
es, err := web.GetData(fmt.Sprintf(api, ctx.State["regex_matched"].([]string)[1])) // 将网站返回结果赋值
en.OnRegex(`^(百度|维基|百科|wiki)\s*(.+)$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
var es []byte
var err error
switch ctx.State["regex_matched"].([]string)[1] {
case "百度", "百科":
es, err = web.GetData(fmt.Sprintf(duURL, key, ctx.State["regex_matched"].([]string)[2])) // 将网站返回结果赋值
case "wiki", "维基":
es, err = web.GetData(fmt.Sprintf(wikiURL, key, ctx.State["regex_matched"].([]string)[2])) // 将网站返回结果赋值
}
if err != nil {
ctx.SendChain(message.Text("出现错误捏:", err))
return

View File

@@ -68,7 +68,7 @@ func (bdres *baiduRes) audit(ctx *zero.Ctx, configpath string) {
bantime = group.BANTime * 60
}
// 执行禁言
ctx.SetGroupBan(ctx.Event.GroupID, ctx.Event.UserID, bantime)
ctx.SetThisGroupBan(ctx.Event.UserID, bantime)
}
// 查看是否开启撤回提示
if group.DMRemind {

View File

@@ -27,7 +27,7 @@ func init() {
db.DBPath = engine.DataFolder() + "bookreview.db"
// os.RemoveAll(dbpath)
_, _ = engine.GetLazyData("bookreview.db", true)
err := db.Open(time.Hour * 24)
err := db.Open(time.Hour)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return false

View File

@@ -26,7 +26,7 @@ func init() {
db.DBPath = en.DataFolder() + "cxh.db"
// os.RemoveAll(dbpath)
_, _ = en.GetLazyData("cxh.db", true)
err := db.Open(time.Hour * 24)
err := db.Open(time.Hour)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return false

View File

@@ -27,7 +27,7 @@ func init() {
db.DBPath = engine.DataFolder() + "cp.db"
// os.RemoveAll(dbpath)
_, _ = engine.GetLazyData("cp.db", true)
err := db.Open(time.Hour * 24)
err := db.Open(time.Hour)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return false

View File

@@ -35,7 +35,7 @@ func init() {
ctx.SendChain(message.Text("ERROR: ", err))
return false
}
err = db.Open(time.Hour * 24)
err = db.Open(time.Hour)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return false

View File

@@ -27,7 +27,7 @@ func LoadText(dbfile string) error {
if err != nil {
return err
}
err = db.Open(time.Hour * 24)
err = db.Open(time.Hour)
if err != nil {
return err
}

View File

@@ -41,11 +41,11 @@ func init() {
if _, err := en.GetLazyData("dishes.db", true); err != nil {
logrus.Warnln("[dish]获取菜谱数据库文件失败")
} else if err = db.Open(time.Hour * 24); err != nil {
} else if err = db.Open(time.Hour); err != nil {
logrus.Warnln("[dish]连接菜谱数据库失败")
} else if err = db.Create("dishes", &dish{}); err != nil {
} else if err = db.Create("dish", &dish{}); err != nil {
logrus.Warnln("[dish]同步菜谱数据表失败")
} else if count, err := db.Count("dishes"); err != nil {
} else if count, err := db.Count("dish"); err != nil {
logrus.Warnln("[dish]统计菜谱数据失败")
} else {
logrus.Infoln("[dish]加载", count, "条菜谱")
@@ -77,7 +77,7 @@ func init() {
}
var d dish
if err := db.Find("dishes", &d, fmt.Sprintf("WHERE name like %%%s%%", dishName)); err != nil {
if err := db.Find("dish", &d, fmt.Sprintf("WHERE name like %%%s%%", dishName)); err != nil {
return
}
@@ -98,7 +98,7 @@ func init() {
name := ctx.NickName()
var d dish
if err := db.Pick("dishes", &d); err != nil {
if err := db.Pick("dish", &d); err != nil {
ctx.SendChain(message.Text("小店好像出错了,暂时端不出菜来惹"))
logrus.Warnln("[dish]随机菜谱请求出错:" + err.Error())
return

View File

@@ -53,7 +53,8 @@ var (
func init() {
en.OnFullMatchGroup([]string{"抽签列表", "刷新抽签列表"}).SetBlock(true).Handle(func(ctx *zero.Ctx) {
lotsList, err := getList() // 刷新列表
var err error
lotsList, err = getList() // 刷新列表
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return

View File

@@ -40,7 +40,7 @@ func init() {
PrivateDataFolder: "driftbottle",
})
seaSide.DBPath = en.DataFolder() + "sea.db"
err := seaSide.Open(time.Hour * 24)
err := seaSide.Open(time.Hour)
if err != nil {
panic(err)
}

View File

@@ -39,8 +39,8 @@ func init() {
userid := ctx.Event.UserID
username := ctx.CardOrNickName(userid)
data := (storage)(c.GetData(-su))
groupname := ctx.GetThisGroupInfo(true).Name
groupid := ctx.Event.GroupID
groupname := ctx.GetGroupInfo(groupid, true).Name
logrus.Info("[event]收到来自[", username, "](", userid, ")的群聊邀请,群:[", groupname, "](", groupid, ")")
if data.isinviteon() || (!data.ismasteroff() && zero.SuperUserPermission(ctx)) {
ctx.SetGroupAddRequest(ctx.Event.Flag, "invite", true, "")

View File

@@ -38,7 +38,7 @@ func init() {
ctx.SendChain(message.Text("ERROR: ", err))
return false
}
err = db.Open(time.Hour * 24)
err = db.Open(time.Hour)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return false

View File

@@ -19,7 +19,7 @@ func mo(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "摸.gif"
// name := cc.usrdir + "摸.gif"
c := dlrange("mo", 5, &wg, func(e error) {
m.Lock()
errwg = e
@@ -44,7 +44,8 @@ func mo(cc *context, value ...string) (string, error) {
imgs[3].InsertBottom(tou, 85, 75, 27, 37).Image(),
imgs[4].InsertBottom(tou, 90, 70, 22, 42).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(1, mo))
g := imgfactory.MergeGif(1, mo)
return imgfactory.GIF2Base64(g)
}
// cuo 搓
@@ -53,7 +54,7 @@ func cuo(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "搓.gif"
// name := cc.usrdir + "搓.gif"
c := dlrange("cuo", 5, &wg, func(e error) {
m.Lock()
errwg = e
@@ -82,7 +83,8 @@ func cuo(cc *context, value ...string) (string, error) {
imgs[3].InsertBottomC(m3.Image(), 0, 0, 75, 130).Image(),
imgs[4].InsertBottomC(m4.Image(), 0, 0, 75, 130).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(5, cuo))
g := imgfactory.MergeGif(5, cuo)
return imgfactory.GIF2Base64(g)
}
// qiao 敲
@@ -91,7 +93,7 @@ func qiao(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "敲.gif"
// name := cc.usrdir + "敲.gif"
c := dlrange("qiao", 2, &wg, func(e error) {
m.Lock()
errwg = e
@@ -113,7 +115,8 @@ func qiao(cc *context, value ...string) (string, error) {
imgs[0].InsertUp(tou, 40, 33, 57, 52).Image(),
imgs[1].InsertUp(tou, 38, 36, 58, 50).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(1, qiao))
g := imgfactory.MergeGif(1, qiao)
return imgfactory.GIF2Base64(g)
}
// chi 吃
@@ -122,7 +125,7 @@ func chi(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "吃.gif"
// name := cc.usrdir + "吃.gif"
c := dlrange("chi", 3, &wg, func(e error) {
m.Lock()
errwg = e
@@ -145,7 +148,8 @@ func chi(cc *context, value ...string) (string, error) {
imgs[1].InsertBottom(tou, 0, 0, 1, 38).Image(),
imgs[2].InsertBottom(tou, 0, 0, 1, 38).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(1, chi))
g := imgfactory.MergeGif(1, chi)
return imgfactory.GIF2Base64(g)
}
// ceng 蹭
@@ -154,7 +158,7 @@ func ceng(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "蹭.gif"
// name := cc.usrdir + "蹭.gif"
c := dlrange("ceng", 6, &wg, func(e error) {
m.Lock()
errwg = e
@@ -184,7 +188,8 @@ func ceng(cc *context, value ...string) (string, error) {
imgs[4].InsertUp(tou, 75, 77, 56, 110).InsertUp(imgfactory.Rotate(tou2, -66, 132, 80).Image(), 0, 0, 78, 40).Image(),
imgs[5].InsertUp(tou, 75, 77, 62, 102).InsertUp(tou2, 71, 100, 110, 94).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(8, ceng))
g := imgfactory.MergeGif(8, ceng)
return imgfactory.GIF2Base64(g)
}
// ken 啃
@@ -193,7 +198,7 @@ func ken(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "啃.gif"
// name := cc.usrdir + "啃.gif"
c := dlrange("ken", 16, &wg, func(e error) {
m.Lock()
errwg = e
@@ -229,7 +234,8 @@ func ken(cc *context, value ...string) (string, error) {
imgs[14].Image(),
imgs[15].Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, ken))
g := imgfactory.MergeGif(7, ken)
return imgfactory.GIF2Base64(g)
}
// pai 拍
@@ -238,7 +244,7 @@ func pai(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "拍.gif"
// name := cc.usrdir + "拍.gif"
c := dlrange("pai", 2, &wg, func(e error) {
m.Lock()
errwg = e
@@ -260,7 +266,8 @@ func pai(cc *context, value ...string) (string, error) {
imgs[0].InsertUp(tou, 0, 0, 1, 47).Image(),
imgs[1].InsertUp(tou, 0, 0, 1, 67).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(1, pai))
g := imgfactory.MergeGif(1, pai)
return imgfactory.GIF2Base64(g)
}
// xqe 冲
@@ -269,7 +276,7 @@ func xqe(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "冲.gif"
// name := cc.usrdir + "冲.gif"
c := dlrange("xqe", 2, &wg, func(e error) {
m.Lock()
errwg = e
@@ -291,7 +298,8 @@ func xqe(cc *context, value ...string) (string, error) {
imgs[0].InsertUp(tou, 30, 30, 15, 53).Image(),
imgs[1].InsertUp(tou, 30, 30, 40, 53).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(1, chong))
g := imgfactory.MergeGif(1, chong)
return imgfactory.GIF2Base64(g)
}
// diu 丢
@@ -300,7 +308,7 @@ func diu(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "丢.gif"
// name := cc.usrdir + "丢.gif"
c := dlrange("diu", 8, &wg, func(e error) {
m.Lock()
errwg = e
@@ -328,7 +336,8 @@ func diu(cc *context, value ...string) (string, error) {
imgs[6].InsertUp(tou, 35, 35, 259, 31).Image(),
imgs[7].InsertUp(tou, 175, 175, -50, 220).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, diu))
g := imgfactory.MergeGif(7, diu)
return imgfactory.GIF2Base64(g)
}
// kiss 亲
@@ -338,7 +347,7 @@ func kiss(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 13
name := cc.usrdir + "Kiss.gif"
// name := cc.usrdir + "Kiss.gif"
c := dlrange("kiss", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -367,7 +376,8 @@ func kiss(cc *context, value ...string) (string, error) {
kiss[i] = imgs[i].InsertUp(tou, 50, 50, userLocs[i][0], userLocs[i][1]).
InsertUp(tou2, 40, 40, selfLocs[i][0], selfLocs[i][1]).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, kiss))
g := imgfactory.MergeGif(7, kiss)
return imgfactory.GIF2Base64(g)
}
// garbage 垃圾 垃圾桶
@@ -377,7 +387,7 @@ func garbage(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 25
name := cc.usrdir + "Garbage.gif"
// name := cc.usrdir + "Garbage.gif"
c := dlrange("garbage", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -400,7 +410,8 @@ func garbage(cc *context, value ...string) (string, error) {
for i := 0; i < piclen; i++ {
garbage[i] = imgs[i].InsertBottom(im.Image(), 0, 0, locs[i][0], locs[i][1]).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, garbage))
g := imgfactory.MergeGif(7, garbage)
return imgfactory.GIF2Base64(g)
}
// thump 捶
@@ -410,7 +421,7 @@ func thump(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 4
name := cc.usrdir + "Thump.gif"
// name := cc.usrdir + "Thump.gif"
c := dlrange("thump", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -433,7 +444,8 @@ func thump(cc *context, value ...string) (string, error) {
for i := 0; i < piclen; i++ {
thump[i] = imgs[i].InsertBottom(im.Image(), locs[i][2], locs[i][3], locs[i][0], locs[i][1]).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, thump))
g := imgfactory.MergeGif(7, thump)
return imgfactory.GIF2Base64(g)
}
// jiujiu 啾啾
@@ -443,7 +455,7 @@ func jiujiu(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 8
name := cc.usrdir + "Jiujiu.gif"
// name := cc.usrdir + "Jiujiu.gif"
c := dlrange("jiujiu", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -465,7 +477,8 @@ func jiujiu(cc *context, value ...string) (string, error) {
for i := 0; i < piclen; i++ {
jiujiu[i] = imgs[i].InsertBottom(im.Image(), 0, 0, 0, 0).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, jiujiu))
g := imgfactory.MergeGif(7, jiujiu)
return imgfactory.GIF2Base64(g)
}
// knock 2敲
@@ -475,7 +488,7 @@ func knock(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 8
name := cc.usrdir + "Knock.gif"
// name := cc.usrdir + "Knock.gif"
c := dlrange("knock", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -498,7 +511,8 @@ func knock(cc *context, value ...string) (string, error) {
for i := 0; i < piclen; i++ {
knock[i] = imgs[i].InsertBottom(im.Image(), locs[i][2], locs[i][3], locs[i][0], locs[i][1]).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, knock))
g := imgfactory.MergeGif(7, knock)
return imgfactory.GIF2Base64(g)
}
// 听音乐 listenMusic
@@ -508,7 +522,7 @@ func listenMusic(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 1
name := cc.usrdir + "ListenMusic.gif"
// name := cc.usrdir + "ListenMusic.gif"
c := dlrange("listen_music", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -530,7 +544,8 @@ func listenMusic(cc *context, value ...string) (string, error) {
for i := 0; i < 36; i++ {
listenmusic[i] = imgs[0].InsertBottomC(imgfactory.Rotate(face, float64(-i*10), 215, 215).Image(), 0, 0, 207, 207).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, listenmusic))
g := imgfactory.MergeGif(7, listenmusic)
return imgfactory.GIF2Base64(g)
}
// loveYou 永远爱你
@@ -540,7 +555,7 @@ func loveYou(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 2
name := cc.usrdir + "LoveYou.gif"
// name := cc.usrdir + "LoveYou.gif"
c := dlrange("love_you", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -563,7 +578,8 @@ func loveYou(cc *context, value ...string) (string, error) {
for i := 0; i < piclen; i++ {
loveyou[i] = imgs[i].InsertBottom(im.Image(), locs[i][2], locs[i][3], locs[i][0], locs[i][1]).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, loveyou))
g := imgfactory.MergeGif(7, loveyou)
return imgfactory.GIF2Base64(g)
}
// pat 2拍
@@ -573,7 +589,7 @@ func pat(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 10
name := cc.usrdir + "Pat.gif"
// name := cc.usrdir + "Pat.gif"
c := dlrange("pat", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -605,7 +621,8 @@ func pat(cc *context, value ...string) (string, error) {
for i := 0; i < len(pat); i++ {
pat[i] = p[seq[i]]
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, pat))
g := imgfactory.MergeGif(7, pat)
return imgfactory.GIF2Base64(g)
}
// jackUp 顶
@@ -615,7 +632,7 @@ func jackUp(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 23
name := cc.usrdir + "JackUp.gif"
// name := cc.usrdir + "JackUp.gif"
c := dlrange("play", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -648,7 +665,8 @@ func jackUp(cc *context, value ...string) (string, error) {
play = append(play, p[0:8]...)
play = append(play, p[12:18]...)
play = append(play, p[18:23]...)
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, play))
g := imgfactory.MergeGif(7, play)
return imgfactory.GIF2Base64(g)
}
// pound 捣
@@ -658,7 +676,7 @@ func pound(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 8
name := cc.usrdir + "Pound.gif"
// name := cc.usrdir + "Pound.gif"
c := dlrange("pound", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -681,7 +699,8 @@ func pound(cc *context, value ...string) (string, error) {
for i := 0; i < piclen; i++ {
pound[i] = imgs[i].InsertBottom(im.Image(), locs[i][2], locs[i][3], locs[i][0], locs[i][1]).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, pound))
g := imgfactory.MergeGif(7, pound)
return imgfactory.GIF2Base64(g)
}
// punch 打拳
@@ -691,7 +710,7 @@ func punch(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 13
name := cc.usrdir + "Punch.gif"
// name := cc.usrdir + "Punch.gif"
c := dlrange("punch", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -714,7 +733,8 @@ func punch(cc *context, value ...string) (string, error) {
for i := 0; i < piclen; i++ {
punch[i] = imgs[i].InsertBottom(im.Image(), 0, 0, locs[i][0], locs[i][1]-15).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, punch))
g := imgfactory.MergeGif(7, punch)
return imgfactory.GIF2Base64(g)
}
// roll 滚
@@ -724,7 +744,7 @@ func roll(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 8
name := cc.usrdir + "roll.gif"
// name := cc.usrdir + "roll.gif"
c := dlrange("roll", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -747,7 +767,8 @@ func roll(cc *context, value ...string) (string, error) {
for i := 0; i < piclen; i++ {
roll[i] = imgs[i].InsertBottomC(imgfactory.Rotate(im.Image(), float64(locs[i][2]), 0, 0).Image(), 0, 0, locs[i][0]+105, locs[i][1]+105).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, roll))
g := imgfactory.MergeGif(7, roll)
return imgfactory.GIF2Base64(g)
}
// suck 吸 嗦
@@ -757,7 +778,7 @@ func suck(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 12
name := cc.usrdir + "Suck.gif"
// name := cc.usrdir + "Suck.gif"
c := dlrange("suck", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -780,7 +801,8 @@ func suck(cc *context, value ...string) (string, error) {
for i := 0; i < piclen; i++ {
suck[i] = imgs[i].InsertBottom(im.Image(), locs[i][2], locs[i][3], locs[i][0], locs[i][1]).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, suck))
g := imgfactory.MergeGif(7, suck)
return imgfactory.GIF2Base64(g)
}
// hammer 锤
@@ -790,7 +812,7 @@ func hammer(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 7
name := cc.usrdir + "Hammer.gif"
// name := cc.usrdir + "Hammer.gif"
c := dlrange("hammer", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -813,7 +835,8 @@ func hammer(cc *context, value ...string) (string, error) {
for i := 0; i < piclen; i++ {
hammer[i] = imgs[i].InsertBottom(im.Image(), locs[i][2], locs[i][3], locs[i][0], locs[i][1]).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, hammer))
g := imgfactory.MergeGif(7, hammer)
return imgfactory.GIF2Base64(g)
}
// tightly 紧贴 紧紧贴着
@@ -823,7 +846,7 @@ func tightly(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 20
name := cc.usrdir + "Tightly.gif"
// name := cc.usrdir + "Tightly.gif"
c := dlrange("tightly", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -846,13 +869,14 @@ func tightly(cc *context, value ...string) (string, error) {
for i := 0; i < piclen; i++ {
tightly[i] = imgs[i].InsertBottom(im.Image(), locs[i][2], locs[i][3], locs[i][0], locs[i][1]).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, tightly))
g := imgfactory.MergeGif(7, tightly)
return imgfactory.GIF2Base64(g)
}
// turn 转
func turn(cc *context, value ...string) (string, error) {
_ = value
name := cc.usrdir + "Turn.gif"
// name := cc.usrdir + "Turn.gif"
face, err := cc.getLogo(0, 0)
if err != nil {
return "", err
@@ -865,7 +889,8 @@ func turn(cc *context, value ...string) (string, error) {
for i := 0; i < 36; i++ {
turn[i] = imgfactory.Size(canvas.Image(), 0, 0).InsertUpC(imgfactory.Rotate(face, float64(10*i), 250, 250).Image(), 0, 0, 125, 125).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, turn))
g := imgfactory.MergeGif(7, turn)
return imgfactory.GIF2Base64(g)
}
// taiguan 抬棺
@@ -874,7 +899,7 @@ func taiguan(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "taiguan.gif"
// name := cc.usrdir + "taiguan.gif"
c := dlrange("taiguan", 20, &wg, func(e error) {
m.Lock()
errwg = e
@@ -914,7 +939,8 @@ func taiguan(cc *context, value ...string) (string, error) {
imgs[18].InsertUp(tou, 85, 85, 170, 65).Image(),
imgs[19].InsertUp(tou, 85, 85, 175, 65).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, taiguan))
g := imgfactory.MergeGif(7, taiguan)
return imgfactory.GIF2Base64(g)
}
// zou 揍
@@ -923,7 +949,7 @@ func zou(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "zou.gif"
// name := cc.usrdir + "zou.gif"
c := dlrange("zou", 3, &wg, func(e error) {
m.Lock()
errwg = e
@@ -950,7 +976,8 @@ func zou(cc *context, value ...string) (string, error) {
imgs[1].InsertUp(tou, 40, 40, 98, 138).InsertUp(tou2, 55, 55, 101, 45).Image(),
imgs[2].InsertUp(tou, 40, 40, 89, 140).InsertUp(tou2, 55, 55, 99, 40).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(8, zou))
g := imgfactory.MergeGif(8, zou)
return imgfactory.GIF2Base64(g)
}
// ci 吞
@@ -959,7 +986,7 @@ func ci(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "ci.gif"
// name := cc.usrdir + "ci.gif"
c := dlrange("ci", 26, &wg, func(e error) {
m.Lock()
errwg = e
@@ -1005,7 +1032,8 @@ func ci(cc *context, value ...string) (string, error) {
imgs[24].Image(),
imgs[25].Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, ci))
g := imgfactory.MergeGif(7, ci)
return imgfactory.GIF2Base64(g)
}
// worship 膜拜
@@ -1014,7 +1042,7 @@ func worship(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var err error
var m sync.Mutex
name := cc.usrdir + "worship.gif"
// name := cc.usrdir + "worship.gif"
c := dlrange("worship", 9, &wg, func(e error) {
m.Lock()
err = e
@@ -1043,7 +1071,8 @@ func worship(cc *context, value ...string) (string, error) {
imgs[7].InsertBottom(face, 140, 140, 0, 0).Image(),
imgs[8].InsertBottom(face, 140, 140, 0, 0).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, worship))
g := imgfactory.MergeGif(7, worship)
return imgfactory.GIF2Base64(g)
}
// 2ceng 2蹭
@@ -1052,7 +1081,7 @@ func ceng2(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "ceng2.gif"
// name := cc.usrdir + "ceng2.gif"
c := dlrange("ceng2", 4, &wg, func(e error) {
m.Lock()
errwg = e
@@ -1076,7 +1105,8 @@ func ceng2(cc *context, value ...string) (string, error) {
imgs[2].InsertBottom(tou, 175, 175, 78, 263).Image(),
imgs[3].InsertBottom(tou, 175, 175, 78, 263).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, ceng2))
g := imgfactory.MergeGif(7, ceng2)
return imgfactory.GIF2Base64(g)
}
// dun 炖
@@ -1085,7 +1115,7 @@ func dun(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "dun.gif"
// name := cc.usrdir + "dun.gif"
c := dlrange("dun", 5, &wg, func(e error) {
m.Lock()
errwg = e
@@ -1110,7 +1140,8 @@ func dun(cc *context, value ...string) (string, error) {
imgs[3].InsertBottom(tou, 80, 80, 85, 45).Image(),
imgs[4].InsertBottom(tou, 80, 80, 85, 45).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, dun))
g := imgfactory.MergeGif(7, dun)
return imgfactory.GIF2Base64(g)
}
// push 滚高清重置版 过渡
@@ -1120,7 +1151,7 @@ func push(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 16
name := cc.usrdir + "push.gif"
// name := cc.usrdir + "push.gif"
c := dlrange("push", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -1142,7 +1173,8 @@ func push(cc *context, value ...string) (string, error) {
for i := 0; i < piclen; i++ {
push[i] = imgs[i].InsertUpC(imgfactory.Rotate(tou, float64(-22*i), 280, 280).Image(), 0, 0, 523, 291).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, push))
g := imgfactory.MergeGif(7, push)
return imgfactory.GIF2Base64(g)
}
// peng 砰
@@ -1151,7 +1183,7 @@ func peng(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "peng.gif"
// name := cc.usrdir + "peng.gif"
c := dlrange("peng", 25, &wg, func(e error) {
m.Lock()
errwg = e
@@ -1200,7 +1232,8 @@ func peng(cc *context, value ...string) (string, error) {
imgs[23].InsertUp(m4.Image(), 0, 0, 89, 159).Image(),
imgs[24].InsertUp(m4.Image(), 0, 0, 86, 160).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(8, peng))
g := imgfactory.MergeGif(8, peng)
return imgfactory.GIF2Base64(g)
}
// klee 可莉吃
@@ -1210,7 +1243,7 @@ func klee(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 31
name := cc.usrdir + "klee.gif"
// name := cc.usrdir + "klee.gif"
c := dlrange("klee", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -1233,7 +1266,8 @@ func klee(cc *context, value ...string) (string, error) {
for i := 0; i < piclen; i++ {
klee[i] = imgs[i].InsertBottom(im.Image(), 0, 0, locs[i][0], locs[i][1]).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, klee))
g := imgfactory.MergeGif(7, klee)
return imgfactory.GIF2Base64(g)
}
// hutaoken 胡桃啃
@@ -1242,7 +1276,7 @@ func hutaoken(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "hutaoken.gif"
// name := cc.usrdir + "hutaoken.gif"
c := dlrange("hutaoken", 2, &wg, func(e error) {
m.Lock()
errwg = e
@@ -1264,7 +1298,8 @@ func hutaoken(cc *context, value ...string) (string, error) {
imgs[0].InsertBottom(tou, 98, 101, 108, 234).Image(),
imgs[1].InsertBottom(tou, 96, 100, 108, 237).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(8, hutaoken))
g := imgfactory.MergeGif(8, hutaoken)
return imgfactory.GIF2Base64(g)
}
// lick 2舔
@@ -1273,7 +1308,7 @@ func lick(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "lick.gif"
// name := cc.usrdir + "lick.gif"
c := dlrange("lick", 2, &wg, func(e error) {
m.Lock()
errwg = e
@@ -1295,7 +1330,8 @@ func lick(cc *context, value ...string) (string, error) {
imgs[0].InsertUp(tou, 44, 44, 10, 138).Image(),
imgs[1].InsertUp(tou, 44, 44, 10, 138).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(8, lick))
g := imgfactory.MergeGif(8, lick)
return imgfactory.GIF2Base64(g)
}
// tiqiu 踢球
@@ -1305,7 +1341,7 @@ func tiqiu(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 15
name := cc.usrdir + "tiqiu.gif"
// name := cc.usrdir + "tiqiu.gif"
c := dlrange("tiqiu", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -1328,7 +1364,8 @@ func tiqiu(cc *context, value ...string) (string, error) {
for i := 0; i < piclen; i++ {
tiqiu[i] = imgs[i].InsertUpC(imgfactory.Rotate(tou, float64(-24*i), 0, 0).Image(), 0, 0, locs[i][0]+38, locs[i][1]+38).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, tiqiu))
g := imgfactory.MergeGif(7, tiqiu)
return imgfactory.GIF2Base64(g)
}
// cai 踩
@@ -1337,7 +1374,7 @@ func cai(cc *context, value ...string) (string, error) {
var wg sync.WaitGroup
var errwg error
var m sync.Mutex
name := cc.usrdir + "cai.gif"
// name := cc.usrdir + "cai.gif"
c := dlrange("cai", 5, &wg, func(e error) {
m.Lock()
errwg = e
@@ -1363,7 +1400,8 @@ func cai(cc *context, value ...string) (string, error) {
imgs[3].InsertBottom(tou, 85, 76, 52, 203).Image(),
imgs[4].InsertBottom(tou, 88, 82, 49, 198).Image(),
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, cai))
g := imgfactory.MergeGif(7, cai)
return imgfactory.GIF2Base64(g)
}
// whir 2转
@@ -1373,7 +1411,7 @@ func whirl(cc *context, value ...string) (string, error) {
var err error
var m sync.Mutex
piclen := 15
name := cc.usrdir + "whirl.gif"
// name := cc.usrdir + "whirl.gif"
c := dlrange("whirl", piclen, &wg, func(e error) {
m.Lock()
err = e
@@ -1395,7 +1433,8 @@ func whirl(cc *context, value ...string) (string, error) {
for i := 0; i < piclen; i++ {
whirl[i] = imgs[i].InsertUpC(imgfactory.Rotate(tou, float64(-24*i), 145, 145).Image(), 0, 0, 115, 89).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(7, whirl))
g := imgfactory.MergeGif(7, whirl)
return imgfactory.GIF2Base64(g)
}
// always 一直
@@ -1403,7 +1442,7 @@ func alwaysDoGif(cc *context, value ...string) (string, error) {
_ = value
var err error
var face []*imgfactory.Factory
name := cc.usrdir + "AlwaysDo.gif"
// name := cc.usrdir + "AlwaysDo.gif"
face, err = imgfactory.LoadAllTrueFrames(cc.headimgsdir[0], 500, 500)
if err != nil {
// 载入失败尝试载入第一帧
@@ -1444,5 +1483,6 @@ func alwaysDoGif(cc *context, value ...string) (string, error) {
canvas.DrawString("吗", 370, 560)
turn[i] = imgfactory.Size(canvas.Image(), 0, 0).Image()
}
return "file:///" + name, imgfactory.SaveGIF2Path(name, imgfactory.MergeGif(8, turn))
g := imgfactory.MergeGif(8, turn)
return imgfactory.GIF2Base64(g)
}

View File

@@ -527,7 +527,7 @@ func getlist(pathOfMusic string) (list []listinfo, err error) {
// 遍历群文件
func getFileURLbyFileName(ctx *zero.Ctx, fileName string) (fileSearchName, fileURL string) {
filesOfGroup := ctx.GetThisGroupRootFiles(ctx.Event.GroupID)
filesOfGroup := ctx.GetThisGroupRootFiles()
files := filesOfGroup.Get("files").Array()
folders := filesOfGroup.Get("folders").Array()
// 遍历当前目录的文件名

View File

@@ -33,7 +33,7 @@ func init() {
getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
db.DBPath = engine.DataFolder() + "pics.db"
_, _ = engine.GetLazyData("pics.db", false)
err := db.Open(time.Hour * 24)
err := db.Open(time.Hour)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return false

View File

@@ -32,7 +32,7 @@ func init() { // 插件主体
ctx.SendChain(message.Text("ERROR: ", err))
return false
}
err = db.Open(time.Hour * 24)
err = db.Open(time.Hour)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return false

View File

@@ -73,7 +73,7 @@ func init() { // 插件主体
go func() {
db.DBPath = engine.DataFolder() + "config.db"
err := db.Open(time.Hour * 24)
err := db.Open(time.Hour)
if err != nil {
panic(err)
}
@@ -95,13 +95,11 @@ func init() { // 插件主体
// 升为管理
engine.OnRegex(`^升为管理.*?(\d+)`, zero.OnlyGroup, zero.SuperUserPermission).SetBlock(true).
Handle(func(ctx *zero.Ctx) {
ctx.SetGroupAdmin(
ctx.Event.GroupID,
ctx.SetThisGroupAdmin(
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被升为管理的人的qq
true,
)
nickname := ctx.GetGroupMemberInfo( // 被升为管理的人的昵称
ctx.Event.GroupID,
nickname := ctx.GetThisGroupMemberInfo( // 被升为管理的人的昵称
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被升为管理的人的qq
false,
).Get("nickname").Str
@@ -110,13 +108,11 @@ func init() { // 插件主体
// 取消管理
engine.OnRegex(`^取消管理.*?(\d+)`, zero.OnlyGroup, zero.SuperUserPermission).SetBlock(true).
Handle(func(ctx *zero.Ctx) {
ctx.SetGroupAdmin(
ctx.Event.GroupID,
ctx.SetThisGroupAdmin(
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被取消管理的人的qq
false,
)
nickname := ctx.GetGroupMemberInfo( // 被取消管理的人的昵称
ctx.Event.GroupID,
nickname := ctx.GetThisGroupMemberInfo( // 被取消管理的人的昵称
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被取消管理的人的qq
false,
).Get("nickname").Str
@@ -125,13 +121,11 @@ func init() { // 插件主体
// 踢出群聊
engine.OnRegex(`^踢出群聊.*?(\d+)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
Handle(func(ctx *zero.Ctx) {
ctx.SetGroupKick(
ctx.Event.GroupID,
ctx.SetThisGroupKick(
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被踢出群聊的人的qq
false,
)
nickname := ctx.GetGroupMemberInfo( // 被踢出群聊的人的昵称
ctx.Event.GroupID,
nickname := ctx.GetThisGroupMemberInfo( // 被踢出群聊的人的昵称
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被踢出群聊的人的qq
false,
).Get("nickname").Str
@@ -148,19 +142,13 @@ func init() { // 插件主体
// 开启全体禁言
engine.OnRegex(`^开启全员禁言$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
Handle(func(ctx *zero.Ctx) {
ctx.SetGroupWholeBan(
ctx.Event.GroupID,
true,
)
ctx.SetThisGroupWholeBan(true)
ctx.SendChain(message.Text("全员自闭开始~"))
})
// 解除全员禁言
engine.OnRegex(`^解除全员禁言$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
Handle(func(ctx *zero.Ctx) {
ctx.SetGroupWholeBan(
ctx.Event.GroupID,
false,
)
ctx.SetThisGroupWholeBan(false)
ctx.SendChain(message.Text("全员自闭结束~"))
})
// 禁言
@@ -180,8 +168,7 @@ func init() { // 插件主体
if duration >= 43200 {
duration = 43199 // qq禁言最大时长为一个月
}
ctx.SetGroupBan(
ctx.Event.GroupID,
ctx.SetThisGroupBan(
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 要禁言的人的qq
duration*60, // 要禁言的时间(分钟)
)
@@ -190,8 +177,7 @@ func init() { // 插件主体
// 解除禁言
engine.OnRegex(`^解除禁言.*?(\d+)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
Handle(func(ctx *zero.Ctx) {
ctx.SetGroupBan(
ctx.Event.GroupID,
ctx.SetThisGroupBan(
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 要解除禁言的人的qq
0,
)
@@ -214,8 +200,7 @@ func init() { // 插件主体
if duration >= 43200 {
duration = 43199 // qq禁言最大时长为一个月
}
ctx.SetGroupBan(
ctx.Event.GroupID,
ctx.SetThisGroupBan(
ctx.Event.UserID,
duration*60, // 要自闭的时间(分钟)
)
@@ -228,8 +213,7 @@ func init() { // 插件主体
ctx.SendChain(message.Text("名字太长啦!"))
return
}
ctx.SetGroupCard(
ctx.Event.GroupID,
ctx.SetThisGroupCard(
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被修改群名片的人
ctx.State["regex_matched"].([]string)[2], // 修改成的群名片
)
@@ -246,8 +230,7 @@ func init() { // 插件主体
ctx.SendChain(message.Text("头衔太长啦!"))
return
}
ctx.SetGroupSpecialTitle(
ctx.Event.GroupID,
ctx.SetThisGroupSpecialTitle(
math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被修改群头衔的人
sptitle, // 修改成的群头衔
)
@@ -264,8 +247,7 @@ func init() { // 插件主体
ctx.SendChain(message.Text("头衔太长啦!"))
return
}
ctx.SetGroupSpecialTitle(
ctx.Event.GroupID,
ctx.SetThisGroupSpecialTitle(
ctx.Event.UserID, // 被修改群头衔的人
sptitle, // 修改成的群头衔
)
@@ -445,7 +427,7 @@ func init() { // 插件主体
case <-time.After(time.Minute):
cancel()
ctx.SendChain(message.Text("拜拜啦~"))
ctx.SetGroupKick(ctx.Event.GroupID, uid, false)
ctx.SetThisGroupKick(uid, false)
case <-recv:
cancel()
ctx.SendChain(message.Text("答对啦~"))
@@ -594,7 +576,7 @@ func init() { // 插件主体
if ok {
ctx.SetGroupAddRequest(ctx.Event.Flag, "add", true, "")
process.SleepAbout1sTo2s()
ctx.SetGroupCard(ctx.Event.GroupID, ctx.Event.UserID, ghun)
ctx.SetThisGroupCard(ctx.Event.UserID, ghun)
} else {
ctx.SetGroupAddRequest(ctx.Event.Flag, "add", false, reason)
}
@@ -618,7 +600,7 @@ func init() { // 插件主体
}
})
engine.OnCommand("精华列表", zero.OnlyGroup, zero.AdminPermission).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
list := ctx.GetGroupEssenceMessageList(ctx.Event.GroupID).Array()
list := ctx.GetThisGroupEssenceMessageList().Array()
msg := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Text("本群精华列表:"))}
n := len(list)
if n > 30 {
@@ -675,7 +657,7 @@ func welcometocq(ctx *zero.Ctx, welcome string) string {
at := "[CQ:at,qq=" + uid + "]" // at用户
avatar := "[CQ:image,file=" + "http://q4.qlogo.cn/g?b=qq&nk=" + uid + "&s=640]" // 用户头像
gid := strconv.FormatInt(ctx.Event.GroupID, 10) // 群id
groupname := ctx.GetGroupInfo(ctx.Event.GroupID, true).Name // 群名
groupname := ctx.GetThisGroupInfo(true).Name // 群名
cqstring := strings.ReplaceAll(welcome, "{at}", at)
cqstring = strings.ReplaceAll(cqstring, "{nickname}", nickname)
cqstring = strings.ReplaceAll(cqstring, "{avatar}", avatar)

View File

@@ -47,7 +47,7 @@ func (n *nsetu) scanall(path string) error {
root := os.DirFS(path)
_ = n.db.Close()
_ = os.Remove(n.db.DBPath)
err := n.db.Open(time.Hour * 24)
err := n.db.Open(time.Hour)
if err != nil {
return err
}

View File

@@ -43,7 +43,7 @@ func init() {
logrus.Infoln("[nsetu] set setu dir to", setupath)
}
}
err := ns.db.Open(time.Hour * 24)
err := ns.db.Open(time.Hour)
if err != nil {
panic(err)
}

View File

@@ -30,7 +30,7 @@ func init() {
ctx.SendChain(message.Text("ERROR: ", err))
return false
}
err = db.Open(time.Hour * 24)
err = db.Open(time.Hour)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return false

View File

@@ -54,7 +54,7 @@ func init() { // 插件主体
ctx.SendChain(message.Text("ERROR: ", err))
return false
}
err = db.Open(time.Hour * 24)
err = db.Open(time.Hour)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return false

View File

@@ -82,7 +82,7 @@ var (
))
getdb = fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
民政局.db.DBPath = engine.DataFolder() + "结婚登记表.db"
err := 民政局.db.Open(time.Hour * 24)
err := 民政局.db.Open(time.Hour)
if err == nil {
// 创建群配置表
err = 民政局.db.Create("updateinfo", &updateinfo{})

View File

@@ -2,7 +2,7 @@
package quan
import (
"fmt"
"encoding/json"
"strconv"
"strings"
@@ -11,13 +11,18 @@ import (
"github.com/FloatTech/zbputils/control"
zero "github.com/wdvxdr1123/ZeroBot"
"github.com/wdvxdr1123/ZeroBot/message"
"github.com/wdvxdr1123/ZeroBot/utils/helper"
)
const (
quan = "http://tc.tfkapi.top/API/qqqz.php?qq=%v" // api
quan = "http://tfapi.top/API/qqqz.php?type=json&qq=" // api
)
type result struct {
Code int `json:"code"`
Msg string `json:"msg"`
Qz string `json:"qz"`
}
func init() { // 主函数
en := control.Register("quan", &ctrl.Options[*zero.Ctx]{
DisableOnDefault: false,
@@ -31,28 +36,25 @@ func init() { // 主函数
if str == "" { // user
str = strconv.FormatInt(ctx.Event.UserID, 10)
}
es, err := web.GetData(fmt.Sprintf(quan, str)) // 将网站返回结果赋值
es, err := web.GetData(quan + str) // 将网站返回结果赋值
if err != nil {
ctx.SendChain(message.Text("出现错误捏", err))
ctx.SendChain(message.Text("出现错误捏: ", err))
return
}
if len(helper.BytesToString(es)) <= 24 {
ctx.SendChain(message.Text("网站维护中")) // 输出结果
return
}
f := helper.BytesToString(es)[24:]
_, err = strconv.Atoi(f)
var data result
err = json.Unmarshal(es, &data)
if err != nil {
ctx.SendChain(message.Text("网站维护中")) // 输出结果
ctx.SendChain(message.Text("解析json错误: ", err))
return
}
var msg strings.Builder
msg.WriteString("查询账号:")
msg.WriteString("查询账号: ")
msg.WriteString(str)
msg.WriteString("\n")
msg.WriteString("查询状态:成功\n")
msg.WriteString("您的权重为:")
msg.WriteString(f)
msg.WriteString("查询状态: ")
msg.WriteString(data.Msg)
msg.WriteString("\n您的权重为: ")
msg.WriteString(data.Qz)
ctx.SendChain(message.Text(msg.String())) // 输出结果
})
}

View File

@@ -12,7 +12,7 @@ import (
"github.com/wdvxdr1123/ZeroBot/message"
)
var ro = runoob.NewRunOOB("b6365362a90ac2ac7098ba52c13e352b")
var ro = runoob.NewRunOOB("066417defb80d038228de76ec581a50a")
func init() {
control.Register("runcode", &ctrl.Options[*zero.Ctx]{
@@ -59,7 +59,7 @@ func init() {
} else {
// 运行成功
output = cutTooLong(strings.Trim(output, "\n"))
if israw {
if israw && zero.AdminPermission(ctx) {
ctx.SendChain(message.Text(output))
} else {
ctx.SendChain(

View File

@@ -66,7 +66,7 @@ func init() { // 插件主体
// 如果数据库不存在则下载
pool.db.DBPath = engine.DataFolder() + "SetuTime.db"
_, _ = engine.GetLazyData("SetuTime.db", false)
err := pool.db.Open(time.Hour * 24)
err := pool.db.Open(time.Hour)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return false

View File

@@ -20,7 +20,7 @@ func init() {
Help: "- 今天是什么少女[@xxx]\n" +
"- 异世界转生[@xxx]\n" +
"- 卖萌[@xxx]\n" +
"- 老婆[@xxx]\n" +
"- 今日老婆[@xxx]\n" +
"- 黄油角色[@xxx]",
})
engine.OnPrefix("异世界转生", number(587874)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handlepic)

View File

@@ -17,7 +17,7 @@ var (
// 开启并检查数据库链接
getDB = fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
database.db.DBPath = engine.DataFolder() + "steam.db"
err := database.db.Open(time.Hour * 24)
err := database.db.Open(time.Hour)
if err != nil {
ctx.SendChain(message.Text("[steam] ERROR: ", err))
return false

View File

@@ -5,10 +5,17 @@ import (
"bytes"
"encoding/json"
"math/rand"
"net/http"
"os"
"strconv"
"strings"
"time"
"github.com/FloatTech/floatbox/binary"
"github.com/FloatTech/floatbox/ctxext"
"github.com/FloatTech/floatbox/file"
"github.com/FloatTech/floatbox/process"
"github.com/FloatTech/floatbox/web"
ctrl "github.com/FloatTech/zbpctrl"
"github.com/FloatTech/zbputils/control"
"github.com/fumiama/jieba"
@@ -22,10 +29,33 @@ func init() {
engine := control.Register("thesaurus", &ctrl.Options[*zero.Ctx]{
DisableOnDefault: false,
Brief: "词典匹配回复",
Help: "- 切换[kimo|傲娇|可爱]词库\n- 设置词库触发概率0.x (0<x<9)",
Help: "- 切换[kimo|傲娇|可爱|🦙]词库\n- 设置词库触发概率0.x (0<x<9)",
PublicDataFolder: "Chat",
})
engine.OnRegex(`^切换(kimo|傲娇|可爱)词库$`, zero.AdminPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
alpacafolder := engine.DataFolder() + "alpaca/"
err := os.MkdirAll(alpacafolder, 0755)
if err != nil {
panic(err)
}
alpacapifile := alpacafolder + "api.txt"
alpacapiurl := ""
if file.IsExist(alpacapifile) {
data, err := os.ReadFile(alpacapifile)
if err != nil {
panic(err)
}
alpacapiurl = binary.BytesToString(data)
}
alpacatokenfile := alpacafolder + "token.txt"
alpacatoken := ""
if file.IsExist(alpacatokenfile) {
data, err := os.ReadFile(alpacatokenfile)
if err != nil {
panic(err)
}
alpacatoken = binary.BytesToString(data)
}
engine.OnRegex(`^切换(kimo|傲娇|可爱|🦙)词库$`, zero.AdminPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
c, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
if !ok {
ctx.SendChain(message.Text("ERROR: 找不到 manager"))
@@ -44,6 +74,8 @@ func init() {
t = tDERE
case "可爱":
t = tKAWA
case "🦙":
t = tALPACA
}
err := c.SetData(gid, (d&^3)|t)
if err != nil {
@@ -76,6 +108,24 @@ func init() {
}
ctx.SendChain(message.Text("成功!"))
})
engine.OnRegex(`^设置🦙API地址\s*(http.*)\s*$`, zero.SuperUserPermission, zero.OnlyPrivate).SetBlock(true).Handle(func(ctx *zero.Ctx) {
alpacapiurl = ctx.State["regex_matched"].([]string)[1]
err := os.WriteFile(alpacapifile, binary.StringToBytes(alpacapiurl), 0644)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return
}
ctx.SendChain(message.Text("成功!"))
})
engine.OnRegex(`^设置🦙token\s*([0-9a-f]{112})\s*$`, zero.SuperUserPermission, zero.OnlyPrivate).SetBlock(true).Handle(func(ctx *zero.Ctx) {
alpacatoken = ctx.State["regex_matched"].([]string)[1]
err := os.WriteFile(alpacatokenfile, binary.StringToBytes(alpacatoken), 0644)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return
}
ctx.SendChain(message.Text("成功!"))
})
go func() {
data, err := engine.GetLazyData("dict.txt", false)
if err != nil {
@@ -128,6 +178,57 @@ func init() {
engine.OnMessage(canmatch(tKAWA), match(chatListK, seg)).
SetBlock(false).
Handle(randreply(sm.K))
engine.OnMessage(canmatch(tALPACA), func(ctx *zero.Ctx) bool {
return alpacapiurl != "" && alpacatoken != ""
}).SetBlock(false).Handle(func(ctx *zero.Ctx) {
msg := ctx.ExtractPlainText()
if msg != "" {
data, err := web.RequestDataWithHeaders(http.DefaultClient, alpacapiurl+"/reply", "POST",
func(r *http.Request) error {
r.Header.Set("Authorization", alpacatoken)
return nil
}, bytes.NewReader(binary.NewWriterF(func(writer *binary.Writer) {
_ = json.NewEncoder(writer).Encode(&[]alpacamsg{{
Name: ctx.CardOrNickName(ctx.Event.UserID),
Message: msg,
}})
})))
if err != nil {
logrus.Warnln("[chat] 🦙 err:", err)
return
}
type reply struct {
ID int
Msg string
}
m := reply{}
err = json.Unmarshal(data, &m)
if err != nil {
logrus.Warnln("[chat] 🦙 unmarshal err:", err)
return
}
for i := 0; i < 60; i++ {
time.Sleep(time.Second * 4)
data, err := web.RequestDataWithHeaders(http.DefaultClient, alpacapiurl+"/get?id="+strconv.Itoa(m.ID), "GET",
func(r *http.Request) error {
r.Header.Set("Authorization", alpacatoken)
return nil
}, nil)
if err != nil {
continue
}
err = json.Unmarshal(data, &m)
if err != nil {
logrus.Warnln("[chat] 🦙 unmarshal err:", err)
return
}
if len(m.Msg) > 0 {
ctx.Send(message.Text(m.Msg))
}
return
}
}
})
}()
}
@@ -138,10 +239,16 @@ type simai struct {
K map[string][]string `yaml:"可爱"`
}
type alpacamsg struct {
Name string
Message string
}
const (
tKIMO = iota
tDERE
tKAWA
tALPACA
)
func match(l []string, seg *jieba.Segmenter) zero.Rule {

View File

@@ -37,7 +37,7 @@ func init() {
ctx.SendChain(message.Text("ERROR: ", err))
return false
}
err = db.Open(time.Hour * 24)
err = db.Open(time.Hour)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return false

View File

@@ -0,0 +1,203 @@
// Package wantquotes 据意查句
package wantquotes
import (
"encoding/json"
"fmt"
"net/url"
"strconv"
"strings"
"time"
"github.com/FloatTech/floatbox/binary"
"github.com/FloatTech/floatbox/web"
ctrl "github.com/FloatTech/zbpctrl"
"github.com/FloatTech/zbputils/control"
"github.com/FloatTech/zbputils/ctxext"
"github.com/FloatTech/zbputils/img/text"
"github.com/sirupsen/logrus"
zero "github.com/wdvxdr1123/ZeroBot"
"github.com/wdvxdr1123/ZeroBot/message"
)
const (
wantquotesURL = "https://wantquotes.net"
getQrcode = "/api/get_qrcode/"
showqrcode = "https://mp.weixin.qq.com/cgi-bin/showqrcode"
loginCheck = "/api/login_check/"
semantic = "/api/semantic/"
semanticURL = wantquotesURL + semantic + "?query=%s&type=%s&unionid=%s&secret=%s"
)
var (
typeList = [...]string{"现", "现-名言", "现-佳句", "现-佳句-文学", "现-佳句-诗歌", "现-佳句-其他", "现-网络", "现-台词", "现-台词-影视剧", "现-台词-动漫", "现-台词-综艺",
"古", "谚", "谚-谚语", "谚-俗语", "谚-惯用语", "歇"}
)
type getQrcodeRsp struct {
Ticket string `json:"ticket"`
SceneID string `json:"scene_id"`
}
type loginCheckRsp struct {
Login int `json:"login"`
Secret string `json:"secret"`
Unionid string `json:"unionid"`
}
type semanticRsp struct {
Quotes []Quotes `json:"quotes"`
TopSim float64 `json:"top_sim"`
}
// Quotes 名句结构体
type Quotes struct {
Quote string `json:"quote"`
SourceType string `json:"source_type"`
Author string `json:"author"`
Work string `json:"work"`
ID int `json:"id"`
}
func init() {
engine := control.Register("wantquotes", &ctrl.Options[*zero.Ctx]{
DisableOnDefault: false,
Extra: control.ExtraFromString("wantquotes"),
Brief: "据意查句",
Help: "- 据意查句 大海 (需登录据意查句)\n" +
"- 登录据意查句",
PrivateDataFolder: "wantquotes",
})
// 开启
engine.OnRegex(`^据意查句\s?(.{1,25})$`, getPara).SetBlock(true).Handle(func(ctx *zero.Ctx) {
keyword := ctx.State["regex_matched"].([]string)[1]
quotesType := ctx.State["quotesType"].(string)
var key string
manager := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
err := manager.GetExtra(&key)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return
}
logrus.Debugln("[wantquotes] get api key:", key)
unionid, secret, _ := strings.Cut(key, "|")
apiURL := fmt.Sprintf(semanticURL, url.QueryEscape(keyword), url.QueryEscape(quotesType), url.QueryEscape(unionid), url.QueryEscape(secret))
data, err := web.RequestDataWith(web.NewDefaultClient(), apiURL, "GET", wantquotesURL, web.RandUA(), nil)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return
}
var rsp semanticRsp
err = json.Unmarshal(data, &rsp)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return
}
m := make(message.Message, 0, len(rsp.Quotes))
text := strings.Builder{}
for _, v := range rsp.Quotes {
text.WriteString(v.Quote)
text.WriteString("\n—— ")
text.WriteString(v.Author)
text.WriteString(" 《")
text.WriteString(v.Work)
text.WriteString("》")
m = append(m, ctxext.FakeSenderForwardNode(ctx, message.Text(text.String())))
text.Reset()
}
if id := ctx.Send(m).ID(); id == 0 {
ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长,请耐心等待"))
}
})
engine.OnFullMatch(`登录据意查句`, zero.SuperUserPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
getQrcodeData, err := web.RequestDataWith(web.NewDefaultClient(), wantquotesURL+getQrcode, "GET", wantquotesURL, web.RandUA(), nil)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return
}
var qrRsp getQrcodeRsp
err = json.Unmarshal(getQrcodeData, &qrRsp)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return
}
showQrcodeData, err := web.RequestDataWith(web.NewDefaultClient(), showqrcode+"?ticket="+qrRsp.Ticket, "GET", "", web.RandUA(), nil)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return
}
ctx.SendChain(message.Text("WantQuotes\n微信扫码登录\n首次登录需关注公众号"))
ctx.SendChain(message.ImageBytes(showQrcodeData))
ticker := time.NewTicker(2 * time.Second) // 创建每秒触发一次的定时器
defer ticker.Stop()
count := 0
for range ticker.C {
count++
if count == 60 {
ctx.SendChain(message.Text("据意查句登录超时,请重新登录"))
return
}
loginCheckData, err := web.RequestDataWith(web.NewDefaultClient(), wantquotesURL+loginCheck+"?scene_id="+qrRsp.SceneID, "GET", "", web.RandUA(), nil)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return
}
var lcr loginCheckRsp
err = json.Unmarshal(loginCheckData, &lcr)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return
}
if lcr.Login == 1 {
manager := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
err := manager.SetExtra(lcr.Unionid + "|" + lcr.Secret)
if err != nil {
ctx.SendChain(message.Text("ERROR: ", err))
return
}
ctx.SendChain(message.Text("据意查句登录成功"))
return
}
}
})
}
func getPara(ctx *zero.Ctx) bool {
next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession())
recv, cancel := next.Repeat()
defer cancel()
tex := strings.Builder{}
tex.WriteString("请下列选择查询名句的类型\n")
for i, v := range typeList {
tex.WriteString(strconv.Itoa(i))
tex.WriteString(". ")
tex.WriteString(v)
tex.WriteString("\n")
}
base64Str, err := text.RenderToBase64(tex.String(), text.FontFile, 400, 20)
if err != nil {
ctx.SendChain(message.Text("图片生成错误了, ", zero.BotConfig.NickName[0], "帮你选择查询名句类型"))
ctx.State["quotesType"] = typeList[0]
return true
}
ctx.SendChain(message.Image("base64://" + binary.BytesToString(base64Str)))
for {
select {
case <-time.After(time.Second * 10):
ctx.SendChain(message.Text("时间太久啦!", zero.BotConfig.NickName[0], "帮你选择查询名句类型"))
ctx.State["quotesType"] = typeList[0]
return true
case c := <-recv:
msg := c.Event.Message.ExtractPlainText()
num, _ := strconv.Atoi(msg)
if num < 0 || num >= len(typeList) {
ctx.SendChain(message.Text("序号非法!"))
continue
}
ctx.State["quotesType"] = typeList[num]
return true
}
}
}

View File

@@ -1,6 +1,7 @@
package warframeapi
import (
"crypto/tls"
"encoding/json"
"errors"
"fmt"
@@ -30,7 +31,11 @@ func newwfapi() (w wfapi, err error) {
// 获取Warframe市场的售价表并进行排序,cn_name为物品中文名称onlyMaxRank表示只取最高等级的物品返回物品售价表物品信息物品英文
func getitemsorder(cnName string, onlyMaxRank bool) (od orders, it *itemsInSet, n string, err error) {
var wfapiio wfAPIItemsOrders
data, err := web.RequestDataWithHeaders(&http.Client{}, fmt.Sprintf("https://api.warframe.market/v1/items/%s/orders?include=item", cnName), "GET", func(request *http.Request) error {
data, err := web.RequestDataWithHeaders(&http.Client{Transport: &http.Transport{
TLSClientConfig: &tls.Config{
MinVersion: tls.VersionTLS12,
},
}}, fmt.Sprintf("https://api.warframe.market/v1/items/%s/orders?include=item", cnName), "GET", func(request *http.Request) error {
request.Header.Add("Accept", "application/json")
request.Header.Add("Platform", "pc")
return nil
@@ -87,7 +92,11 @@ var (
func newwm() (*wmdata, error) {
var itemapi wfAPIItem // WarFrame市场的数据实例
var wd wmdata
data, err := web.RequestDataWithHeaders(&http.Client{}, wfitemurl, "GET", func(request *http.Request) error {
data, err := web.RequestDataWithHeaders(&http.Client{Transport: &http.Transport{
TLSClientConfig: &tls.Config{
MinVersion: tls.VersionTLS12,
},
}}, wfitemurl, "GET", func(request *http.Request) error {
request.Header.Add("Accept", "application/json")
request.Header.Add("Language", "zh-hans")
return nil

View File

@@ -81,6 +81,9 @@ func (w *world) refresh(api *wfapi) {
w.w[2].NextTime = api.CambionCycle.Expiry.Local()
w.w[2].IsDay = api.CambionCycle.Active == "fass"
for _, t := range w.w {
t.Unlock()
}
}
// 游戏时间更新

View File

@@ -100,7 +100,7 @@ func init() { // 插件主体
))
getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
vilginfo.db.DBPath = engine.DataFolder() + "ernieVilg.db"
err := vilginfo.db.Open(time.Hour * 24)
err := vilginfo.db.Open(time.Hour)
if err != nil {
ctx.SendChain(message.Text(serviceErr, err))
return false
@@ -302,7 +302,7 @@ func init() { // 插件主体
))
getmodeldb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
modelinfo.db.DBPath = engine.DataFolder() + "ernieModel.db"
err := modelinfo.db.Open(time.Hour * 24)
err := modelinfo.db.Open(time.Hour)
if err != nil {
ctx.SendChain(message.Text(modelErr, err))
return false

View File

@@ -44,7 +44,7 @@ func init() {
var secondname string
if len(ctx.Event.Message) > 1 && ctx.Event.Message[1].Type == "at" {
qq, _ := strconv.ParseInt(ctx.Event.Message[1].Data["qq"], 10, 64)
secondname = ctx.GetGroupMemberInfo(ctx.Event.GroupID, qq, false).Get("nickname").Str
secondname = ctx.GetThisGroupMemberInfo(qq, false).Get("nickname").Str
}
name = ctx.Event.Sender.NickName
var text string

View File

@@ -12,7 +12,7 @@
"0409": {
"identity": {
"name": "ZeroBot-Plugin",
"version": "1.7.1.1789"
"version": "1.7.2.1831"
},
"description": "",
"minimum-os": "vista",
@@ -36,23 +36,23 @@
"#1": {
"0000": {
"fixed": {
"file_version": "1.7.1.1789",
"product_version": "v1.7.1-beta2",
"timestamp": "2023-04-09T11:02:07+08:00"
"file_version": "1.7.2.1831",
"product_version": "v1.7.2",
"timestamp": "2023-07-28T13:59:16+08:00"
},
"info": {
"0409": {
"Comments": "OneBot plugins based on ZeroBot",
"CompanyName": "FloatTech",
"FileDescription": "https://github.com/FloatTech/ZeroBot-Plugin",
"FileVersion": "1.7.1.1789",
"FileVersion": "1.7.2.1831",
"InternalName": "",
"LegalCopyright": "© 2020 - 2023 FloatTech. All Rights Reserved.",
"LegalTrademarks": "",
"OriginalFilename": "ZBP.EXE",
"PrivateBuild": "",
"ProductName": "ZeroBot-Plugin",
"ProductVersion": "v1.7.1-beta2",
"ProductVersion": "v1.7.2",
"SpecialBuild": ""
}
}