nonebot-plugin-l4d2-server 0.4.0b1__py3-none-any.whl → 0.4.0b2__py3-none-any.whl

README.md

@@ -42,6 +42,7 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
     l4_port = ['20715']
     l4_rcon = ['1145149191810']
     l4_font = 'simsun.ttc'
+    l4_tag = ['呆呆']
     l4_only = True
 
 <h2 id="gn">主要功能</h2>
@@ -52,6 +53,14 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 - [求生电信服anne](https://github.com/fantasylidong/CompetitiveWithAnne)[查询~](https://sb.trygek.com/l4d_stats/ranking/index.php)
 
 
+<h2 id="gn">如何获取key</h2>
+
+为了使得ip不被滥用，我采取这种方式管理。
+[点击这里加群](https://jq.qq.com/?_wv=1027&k=HdjoCcAe)
+如果你只查询自己的服务器ip则可以忽略如下，并且更改env设置：
+
+        l4_tag = []
+
 
 ## 🔖 更新日志
 
@@ -237,12 +246,16 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 
 </details>
 
-## 📖许可证GPL3.0
+## 🙈 其他
 
-        This project is licensed under the GNU General Public License v3.0. See the LICENSE file for more information.
++ 本人技术很差，如果您有发现BUG或者更好的建议，欢迎提Issue & Pr
++ 如果本插件对你有帮助，不要忘了点个Star~
++ 本项目仅供学习使用，请勿用于商业用途
++ [GPL-3.0 License](https://github.com/Umamusume-Agnes-Digital/nonebot_plugin_l4d2_server/blob/main/LICENSE) ©[@Umamusume-Agnes-Digital](https://github.com/Umamusume-Agnes-Digital)
+        
 
 
-<h2 id="ty">🌐感谢</h2>
+<h2 id="ty">🌐 感谢</h2>
 
 - [修仙](https://github.com/s52047qwas/nonebot_plugin_xiuxian) - 数据库的写法来自于他
 - ~ [自己写的求生之路查询库](https://github.com/Umamusume-Agnes-Digital/VSQ) ~已弃用
@@ -252,14 +265,15 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 - [gsuid](https://github.com/KimigaiiWuyi/GenshinUID) - readme和wiki的格式参考
 - 呆呆 - 提供三方地图的详细数据
 
-目前插件会内置经腐竹同意的服的查询（未来将使用api）
+<h2 id="ty">🌐 默认服务器</h2>
+目前**已授权**的服务器查询，如果需要加入自己的ip可以进qq群私聊群主
 
 | 指令 | 服务器 | op | 数量 |
 |:-----:|:----:|:----:|:----:|
-| 云 | ~anne电信服云服~(暂时不提供) | 东 | 22
+| 云 | anne电信服云服 | 东 | 22
 | 呆呆 | 呆呆的小窝 | 提莫大魔王 | 15
 | 橘 | 橘希实香的小窝 | 橘希实香 | 8
 | 竹 | 竹烨 | 竹烨oО柠檬茶 | 9
 | 音理 | 星空列车与白的旅行 | 音理 | 2
 
-如果需要加入自己的ip可以Pr、iss或者进qq群
+**如果提供了ip，那么我只能尽可能保证您的ipv4不会泄漏，如果无法承担风险则请勿提供ip**

nonebot_plugin_l4d2_server/__init__.py

@@ -31,7 +31,7 @@ from .l4d2_data import sq_L4D2
 from nonebot import get_driver, require
 from .l4d2_image.vtfs import img_to_vtf
 from .l4d2_queries.ohter import load_josn
-from .l4d2_queries.qqgroup import write_json,ip_anne_list
+from .l4d2_queries.qqgroup import write_json
 from .l4d2_file import updown_l4d2_vpk,all_zip_to_one
 
 from .txt_to_img import mode_txt_to_img
@@ -375,18 +375,6 @@ async def _(args:Message = CommandArg()):
         message = await write_json(msg)
         await updata.finish(message)
   
-@read_ip.handle()
-async def _():
-    img = await qq_ip_queries_pic(ip_anne_list)
-    if img == None:
-        return "电信服的地址请加主群自行填写哦"
-    await read_ip.finish(MessageSegment.image(img))
-
-@tan_jian.handle()
-async def _(event:MessageEvent):
-    await tan_jian.send('正在寻找牢房...')
-    msg = await get_tan_jian(ip_anne_list,1)
-    await tan_jian.finish(msg)
 
             
 @vtf_make.handle()
@@ -414,16 +402,6 @@ async def _(bot:Bot,event:MessageEvent,state:T_State,tag = Arg("image")):
     await upload_file(bot, event, img_bytes, file_name)
 
 
-@prison.handle()
-async def _(event:MessageEvent):
-    msg = await get_tan_jian(ip_anne_list,2)
-    await tan_jian.finish(msg)
-
-@open_prison.handle()
-async def _(event:MessageEvent):
-
-    msg = await get_tan_jian(ip_anne_list,3)
-    await tan_jian.finish(msg)
 
 @smx_file.handle()
 async def _():
@@ -474,11 +452,35 @@ async def _(bot:Bot,event:GroupMessageEvent,state:T_State):
 
 @driver.on_bot_connect
 async def _():
-    get_ip = on_command('114514919181',aliases=server_key(),priority=80,block=True)
+    global ALL_HOST
+    global ANNE_IP
+    ALL_HOST.update(await seach_map(l4_tag,l4_qq,l4_key,'ip'))
+    def count_ips(ip_dict:dict):
+        for key, value in ip_dict.items():
+            if key == 'error_':
+                continue
+            count = len(value)
+            logger.info(f'已加载：{key} | {count}个')
+            if key == '云':
+                ANNE_IP = {key:value}
+    count_ips(ALL_HOST)
+    
+    ip_anne_list=[] 
+    try:
+        ips = ALL_HOST['云']
+        ip_anne_list = []
+        for one_ip in ips:
+            host,port = split_maohao(one_ip['ip'])
+            ip_anne_list.append((one_ip['id'],host,port))
+    except KeyError:
+        pass
+    get_ip = on_command('anne',aliases=server_key(),priority=80,block=True)
     @get_ip.handle()
-    async def _(command: str = RawCommand(),args:Message = CommandArg()):
-        if CommandStart:
-            command.replace('CommandStart','')
+    async def _(start:str = CommandStart(),command: str = RawCommand(),args:Message = CommandArg(),):
+        if start:
+            command.replace(start,'')
+        if command == 'anne':
+            command = '云'
         msg:str = args.extract_plain_text()
         if not msg:
             # 以图片输出全部当前
@@ -489,9 +491,9 @@ async def _():
                 ip_list.append((one_ip['id'],host,port))
             img = await qq_ip_queries_pic(ip_list)
             if img:
-                await read_ip.finish(MessageSegment.image(img)) 
+                await get_ip.finish(MessageSegment.image(img)) 
             else:
-                await read_ip.finish("服务器无响应")
+                await get_ip.finish("服务器无响应")
         else:
             if not msg[0].isdigit():
                 if msg.startswith(gamemode_list):
@@ -509,10 +511,26 @@ async def _():
                 await get_ip.finish(msg)
             except (OSError,asyncio.exceptions.TimeoutError):
                 await get_ip.finish('服务器无响应')
+                
+    @tan_jian.handle()
+    async def _(event:MessageEvent):
+        await tan_jian.send('正在寻找牢房...')
+        msg = await get_tan_jian(ip_anne_list,1)
+        await tan_jian.finish(msg)  
+        
+    @prison.handle()
+    async def _(event:MessageEvent):
+        msg = await get_tan_jian(ip_anne_list,2)
+        await tan_jian.finish(msg)
+
+    @open_prison.handle()
+    async def _(event:MessageEvent):
 
+        msg = await get_tan_jian(ip_anne_list,3)
+        await tan_jian.finish(msg)
+    
             
 @driver.on_shutdown
 async def close_db():
     """关闭数据库"""
     sq_L4D2._close()
-    logger.info('已断开求生数据库')

nonebot_plugin_l4d2_server/command.py

@@ -66,7 +66,6 @@ smx_file = on_command('l4_smx',aliases={'求生插件'},priority=20,block=True,p
 anne_player = on_command('Ranne',aliases={"求生anne"},priority=25,block=True)
 anne_bind = on_command('Rbind',aliases={'steam绑定','求生绑定','anne绑定'},priority=20,block=True)
 del_bind = on_command('del_bind',aliases={'steam解绑','求生解绑','anne解绑'},priority=20,block=True)
-read_ip = on_command('anne',aliases={'求生云服'},priority=20,block=True)
 prison = on_command('zl',aliases={'坐牢'},priority=20,block=True)
 open_prison = on_command('kl',aliases={'开牢'},priority=20,block=True)
 

nonebot_plugin_l4d2_server/config.py

@@ -194,19 +194,3 @@ try:
     os.remove(Path().parent.joinpath('data/L4D2/l4d2.yml'))
 except:
     pass
-
-@driver.on_bot_connect
-async def start_ip():
-    global ALL_HOST
-    global ANNE_IP
-    ALL_HOST.update(await seach_map(l4_tag,l4_qq,l4_key,'ip'))
-    def count_ips(ip_dict:dict):
-        for key, value in ip_dict.items():
-            if key == 'error_':
-                continue
-            count = len(value)
-            logger.info(f'已加载：{key} | {count}个')
-            if key == '云':
-                ANNE_IP = {key:value}
-    count_ips(ALL_HOST)
-    

nonebot_plugin_l4d2_server/l4d2_queries/qqgroup.py

@@ -266,12 +266,3 @@ async def write_json(data_str:str):
                         return '删除成功喵'
                 return '序号不正确，请输入【求生更新 删除 腐竹 序号】'
         return '腐竹名不存在，请输入【求生更新 删除 腐竹 序号】'    
-ip_anne_list=[] 
-try:
-    ips = ALL_HOST['云']
-    ip_anne_list = []
-    for one_ip in ips:
-        host,port = split_maohao(one_ip['ip'])
-        ip_anne_list.append((one_ip['id'],host,port))
-except KeyError:
-    pass

{nonebot_plugin_l4d2_server-0.4.0b1.dist-info → nonebot_plugin_l4d2_server-0.4.0b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 0.4.0b1
+Version: 0.4.0b2
 Summary: L4D2 server related operations plugin for NoneBot
 Home-page: https://github.com/Umamusume-Agnes-Digital/nonebot_plugin_l4d2_server
 License: MIT
@@ -89,6 +89,7 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
     l4_port = ['20715']
     l4_rcon = ['1145149191810']
     l4_font = 'simsun.ttc'
+    l4_tag = ['呆呆']
     l4_only = True
 
 <h2 id="gn">主要功能</h2>
@@ -99,6 +100,14 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 - [求生电信服anne](https://github.com/fantasylidong/CompetitiveWithAnne)[查询~](https://sb.trygek.com/l4d_stats/ranking/index.php)
 
 
+<h2 id="gn">如何获取key</h2>
+
+为了使得ip不被滥用，我采取这种方式管理。
+[点击这里加群](https://jq.qq.com/?_wv=1027&k=HdjoCcAe)
+如果你只查询自己的服务器ip则可以忽略如下，并且更改env设置：
+
+        l4_tag = []
+
 
 ## 🔖 更新日志
 
@@ -284,12 +293,16 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 
 </details>
 
-## 📖许可证GPL3.0
+## 🙈 其他
 
-        This project is licensed under the GNU General Public License v3.0. See the LICENSE file for more information.
++ 本人技术很差，如果您有发现BUG或者更好的建议，欢迎提Issue & Pr
++ 如果本插件对你有帮助，不要忘了点个Star~
++ 本项目仅供学习使用，请勿用于商业用途
++ [GPL-3.0 License](https://github.com/Umamusume-Agnes-Digital/nonebot_plugin_l4d2_server/blob/main/LICENSE) ©[@Umamusume-Agnes-Digital](https://github.com/Umamusume-Agnes-Digital)
+        
 
 
-<h2 id="ty">🌐感谢</h2>
+<h2 id="ty">🌐 感谢</h2>
 
 - [修仙](https://github.com/s52047qwas/nonebot_plugin_xiuxian) - 数据库的写法来自于他
 - ~ [自己写的求生之路查询库](https://github.com/Umamusume-Agnes-Digital/VSQ) ~已弃用
@@ -299,15 +312,15 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 - [gsuid](https://github.com/KimigaiiWuyi/GenshinUID) - readme和wiki的格式参考
 - 呆呆 - 提供三方地图的详细数据
 
-目前插件会内置经腐竹同意的服的查询（未来将使用api）
+<h2 id="ty">🌐 默认服务器</h2>
+目前**已授权**的服务器查询，如果需要加入自己的ip可以进qq群私聊群主
 
 | 指令 | 服务器 | op | 数量 |
 |:-----:|:----:|:----:|:----:|
-| 云 | ~anne电信服云服~(暂时不提供) | 东 | 22
+| 云 | anne电信服云服 | 东 | 22
 | 呆呆 | 呆呆的小窝 | 提莫大魔王 | 15
 | 橘 | 橘希实香的小窝 | 橘希实香 | 8
 | 竹 | 竹烨 | 竹烨oО柠檬茶 | 9
 | 音理 | 星空列车与白的旅行 | 音理 | 2
 
-如果需要加入自己的ip可以Pr、iss或者进qq群
-
+**如果提供了ip，那么我只能尽可能保证您的ipv4不会泄漏，如果无法承担风险则请勿提供ip**

{nonebot_plugin_l4d2_server-0.4.0b1.dist-info → nonebot_plugin_l4d2_server-0.4.0b2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-nonebot_plugin_l4d2_server/__init__.py,sha256=8nazQ3iZLs_w6-iDnPeP_w-EUjFhTroh9LuQh_yxNuE,19326
-nonebot_plugin_l4d2_server/command.py,sha256=fLAC8dmC4Wt53XQWekyv9-t-Cihjb9YpbdxtH0HELa0,4975
-nonebot_plugin_l4d2_server/config.py,sha256=Tbh8FDMBSEwgGRE_CuJBEBKRl0ZFjXTGlTo5CJONqyM,5062
+nonebot_plugin_l4d2_server/__init__.py,sha256=n4YRt1eNrAIuM3qUh2_ErCNFfXopR6nqbh_g45x1e20,19891
+nonebot_plugin_l4d2_server/command.py,sha256=8QiN4mvPXjua9PFjhMLwTwRG583Jtsh0b6Op6KXzsjc,4897
+nonebot_plugin_l4d2_server/config.py,sha256=WK02pNkzPv9ljaQQs9TNegER1J_vByu5n2MCXaRWkeI,4579
 nonebot_plugin_l4d2_server/data/L4D2/image/head/head.png,sha256=Z72PEvp7xF1DZcLDeuWlg2_g6JAfHxtisptWn6BYGN8,158357
 nonebot_plugin_l4d2_server/data/L4D2/image/header/logo.png,sha256=1KhQNsx7zsCKGHmyIZ65dP9npkKzo7Im-Aafyi5_lhc,631630
 nonebot_plugin_l4d2_server/data/L4D2/image/header/player1.jpg,sha256=2A_llIi9YVhJs9JOMuF36by7Ewc7P7qOgQS8t5jemNw,405369
@@ -32,7 +32,7 @@ nonebot_plugin_l4d2_server/l4d2_image/vtfs.py,sha256=2WuXE_4_5eVNExzYCTgZnKZrcE6
 nonebot_plugin_l4d2_server/l4d2_queries/__init__.py,sha256=gpF-IWOZPQqqd5qoU1XBfiAt4CR7EKnhkiGJnCPev6Q,3447
 nonebot_plugin_l4d2_server/l4d2_queries/api.py,sha256=dEZWJq-HZ0G18I0ceZ2FO4KmiVOhAlS9QBZaIZ9JB8Q,1102
 nonebot_plugin_l4d2_server/l4d2_queries/ohter.py,sha256=jhE4azdK_SmCSipH0tqUrhtHR2V7qqVL3fgtuTHzbLI,741
-nonebot_plugin_l4d2_server/l4d2_queries/qqgroup.py,sha256=NLUqhewNHxpwdMXQ-luwtgspnwMqyIMqclPXQAOdeBI,10631
+nonebot_plugin_l4d2_server/l4d2_queries/qqgroup.py,sha256=CWRyXbvi-FrjW8NrVdJRgSM89kb7CRhVw72u1qCXhgs,10404
 nonebot_plugin_l4d2_server/l4d2_server/__init__.py,sha256=mp3Za6jJ-V92ChXRhl3k4D1tMTY4dqHdXgMzdWutccc,1676
 nonebot_plugin_l4d2_server/l4d2_server/rcon.py,sha256=aP2n-sq_vM-h6UjnNCmKK9_WW8oS9zFySgowPl5FXd4,1160
 nonebot_plugin_l4d2_server/l4d2_server/workshop.py,sha256=ZpWnWJ7EABNpDu86Rzoqu3tWoABanprIEcmej1zUT1A,1409
@@ -43,8 +43,8 @@ nonebot_plugin_l4d2_server/message.py,sha256=x_ts0HaW3SNOma-baEG0oaeozKE5Nh_fybn
 nonebot_plugin_l4d2_server/seach.py,sha256=dsusYogKH9pGeLxZz9BTheQwtJ3wAO3tfbePYdcaIuA,1025
 nonebot_plugin_l4d2_server/txt_to_img.py,sha256=ZaxHYNu8aAZUH4fNALyE1Q_ET7KuWytEiMFZ9loZnqc,2188
 nonebot_plugin_l4d2_server/utils.py,sha256=3GLxpTozac1tR3k364PPxjtIbb0zcRLxHgaBp7TDBcw,8803
-README.md,sha256=ZpJr6xaTwu22tx_mI5RkeHG4yHEJ79-OT3KHP1C0ejM,9061
-nonebot_plugin_l4d2_server-0.4.0b1.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-nonebot_plugin_l4d2_server-0.4.0b1.dist-info/METADATA,sha256=oW4mbMb6Fw8gyE_DfxsYkj3s7mK-R-CTq3ipY4nwmds,10806
-nonebot_plugin_l4d2_server-0.4.0b1.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-nonebot_plugin_l4d2_server-0.4.0b1.dist-info/RECORD,,
+README.md,sha256=s7OIBydFWLmxfWaLGhJusb00lMnOLawHUhWgN35BDbQ,9732
+nonebot_plugin_l4d2_server-0.4.0b2.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+nonebot_plugin_l4d2_server-0.4.0b2.dist-info/METADATA,sha256=eaSiSsSP1ZP7-b1ZwmQCpfpGZJtgciJajECbvzx8w-Q,11464
+nonebot_plugin_l4d2_server-0.4.0b2.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+nonebot_plugin_l4d2_server-0.4.0b2.dist-info/RECORD,,