From 9a447daaca7919205992810a940615b4a7b803f5 Mon Sep 17 00:00:00 2001 From: xiaoyan-5800X Date: Thu, 9 Feb 2023 23:54:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- config.yml | 107 +++++++++++++++++++++++++ cqhttp/data/images/CURRENT | 2 +- cqhttp/data/images/CURRENT.bak | 2 +- cqhttp/data/images/LOG | 18 +++++ cqhttp/data/images/MANIFEST-000005 | Bin 41 -> 0 bytes cqhttp/data/images/MANIFEST-000009 | Bin 0 -> 41 bytes cqhttp/data/leveldb-v3/000006.ldb | Bin 0 -> 230 bytes cqhttp/data/leveldb-v3/CURRENT | 2 +- cqhttp/data/leveldb-v3/CURRENT.bak | 2 +- cqhttp/data/leveldb-v3/LOG | 19 +++++ cqhttp/data/leveldb-v3/MANIFEST-000005 | Bin 41 -> 0 bytes cqhttp/data/leveldb-v3/MANIFEST-000010 | Bin 0 -> 72 bytes cqhttp/data/videos/CURRENT | 2 +- cqhttp/data/videos/CURRENT.bak | 2 +- cqhttp/data/videos/LOG | 18 +++++ cqhttp/data/videos/MANIFEST-000005 | Bin 41 -> 0 bytes cqhttp/data/videos/MANIFEST-000009 | Bin 0 -> 41 bytes cqhttp/session.token | Bin 446 -> 446 bytes src/plugins/zhibo8/__init__.py | 69 ++++++++++++++++ src/plugins/zhibo8/config.py | 5 ++ 21 files changed, 244 insertions(+), 7 deletions(-) create mode 100644 config.yml delete mode 100644 cqhttp/data/images/MANIFEST-000005 create mode 100644 cqhttp/data/images/MANIFEST-000009 create mode 100644 cqhttp/data/leveldb-v3/000006.ldb delete mode 100644 cqhttp/data/leveldb-v3/MANIFEST-000005 create mode 100644 cqhttp/data/leveldb-v3/MANIFEST-000010 delete mode 100644 cqhttp/data/videos/MANIFEST-000005 create mode 100644 cqhttp/data/videos/MANIFEST-000009 create mode 100644 src/plugins/zhibo8/__init__.py create mode 100644 src/plugins/zhibo8/config.py diff --git a/.gitignore b/.gitignore index 093255f..47ecf2a 100644 --- a/.gitignore +++ b/.gitignore @@ -138,4 +138,5 @@ dmypy.json # pytype static type analyzer .pytype/ -# End of https://www.toptal.com/developers/gitignore/api/python \ No newline at end of file +# End of https://www.toptal.com/developers/gitignore/api/python +.idea \ No newline at end of file diff --git a/config.yml b/config.yml new file mode 100644 index 0000000..e450166 --- /dev/null +++ b/config.yml @@ -0,0 +1,107 @@ +# go-cqhttp 默认配置文件 + +account: # 账号相关 + uin: 1233456 # QQ账号 + password: '' # 密码为空时使用扫码登录 + encrypt: false # 是否开启密码加密 + status: 0 # 在线状态 请参考 https://docs.go-cqhttp.org/guide/config.html#在线状态 + relogin: # 重连设置 + delay: 3 # 首次重连延迟, 单位秒 + interval: 3 # 重连间隔 + max-times: 0 # 最大重连次数, 0为无限制 + + # 是否使用服务器下发的新地址进行重连 + # 注意, 此设置可能导致在海外服务器上连接情况更差 + use-sso-address: true + # 是否允许发送临时会话消息 + allow-temp-session: false + +heartbeat: + # 心跳频率, 单位秒 + # -1 为关闭心跳 + interval: 5 + +message: + # 上报数据类型 + # 可选: string,array + post-format: string + # 是否忽略无效的CQ码, 如果为假将原样发送 + ignore-invalid-cqcode: false + # 是否强制分片发送消息 + # 分片发送将会带来更快的速度 + # 但是兼容性会有些问题 + force-fragment: false + # 是否将url分片发送 + fix-url: false + # 下载图片等请求网络代理 + proxy-rewrite: '' + # 是否上报自身消息 + report-self-message: false + # 移除服务端的Reply附带的At + remove-reply-at: false + # 为Reply附加更多信息 + extra-reply-data: false + # 跳过 Mime 扫描, 忽略错误数据 + skip-mime-scan: false + +output: + # 日志等级 trace,debug,info,warn,error + log-level: warn + # 日志时效 单位天. 超过这个时间之前的日志将会被自动删除. 设置为 0 表示永久保留. + log-aging: 15 + # 是否在每次启动时强制创建全新的文件储存日志. 为 false 的情况下将会在上次启动时创建的日志文件续写 + log-force-new: true + # 是否启用日志颜色 + log-colorful: true + # 是否启用 DEBUG + debug: false # 开启调试模式 + +# 默认中间件锚点 +default-middlewares: &default + # 访问密钥, 强烈推荐在公网的服务器设置 + access-token: '' + # 事件过滤器文件目录 + filter: '' + # API限速设置 + # 该设置为全局生效 + # 原 cqhttp 虽然启用了 rate_limit 后缀, 但是基本没插件适配 + # 目前该限速设置为令牌桶算法, 请参考: + # https://baike.baidu.com/item/%E4%BB%A4%E7%89%8C%E6%A1%B6%E7%AE%97%E6%B3%95/6597000?fr=aladdin + rate-limit: + enabled: false # 是否启用限速 + frequency: 1 # 令牌回复频率, 单位秒 + bucket: 1 # 令牌桶大小 + +database: # 数据库相关设置 + leveldb: + # 是否启用内置leveldb数据库 + # 启用将会增加10-20MB的内存占用和一定的磁盘空间 + # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能 + enable: true + sqlite3: + # 是否启用内置sqlite3数据库 + # 启用将会增加一定的内存占用和一定的磁盘空间 + # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能 + enable: false + cachettl: 3600000000000 # 1h + +# 连接服务列表 +servers: + # 添加方式，同一连接方式可添加多个，具体配置说明请查看文档 + #- http: # http 通信 + #- ws: # 正向 Websocket + #- ws-reverse: # 反向 Websocket + #- pprof: #性能分析服务器 + # 反向WS设置 + - ws-reverse: + # 反向WS Universal 地址 + # 注意 设置了此项地址后下面两项将会被忽略 + universal: ws://your_websocket_universal.server + # 反向WS API 地址 + api: ws://your_websocket_api.server + # 反向WS Event 地址 + event: ws://your_websocket_event.server + # 重连间隔 单位毫秒 + reconnect-interval: 3000 + middlewares: + <<: *default # 引用默认中间件 diff --git a/cqhttp/data/images/CURRENT b/cqhttp/data/images/CURRENT index aa5bb8e..6ba31a3 100644 --- a/cqhttp/data/images/CURRENT +++ b/cqhttp/data/images/CURRENT @@ -1 +1 @@ -MANIFEST-000005 +MANIFEST-000009 diff --git a/cqhttp/data/images/CURRENT.bak b/cqhttp/data/images/CURRENT.bak index 4fb1dad..875cf23 100644 --- a/cqhttp/data/images/CURRENT.bak +++ b/cqhttp/data/images/CURRENT.bak @@ -1 +1 @@ -MANIFEST-000003 +MANIFEST-000007 diff --git a/cqhttp/data/images/LOG b/cqhttp/data/images/LOG index 1621ac6..3bf01a8 100644 --- a/cqhttp/data/images/LOG +++ b/cqhttp/data/images/LOG @@ -22,3 +22,21 @@ 23:59:25.632807 version@stat F·[] S·0B[] Sc·[] 23:59:25.634032 db@janitor F·2 G·0 23:59:25.634045 db@open done T·1.312002ms +=============== Feb 9, 2023 (CST) =============== +23:05:24.191519 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed +23:05:24.191616 version@stat F·[] S·0B[] Sc·[] +23:05:24.191631 db@open opening +23:05:24.191655 journal@recovery F·1 +23:05:24.191670 journal@recovery recovering @4 +23:05:24.191732 version@stat F·[] S·0B[] Sc·[] +23:05:24.193095 db@janitor F·2 G·0 +23:05:24.193105 db@open done T·1.468771ms +=============== Feb 9, 2023 (CST) =============== +23:06:02.854307 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed +23:06:02.854392 version@stat F·[] S·0B[] Sc·[] +23:06:02.854403 db@open opening +23:06:02.854420 journal@recovery F·1 +23:06:02.854433 journal@recovery recovering @6 +23:06:02.854483 version@stat F·[] S·0B[] Sc·[] +23:06:02.855679 db@janitor F·2 G·0 +23:06:02.855945 db@open done T·1.53667ms diff --git a/cqhttp/data/images/MANIFEST-000005 b/cqhttp/data/images/MANIFEST-000005 deleted file mode 100644 index a9e8a261c7882e802f65360dc49782db7df6fb77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41 wcmYcef4W17fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zle#2nT>@304?eb82|tP diff --git a/cqhttp/data/images/MANIFEST-000009 b/cqhttp/data/images/MANIFEST-000009 new file mode 100644 index 0000000000000000000000000000000000000000..3dd087faafcf675e7e2353d1a64ac454a750fb85 GIT binary patch literal 41 wcmZ1(ru0UMfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zle#0nTv%103#a=*8l(j literal 0 HcmV?d00001 diff --git a/cqhttp/data/leveldb-v3/000006.ldb b/cqhttp/data/leveldb-v3/000006.ldb new file mode 100644 index 0000000000000000000000000000000000000000..557d291bc6a643fef091ad086624c8fef416849d GIT binary patch literal 230 zcmeBSRAJyLeNm^+!N|zK$|%6-WFTQ6$S7f!mXc;{na0ZhA=xZBjpONt{zKb=1Y2Hy zQEp-mOG#xxDoaUfMF~qvVo4(B)5#rAr|o^eXFekr!~4U1KbW}YNnd&1znFjDx%c^! zrzUjn<56M&v1c_rT+GABq{*&l%)zL~ZovQqj369w@7-Ar890~CWc~zk5e81?myG{8 j88sN%L5d(MHwhG;>tW=Y%_s&E!VkiKH*~9%y59x>KvF)h literal 0 HcmV?d00001 diff --git a/cqhttp/data/leveldb-v3/CURRENT b/cqhttp/data/leveldb-v3/CURRENT index aa5bb8e..3051f81 100644 --- a/cqhttp/data/leveldb-v3/CURRENT +++ b/cqhttp/data/leveldb-v3/CURRENT @@ -1 +1 @@ -MANIFEST-000005 +MANIFEST-000010 diff --git a/cqhttp/data/leveldb-v3/CURRENT.bak b/cqhttp/data/leveldb-v3/CURRENT.bak index 4fb1dad..d408ea0 100644 --- a/cqhttp/data/leveldb-v3/CURRENT.bak +++ b/cqhttp/data/leveldb-v3/CURRENT.bak @@ -1 +1 @@ -MANIFEST-000003 +MANIFEST-000008 diff --git a/cqhttp/data/leveldb-v3/LOG b/cqhttp/data/leveldb-v3/LOG index af3bc31..35e358a 100644 --- a/cqhttp/data/leveldb-v3/LOG +++ b/cqhttp/data/leveldb-v3/LOG @@ -22,3 +22,22 @@ 23:59:25.635821 version@stat F·[] S·0B[] Sc·[] 23:59:25.637460 db@janitor F·2 G·0 23:59:25.637478 db@open done T·1.76466ms +=============== Feb 9, 2023 (CST) =============== +23:05:24.194505 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed +23:05:24.194570 version@stat F·[] S·0B[] Sc·[] +23:05:24.194583 db@open opening +23:05:24.194617 journal@recovery F·1 +23:05:24.194642 journal@recovery recovering @4 +23:05:24.194955 memdb@flush created L0@6 N·1 S·230B "\xe8~/\b,v1":"\xe8~/\b,v1" +23:05:24.194994 version@stat F·[1] S·230B[230B] Sc·[0.25] +23:05:24.197191 db@janitor F·3 G·0 +23:05:24.197198 db@open done T·2.610842ms +=============== Feb 9, 2023 (CST) =============== +23:06:02.857480 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed +23:06:02.857555 version@stat F·[1] S·230B[230B] Sc·[0.25] +23:06:02.857567 db@open opening +23:06:02.857604 journal@recovery F·1 +23:06:02.857627 journal@recovery recovering @7 +23:06:02.857702 version@stat F·[1] S·230B[230B] Sc·[0.25] +23:06:02.858727 db@janitor F·3 G·0 +23:06:02.858737 db@open done T·1.1659ms diff --git a/cqhttp/data/leveldb-v3/MANIFEST-000005 b/cqhttp/data/leveldb-v3/MANIFEST-000005 deleted file mode 100644 index a9e8a261c7882e802f65360dc49782db7df6fb77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41 wcmYcef4W17fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zle#2nT>@304?eb82|tP diff --git a/cqhttp/data/leveldb-v3/MANIFEST-000010 b/cqhttp/data/leveldb-v3/MANIFEST-000010 new file mode 100644 index 0000000000000000000000000000000000000000..a488f1a1cce362510a8efc9c275223ff901fb7d8 GIT binary patch literal 72 zcmezDJ7=0B10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAei0KVGdBwpI|JJ@MxGaS N`W%dm3}Ar50RSx`5vc$G literal 0 HcmV?d00001 diff --git a/cqhttp/data/videos/CURRENT b/cqhttp/data/videos/CURRENT index aa5bb8e..6ba31a3 100644 --- a/cqhttp/data/videos/CURRENT +++ b/cqhttp/data/videos/CURRENT @@ -1 +1 @@ -MANIFEST-000005 +MANIFEST-000009 diff --git a/cqhttp/data/videos/CURRENT.bak b/cqhttp/data/videos/CURRENT.bak index 4fb1dad..875cf23 100644 --- a/cqhttp/data/videos/CURRENT.bak +++ b/cqhttp/data/videos/CURRENT.bak @@ -1 +1 @@ -MANIFEST-000003 +MANIFEST-000007 diff --git a/cqhttp/data/videos/LOG b/cqhttp/data/videos/LOG index 75cf79a..127d763 100644 --- a/cqhttp/data/videos/LOG +++ b/cqhttp/data/videos/LOG @@ -22,3 +22,21 @@ 23:59:25.634297 version@stat F·[] S·0B[] Sc·[] 23:59:25.635536 db@janitor F·2 G·0 23:59:25.635547 db@open done T·1.371654ms +=============== Feb 9, 2023 (CST) =============== +23:05:24.193133 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed +23:05:24.193176 version@stat F·[] S·0B[] Sc·[] +23:05:24.193184 db@open opening +23:05:24.193200 journal@recovery F·1 +23:05:24.193213 journal@recovery recovering @4 +23:05:24.193267 version@stat F·[] S·0B[] Sc·[] +23:05:24.194438 db@janitor F·2 G·0 +23:05:24.194447 db@open done T·1.260231ms +=============== Feb 9, 2023 (CST) =============== +23:06:02.855979 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed +23:06:02.856025 version@stat F·[] S·0B[] Sc·[] +23:06:02.856031 db@open opening +23:06:02.856047 journal@recovery F·1 +23:06:02.856059 journal@recovery recovering @6 +23:06:02.856114 version@stat F·[] S·0B[] Sc·[] +23:06:02.857409 db@janitor F·2 G·0 +23:06:02.857420 db@open done T·1.386759ms diff --git a/cqhttp/data/videos/MANIFEST-000005 b/cqhttp/data/videos/MANIFEST-000005 deleted file mode 100644 index a9e8a261c7882e802f65360dc49782db7df6fb77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41 wcmYcef4W17fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zle#2nT>@304?eb82|tP diff --git a/cqhttp/data/videos/MANIFEST-000009 b/cqhttp/data/videos/MANIFEST-000009 new file mode 100644 index 0000000000000000000000000000000000000000..3dd087faafcf675e7e2353d1a64ac454a750fb85 GIT binary patch literal 41 wcmZ1(ru0UMfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zle#0nTv%103#a=*8l(j literal 0 HcmV?d00001 diff --git a/cqhttp/session.token b/cqhttp/session.token index 2756f0a6818969c7da529937ff2fa7706a597a54..3a33fd0d7f9f95c51daeea176d84e0c280d2361d 100644 GIT binary patch literal 446 zcmV;v0YUx%0001DJRl7KKuW1gtC4|YHye;^Mp_|iV|E&PC&CslfxJ()q38XkW?j4* zgKg%jn-^(SR@DYs{r7^^-Y(U33CKEG(OHSwOaKrxQ7uw^EOSY8KR04|E^t@?NGLc5 zMQOzvly0yE@2lnu9eHT0i!987*`dPuNUW|siG)>G=g*WFkNis&(~X%9(rg0PNBfI= zPT~KiFg!cm1aMF}BNA&@82~_by^wCBe7KNuTDBF-O+RRw17ruEBROIe8L&9*47@b` z37!dM&7bbb*mplDn40R*R%`@1WE<8kzO&Rnukz{uFnBO{7=#HS7aH|DK+>u(ry>M% zfl>?dV=5|C5R9{{_j(16s0ZXieSjs@pP1qX*#LN^Uw+F*SMWtEfli0rr{HilFTaDO zM7v&-U_7A)vp!6J4+oVp|kw>JY- zUM`6e#31Lx#y!Ut4Tj?M7+jjvyk`I>LLi_uiuW2^^GIlrMd+efk*T%-GAN(`5Nq|K o=q(8C30?f?V=uv?1&5Dx#!uyW~&TEgVcT*-VE z^>c!$oF4grq?S{E6u_4N5C9M;M_6++Ic8cvb#QGhdN)@9NKs^F z>@{_P-vWQHtt#t!;MVkn{i`E|wb3`tS1WkTUNX7M(v!RstEucE3s0C<#rr38m2Qq= ze4NkqgP+}Z5t9Mk5sXmrrvN}?EL6}OdB3?IN(WpXRx}($=j06k;o_Low)DFi{zR#U z!%#>+sDKbZl8~>G-8V~AZA_7sl99_1c-LFznZH2*FlZ#9#h)(k*N0haAExZQcJpy> z>*qH2pAjUZXZZ`k zFhT4x&Mp$X<=6l$64-$4_GlRaL4O_*wIA^R4lX^UUn~|Id4w7~DUclM#4SpZgSwm` zDD7vTm8?V;mnyg|_`kNOah4_p<%qVKn{wwMUPxq3oZnYygl0_w9PL!b>&1Zp5LF-F oSbc$!$&%`Z`gg>wng9d>uv?1&5Zd2jWWf0%Zs&c0<}|gn1UlNzRR910 diff --git a/src/plugins/zhibo8/__init__.py b/src/plugins/zhibo8/__init__.py new file mode 100644 index 0000000..bffe59e --- /dev/null +++ b/src/plugins/zhibo8/__init__.py @@ -0,0 +1,69 @@ +from datetime import datetime +from pathlib import Path +import nonebot +from nonebot import get_driver, on_message +from nonebot.adapters.onebot.v11 import Bot, Event +from nonebot.typing import T_State + +from .config import Config +from nonebot import on_command +from nonebot.rule import to_me +from nonebot.matcher import Matcher +from nonebot.adapters import Message +from nonebot.params import Arg, CommandArg, ArgPlainText +from requests_html import HTMLSession, HTML + +global_config = get_driver().config +config = Config.parse_obj(global_config) + +_sub_plugins = set() +_sub_plugins |= nonebot.load_plugins( + str((Path(__file__).parent / "plugins").resolve()) +) + +zhibo8Command = on_command("/zhibo8", rule=to_me(), aliases={'预测', '英超', 'zhibo'}, priority=10) + +xiaobianStr = r""" +小编们预测比分： +太能喵： +叶小欢： +大帝强： +小小： +""" + + +@zhibo8Command.handle() +async def handler_zhibo8(bot: Bot, event: Event, state: T_State): + session = HTMLSession() + zhibo8Get = session.get("http://www.zhibo8.cc") + print(zhibo8Get) + saishiContent = zhibo8Get.html.xpath("//ul/li[starts-with(@id, 'saishi')]") + vsMap = dict() + # 解析xpath + # 解析xpath + for item in saishiContent: + if item.html.find("英超") >= 0: + if item.html.find("阿森纳") >= 0 or item.html.find("曼城") >= 0 or item.html.find("曼联") >= 0 or item.html.find("利物浦") >= 0 or item.html.find("切尔西") >= 0: + rouneNum, vsStr = parserSaishiItem(item.html) + if rouneNum not in vsMap.keys(): + vsMap[rouneNum] = [] + vsMap[rouneNum].append(vsStr) + + resultStr = "" + for roudNum in vsMap: + resultStr += "【" + roudNum.replace("第", "联赛 第") + " 比分预测】\r\n" + for vs in vsMap[roudNum]: + resultStr += vs + "\r\n" + resultStr += xiaobianStr + await zhibo8Command.finish(resultStr) + + +def parserSaishiItem(saishiStr): + html = HTML(html=saishiStr) + listItem = html.xpath("//b//text()") + roundNum = listItem[0].split(" ")[0].strip() + homeName = listItem[0].split(" ")[1].strip() + awayName = listItem[-1].strip() + timeStr = html.xpath("//li/@data-time") + time = datetime.strptime(timeStr[0], "%Y-%m-%d %H:%M") + return (roundNum, time.strftime("%m月%d日%H:%M") + " " + homeName + " vs " + awayName) diff --git a/src/plugins/zhibo8/config.py b/src/plugins/zhibo8/config.py new file mode 100644 index 0000000..820f04d --- /dev/null +++ b/src/plugins/zhibo8/config.py @@ -0,0 +1,5 @@ +from pydantic import BaseModel, Extra + + +class Config(BaseModel, extra=Extra.ignore): + """Plugin Config Here"""