nonebot-plugin-l4d2-server 0.3.5a1__py3-none-any.whl → 0.3.5b1__py3-none-any.whl

README.md

@@ -294,6 +294,20 @@ anne:<br>
 <details>
 <summary>展开/收起</summary>
 
+### 0.3.5--2022.3
+
+ - 新增ping查询（在ip里包括）
+ - 新增api查询（未完成）
+
+### 0.3.4--2022.3.1
+
+ - 新增本地插件smx查询
+ - 增加了三个内置群服
+ - 修改了图片的UI,变好看了
+ - 删减了部分图片和字体，使得轻量化
+ - 修复了海量bug
+ - 修复了python3.8中typing错误
+
 ### 0.3.3--2022.2.26
 
  - 重写协议，使用a2s库，同时解决win端不同报错无法输出

nonebot_plugin_l4d2_server/__init__.py

@@ -29,6 +29,7 @@ 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_file import updown_l4d2_vpk,all_zip_to_one
+from .l4d2_queries.maps import seach_map,map_dict_to_str
 from .txt_to_img import mode_txt_to_img
 # from .l4d2_server import RCONClient
 from nonebot import get_bot, require
@@ -453,6 +454,19 @@ async def _():
     msg = mes_list(msg,name_smx).replace(" ","")
     await find_vpk.finish(mode_txt_to_img(mes,msg))
     
+@search_api.handle()
+async def _(args:Message = CommandArg()):
+    msg:str = args.extract_plain_text()
+    # if msg.startswith('代码'):
+        # 建图代码返回三方图信息
+    data = await seach_map(msg,l4_master[0],l4_key)
+    # else:
+    if type(data) == str:
+        await search_api.finish(data)
+    else:
+        await search_api.finish(await map_dict_to_str(data))
+        
+    
 @driver.on_shutdown
 async def close_db():
     """关闭数据库"""

nonebot_plugin_l4d2_server/command.py

@@ -86,6 +86,7 @@ show_queries = on_command('showq',aliases={"求生订阅"},priority=20,block=Tru
 join_server = on_command('showq',aliases={"求生加入"},priority=20,block=True)
 connect_rcon = on_command("Rrcon", aliases={"求生连接", '求生链接','求生rcon'}, priority=50, block=False)
 end_connect = ['stop', '结束', '连接结束', '结束连接']
+search_api = on_command('search',aliases={'求生三方'}, priority=50, block=True)
 
 
 # 下载内容

nonebot_plugin_l4d2_server/config.py

@@ -89,6 +89,11 @@ try:
 except:
     l4_style:str = ''
 
+try:
+    l4_key:str = nonebot.get_driver().config.l4_key
+except:
+    l4_key:str = ""
+
 l4_list = [l4_file, l4_steamid, l4_host, l4_port, l4_rcon, l4_master]
 l4_list = [ast.literal_eval(i) if isinstance(i, str) else i for i in l4_list]
 l4_file, l4_steamid, l4_host, l4_port, l4_rcon, l4_master = l4_list

nonebot_plugin_l4d2_server/l4d2_queries/__init__.py

@@ -7,7 +7,7 @@ async def queries(ip:str,port:int):
     message = 'ip:' + msg_dict['ip'] + '\n'
     message += '名称：' + msg_dict['name'] + '\n'
     message += f"地图：{msg_dict['map_']}\n"
-    message += f"Ping：{msg_dict['ping']}\n"
+    message += f"延迟：{msg_dict['ping']}\n"
     message += f"玩家：{msg_dict['players']} / {msg_dict['max_players']}\n"
     return message
 

nonebot_plugin_l4d2_server/l4d2_queries/maps.py

@@ -0,0 +1,27 @@
+import httpx
+
+
+async def seach_map(msg:str,qq:str,key:str):
+    url = "http://106.13.207.45:4015/l4d2"
+    json = {
+        "mode":"zh",
+        "map_name":msg,
+        "qq":qq,
+        "key":key
+    }
+    print(json)
+    file = httpx.post(url,json=json)
+    if file.status_code == 200:
+        return file.json()
+    elif file.status_code == 204:
+        return "没有结果"
+    elif file.status_code == 406:
+        return "参数错误"
+    elif file.status_code == 401:
+        return file.json()
+
+async def map_dict_to_str(data:dict):
+    msg = ""
+    for key,value in data[0].items():
+        msg += f"{key}:{value}\n"
+    return msg

nonebot_plugin_l4d2_server/l4d2_queries/qqgroup.py

@@ -248,9 +248,11 @@ async def write_json(data_str:str):
                 return '序号不正确，请输入【求生更新 删除 腐竹 序号】'
         return '腐竹名不存在，请输入【求生更新 删除 腐竹 序号】'    
     
-
-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))
+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.3.5a1.dist-info → nonebot_plugin_l4d2_server-0.3.5b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 0.3.5a1
+Version: 0.3.5b1
 Summary: L4D2 server related operations plugin for NoneBot
 Home-page: https://github.com/Umamusume-Agnes-Digital/nonebot_plugin_l4d2_server
 License: MIT
@@ -337,6 +337,20 @@ anne:<br>
 <details>
 <summary>展开/收起</summary>
 
+### 0.3.5--2022.3
+
+ - 新增ping查询（在ip里包括）
+ - 新增api查询（未完成）
+
+### 0.3.4--2022.3.1
+
+ - 新增本地插件smx查询
+ - 增加了三个内置群服
+ - 修改了图片的UI,变好看了
+ - 删减了部分图片和字体，使得轻量化
+ - 修复了海量bug
+ - 修复了python3.8中typing错误
+
 ### 0.3.3--2022.2.26
 
  - 重写协议，使用a2s库，同时解决win端不同报错无法输出

{nonebot_plugin_l4d2_server-0.3.5a1.dist-info → nonebot_plugin_l4d2_server-0.3.5b1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-nonebot_plugin_l4d2_server/__init__.py,sha256=-pNoCRz4MHflw5AIoBJe3rBtwA0rOHHNGBbBm8VMNXA,16895
-nonebot_plugin_l4d2_server/command.py,sha256=ZjjBCSERsSYvbsBP5FSKfpT9ng3zhgGwQwQ2dFi_HEM,4974
-nonebot_plugin_l4d2_server/config.py,sha256=nXfbAAS7EhxFNIS61vdXXmGbYfNEj1wCB19i3eh5bK4,3959
+nonebot_plugin_l4d2_server/__init__.py,sha256=JJeOO4zcV_p-XFlUWpn_YwUa1NW3KJ5THDM5mIi2qNQ,17361
+nonebot_plugin_l4d2_server/command.py,sha256=DLI5A_tNH_ZNoH1qERK854yFkws5FVa_45c3rzXZKPo,5059
+nonebot_plugin_l4d2_server/config.py,sha256=CBbWzE5PQnY6AESykoiKyRFzTrJ5cm_3ZniNxZcSfhE,4050
 nonebot_plugin_l4d2_server/data/L4D2/image/head/head.png,sha256=Z72PEvp7xF1DZcLDeuWlg2_g6JAfHxtisptWn6BYGN8,158357
 nonebot_plugin_l4d2_server/data/L4D2/image/header/player1.jpg,sha256=2A_llIi9YVhJs9JOMuF36by7Ewc7P7qOgQS8t5jemNw,405369
 nonebot_plugin_l4d2_server/data/L4D2/image/template/anne.html,sha256=oFpQfCIN0CKoEfjAb8aUOYD7l-kmPd1qCSF8E6bosY8,1567
@@ -27,9 +27,10 @@ nonebot_plugin_l4d2_server/l4d2_image/htmlimg.py,sha256=bz1oJn-CUoPuBktJxGLrm1Fs
 nonebot_plugin_l4d2_server/l4d2_image/send_image_tool.py,sha256=DKliVudSSeec4Gl5Deji04-P4_bbSIvXWorEIPQpKDc,968
 nonebot_plugin_l4d2_server/l4d2_image/steam.py,sha256=-N0dcTmnCu5UOjUik0UMWR3pTlCQK7PnkxGuZpju-TU,2481
 nonebot_plugin_l4d2_server/l4d2_image/vtfs.py,sha256=2WuXE_4_5eVNExzYCTgZnKZrcE6CxqnDpjpKEA_FHCE,1427
-nonebot_plugin_l4d2_server/l4d2_queries/__init__.py,sha256=L4mHayvwONh0TjEwvSxdKqzyBvVY9QwJA4utK_BjN7I,3466
+nonebot_plugin_l4d2_server/l4d2_queries/__init__.py,sha256=Qv3aIDaqbP2J5zUXiOnfl9eJ1o0WKeGnC1qzOqfDgDo,3468
+nonebot_plugin_l4d2_server/l4d2_queries/maps.py,sha256=EcyHLVIa801qADz1zO-TZwSdQpr4aHZEGz_M-UeDQQ4,669
 nonebot_plugin_l4d2_server/l4d2_queries/ohter.py,sha256=HQzsbk10L5nUrPAaN-FvCJO9kmfOyXz8nrnZZezg8Ss,888
-nonebot_plugin_l4d2_server/l4d2_queries/qqgroup.py,sha256=ylFSFYS8bSEyeOMDvF9daPX3MdwO28bPhIxoW3A5ZBQ,10175
+nonebot_plugin_l4d2_server/l4d2_queries/qqgroup.py,sha256=8fPLw5deTJXGKwgXUQSl1RZ_hmC9NhvEKFnXL7IAOaA,10227
 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
@@ -37,8 +38,8 @@ nonebot_plugin_l4d2_server/message.py,sha256=x_ts0HaW3SNOma-baEG0oaeozKE5Nh_fybn
 nonebot_plugin_l4d2_server/seach.py,sha256=FOtFWYVWNxt-tMFXdVN7_F1vBTKlTDdRljoUWFQzB9w,1021
 nonebot_plugin_l4d2_server/txt_to_img.py,sha256=ZaxHYNu8aAZUH4fNALyE1Q_ET7KuWytEiMFZ9loZnqc,2188
 nonebot_plugin_l4d2_server/utils.py,sha256=7hPjQLLhBCjiOCcKA7KAfiLimRx940iWaugD3dnaNCA,8348
-README.md,sha256=xQ63Y_xBl7OV1yiJ-Vbsbv3DWllIy6zN907oWqSXdKk,16458
-nonebot_plugin_l4d2_server-0.3.5a1.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-nonebot_plugin_l4d2_server-0.3.5a1.dist-info/METADATA,sha256=ZgR7HiLW8_YVVUI_XBXD-lBPTlzpYwy_Y60oKKZvO-c,17860
-nonebot_plugin_l4d2_server-0.3.5a1.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-nonebot_plugin_l4d2_server-0.3.5a1.dist-info/RECORD,,
+README.md,sha256=M9oUOc4iRX8XGJNTj_QFM0lzkpv_duBDYylRnatUy18,16798
+nonebot_plugin_l4d2_server-0.3.5b1.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+nonebot_plugin_l4d2_server-0.3.5b1.dist-info/METADATA,sha256=QwMBJrXv5aa16o0vhjSNEwlqaFEkOpyPeY5CB1hZOOs,18186
+nonebot_plugin_l4d2_server-0.3.5b1.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+nonebot_plugin_l4d2_server-0.3.5b1.dist-info/RECORD,,