nonebot-plugin-l4d2-server 0.5.6.7__tar.gz → 0.5.7__tar.gz

{nonebot_plugin_l4d2_server-0.5.6.7 → nonebot_plugin_l4d2_server-0.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 0.5.6.7
+Version: 0.5.7
 Summary: L4D2 server related operations plugin for NoneBot2
 Home-page: https://github.com/Agnes4m/nonebot_plugin_l4d2_server
 License: GPLv3

{nonebot_plugin_l4d2_server-0.5.6.7 → nonebot_plugin_l4d2_server-0.5.7}/nonebot_plugin_l4d2_server/__init__.py

@@ -14,6 +14,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
+from nonebot import require
+require('nonebot_plugin_apscheduler')
+require('nonebot_plugin_htmlrender')
+require('nonebot_plugin_txt2img')
 from .l4d2_web import web,webUI
 
 from typing import Tuple,Union,List
@@ -78,7 +82,7 @@ logo ="""
     """
 
 
-__version__ = "0.5.6"
+__version__ = "0.5.7"
 __plugin_meta__ = PluginMetadata(
     name="求生之路小助手",
     description='群内对有关求生之路的查询和操作',
@@ -292,7 +296,7 @@ async def _(matcher:Matcher,event:MessageEvent,keyword:str = Keyword()):
         await matcher.finish()
     ip_list = split_maohao(one_msg)
     msg = await queries_server(ip_list)
-    await matcher.finish(msg)
+    await str_to_picstr(msg,matcher)
     
 
 @add_queries.handle()

{nonebot_plugin_l4d2_server-0.5.6.7 → nonebot_plugin_l4d2_server-0.5.7}/nonebot_plugin_l4d2_server/l4d2_file/input_json.py

@@ -58,6 +58,6 @@ async def up_date(data, name):
     
     file_path = directory / name
     with open(file_path, 'w') as json_file:
-        json.dump(data, json_file)
+        json.dump(data, json_file,ensure_ascii=False)
     
     return True

{nonebot_plugin_l4d2_server-0.5.6.7 → nonebot_plugin_l4d2_server-0.5.7}/nonebot_plugin_l4d2_server/l4d2_queries/__init__.py

@@ -4,7 +4,6 @@ from typing import List
 async def queries(ip:str,port:int):
     port = int(port)
     msg_dict = await queries_dict(ip,port)
-    message = 'ip:' + msg_dict['ip'] + '\n'
     message += '名称：' + msg_dict['name'] + '\n'
     message += f"地图：{msg_dict['map_']}\n"
     message += f"延迟：{msg_dict['ping']}\n"

{nonebot_plugin_l4d2_server-0.5.6.7 → nonebot_plugin_l4d2_server-0.5.7}/nonebot_plugin_l4d2_server/l4d2_utils/command.py

@@ -139,11 +139,12 @@ async def get_des_ip():
     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))
+        for one_tag in l4_config.l4_zl_tag:
+            ips = ALL_HOST[one_tag]
+            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
     await get_read_ip(ip_anne_list)
@@ -152,18 +153,18 @@ async def get_des_ip():
     @tan_jian.handle()
     async def _(matcher:Matcher,event:MessageEvent):
         msg = await get_tan_jian(ip_anne_list,1)
-        await matcher.finish(msg)  
+        await str_to_picstr(push_msg=msg,matcher=matcher) 
         
     @prison.handle()
     async def _(matcher:Matcher,event:MessageEvent):
         msg = await get_tan_jian(ip_anne_list,2)
-        await matcher.finish(msg)
+        await str_to_picstr(push_msg=msg,matcher=matcher)
 
     @open_prison.handle()
     async def _(matcher:Matcher,event:MessageEvent):
 
         msg = await get_tan_jian(ip_anne_list,3)
-        await matcher.finish(msg)
+        await str_to_picstr(push_msg=msg,matcher=matcher)
         
     
     
@@ -171,10 +172,6 @@ async def get_read_ip(ip_anne_list):
     get_ip = on_command('anne',aliases=server_key(),priority=80,block=True)
     @get_ip.handle()
     async def _(matcher:Matcher,start:str = CommandStart(),command: str = RawCommand(),args:Message = CommandArg()):
-        # global matchers
-        # if get_ip.plugin_name not in matchers:
-        #     matchers[get_ip.plugin_name] = []
-        # matchers[get_ip.plugin_name].append(get_ip)
         if start:
             command = command.replace(start,'')
         if command == 'anne':
@@ -186,14 +183,7 @@ async def get_read_ip(ip_anne_list):
         elif msg and isinstance(push_msg ,list):
             await matcher.finish(MessageSegment.image(push_msg[0]) + Message(push_msg[-1]))
         elif msg and isinstance(push_msg ,str):
-            if l4_config.l4_image:
-                lines = push_msg.splitlines()
-                first_str = lines[0]
-                last_str = lines[-1]
-                push_msg = '\n'.join(lines[1:-1])
-                await matcher.finish(mode_txt_to_img(first_str,push_msg)+Message(last_str))
-            else:
-                await matcher.finish(push_msg)
+            await str_to_picstr(push_msg,matcher)
 
 async def get_ip_to_mes(msg:str ,command: str = ''):   
     if not msg:
@@ -254,6 +244,6 @@ async def init():
     
    
     
-@driver.on_bot_connect
+@driver.on_startup
 async def _():
     await init()

{nonebot_plugin_l4d2_server-0.5.6.7 → nonebot_plugin_l4d2_server-0.5.7}/nonebot_plugin_l4d2_server/l4d2_utils/config.py

@@ -54,10 +54,10 @@ class L4d2GroupConfig(BaseModel):
 
 class L4d2Config(BaseModel):
     total_enable: bool = Field(True, alias='是否全局启用求生功能')
+    l4_image: bool = Field(False , alias='是否启用图片')
     web_username: str = Field('l4d2', alias='后台管理用户名')
     web_password: str = Field('admin', alias='后台管理密码')
     l4_style: str = Field("standard", alias='图片风格')
-    l4_image: bool = Field(False , alias='是否启用图片')
     l4_ipall: List[Dict[str,Union[str,int,bool]]] = Field(
         [{
         'id_rank':'1',
@@ -89,6 +89,7 @@ class L4d2Config(BaseModel):
     l4_only:bool = Field(False, alias='下载地图是是否阻碍其他指令')
     l4_push_interval: int = Field(3, alias='定时任务间隔')
     l4_push_times: int = Field(10, alias='定时任务次数')
+    l4_connect: bool = Field(True, alias="是否在查服命令后加入connect ip")
     group_config: Dict[int, L4d2GroupConfig] = Field({}, alias='分群配置')
 
     def update(self, **kwargs):

{nonebot_plugin_l4d2_server-0.5.6.7 → nonebot_plugin_l4d2_server-0.5.7}/nonebot_plugin_l4d2_server/l4d2_utils/utils.py

@@ -1,6 +1,7 @@
 
 from nonebot.adapters.onebot.v11 import Bot,MessageEvent,GroupMessageEvent
 from nonebot.log import logger
+from nonebot.matcher import Matcher
 import struct
 import httpx
 import os
@@ -15,6 +16,7 @@ from ..l4d2_queries import queries,player_queries
 from ..l4d2_queries.qqgroup import *
 from ..l4d2_server.workshop import workshop_to_dict
 from ..l4d2_image.steam import url_to_byte
+from .txt_to_img import mode_txt_to_img
 import tempfile
 import random
 
@@ -140,6 +142,7 @@ async def queries_server(msg:list) -> str:
     try:
         msgs = await  queries(ip,port)
         msgs += await player_queries(ip,port)
+        msgs += f"connect {ip}:{port}"
     except (struct.error,TimeoutError):
         pass
     # except Exception:
@@ -304,4 +307,21 @@ async def extract_last_digit(msg: str) -> tuple[str, str]:
             last_digit = msg[i]
             new_msg = msg[:i]
             return new_msg, last_digit
-    return msg, ''
+    return msg, ''
+
+async def str_to_picstr(push_msg:str,matcher:Matcher):
+    """判断图片输出还是正常输出"""
+    if l4_config.l4_image:
+        lines = push_msg.splitlines()
+        first_str = lines[0]
+        last_str = lines[-1]
+        push_msg = '\n'.join(lines[1:-1])
+        if l4_config.l4_connect:
+            await matcher.send(mode_txt_to_img(first_str,push_msg)+last_str)
+        else:
+            await matcher.send(mode_txt_to_img(first_str,push_msg))
+    else:
+        if l4_config.l4_connect:
+            await matcher.send(push_msg)
+        else:
+            await matcher.send('\n'.join(push_msg.splitlines()[1:-1]))

{nonebot_plugin_l4d2_server-0.5.6.7 → nonebot_plugin_l4d2_server-0.5.7}/nonebot_plugin_l4d2_server/l4d2_web/webUI.py

@@ -68,6 +68,9 @@ global_config_form = Form(
         Switch(label='是否优先上传地图', name='l4_only', value='${l4_only}', onText='开启', offText='关闭',
                labelRemark=Remark(shape='circle',
                                   content='开启时，上传地图会保证优先级，从而阻碍其他指令')),
+        Switch(label='是否显示connect', name='l4_connect', value='${l4_connect}', onText='开启', offText='关闭',
+               labelRemark=Remark(shape='circle',
+                                  content='关闭后，查询服务器将不再显示connect和ip地址')),
         InputNumber(label='定时推送间隔（min）', name='l4_push_interval', value='${l4_push_interval}',
                   labelRemark=Remark(shape='circle',
                                      content='设置好后，使用推送服务器定时指令，将以x分钟为间隔推送一次')),
@@ -83,11 +86,11 @@ global_config_form = Form(
                  labelRemark=Remark(shape='circle',
                                     content='在这里加入的用户，才能上传地图')),           
 
-        InputTag(label='求生上传地图用户', name='l4_master', value='${l4_master}',
+        InputTag(label='坐牢三指令tag', name='l4_zl_tag', value='${l4_zl_tag}',
                  enableBatchAdd=True,
                  placeholder='添加qq号', visibleOn='${total_enable}', joinValues=False, extractValue=True,
                  labelRemark=Remark(shape='circle',
-                                    content='在这里加入的用户，才能上传地图')),
+                                    content='在这里的指令，可以响应坐牢三指令')),
 
     ],
     actions=[Action(label='保存', level=LevelEnum.success, type='submit'),

{nonebot_plugin_l4d2_server-0.5.6.7 → nonebot_plugin_l4d2_server-0.5.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-plugin-l4d2-server"
-version = "0.5.6.7"
+version = "0.5.7"
 description = "L4D2 server related operations plugin for NoneBot2"
 authors = ["Agnes_Digital <Z735803792@163.com>"]
 license = "GPLv3"