PyPI - nonebot-plugin-l4d2-server - Versions diffs - 0.6.3.post1__tar.gz → 0.6.4.post1__tar.gz - Mend

nonebot-plugin-l4d2-server 0.6.3.post1tar.gz → 0.6.4.post1tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (72) hide show

{nonebot_plugin_l4d2_server-0.6.3.post1 → nonebot_plugin_l4d2_server-0.6.4.post1}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 0.6.3.post1
+Version: 0.6.4.post1
 Summary: L4D2 server related operations plugin for NoneBot2
 Keywords: steam game l4d2 nonebot2 plugin
 Home-page: https://github.com/Agnes4m/nonebot_plugin_l4d2_server

{nonebot_plugin_l4d2_server-0.6.3.post1 → nonebot_plugin_l4d2_server-0.6.4.post1}/nonebot_plugin_l4d2_server/__init__.py RENAMED Viewed

@@ -41,7 +41,7 @@ from .l4d2_web import web, webUI  # noqa: F401
 driver = get_driver()
-__version__ = "0.6.3"
+__version__ = "0.6.4"
 __plugin_meta__ = PluginMetadata(
     name="求生之路小助手",
     description="可用于管理求生之路查服和本地管理",
@@ -74,7 +74,7 @@ __plugin_meta__ = PluginMetadata(
 @help_.handle()
 async def _(matcher: Matcher):
     msg = """=====求生机器人帮助=====
-    1、电信服战绩查询【求生anne[id/steamid/@]】
+    1、电信服战绩查询【求生anne | Ranne[id/steamid/@]】
     2、电信服绑定【求生绑定[id/steamid]】",
     3、电信服状态查询【云xx】
     4、创意工坊下载【创意工坊下载[物品id/链接]】
@@ -87,6 +87,8 @@ async def _(matcher: Matcher):
 @search_api.got("is_sure", prompt='如果需要上传，请发送 "yes"')
 async def _(matcher: Matcher, bot: Bot, event: GroupMessageEvent, state: T_State):
+    if not l4_config.l4_group_upload:
+        return
     is_sure = str(state["is_sure"])
     if is_sure == "yes":
         data_dict: dict = state["maps"][0]

{nonebot_plugin_l4d2_server-0.6.3.post1 → nonebot_plugin_l4d2_server-0.6.4.post1}/nonebot_plugin_l4d2_server/data/L4D2/image/template/group_ip.html RENAMED Viewed

@@ -222,7 +222,7 @@
             <div class="plugin">
                 <div class="plugin_meta">
                     <div class="plugin_meta_line1">
-                        <div class="plugin_name">{{ plugin.number }}:{{ plugin.name }}</div>
+                        <div class="plugin_name">{{ plugin.server_id }}:{{ plugin.server_tag }}</div>
                         <div class="plugin_status">
                             <label class="switch">
                                 <input class="checkbox" type="checkbox" {% if plugin.enabled %} checked {% endif %} />
@@ -233,18 +233,18 @@
                         </div>
                     </div>
                     <div class="plugin_meta_line2">
-                        <font color="blue">{{ plugin.map_ }}</font><br>
-                        {% for Player in plugin.Players %}
-                        <font color="green">{{ Player }}</font><br>
-                        {% endfor %}
+                        <font color="blue">服务器在线：{{ plugin.server_number }} / {{ plugin.server_all_number }}</font><br>
+                        <font color="blue"></font><br>
+                        <font color="green">服务器玩家{{ plugin.server_people }} / {{ plugin.server_all_people }}</font><br>
+                        <font color="green"></font><br>
                     </div>
-                    <div class="plugin_meta_line3">
+                    <!-- <div class="plugin_meta_line3">
                         <svg width="13px" height="13px">
                             <image xlink:href="{{ plugin.system }}" width="13px" height="13px" />
                         </svg>
                         <div class="package_name">&nbsp{{ plugin.max_players }} </div>
                         <div class="package_name">&nbsp{{ plugin.tick }} </div>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             {% endfor %}

nonebot_plugin_l4d2_server-0.6.4.post1/nonebot_plugin_l4d2_server/data/L4D2/image/template/ip.html ADDED Viewed

@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html class="pc">
+<head>
+    <link rel="stylesheet" type="text/css" href="vue.css">
+    <title>Server Information</title>
+    <style>
+        table {
+            border-collapse: collapse;
+            width: 100%;
+        }
+        th,
+        td {
+            border: 1px solid #ddd;
+            padding: 8px;
+            text-align: left;
+        }
+        th {
+            background-color: #f2f2f2;
+        }
+    </style>
+</head>
+<body style="background-image: url('back2.jpg'); background-size: 1200px 1800px;">
+    <div class="myinfo">
+        <table>
+            {% for i in range(0, data|length, 3) %}
+            <tr>
+                {% for j in range(i, i + 3) %}
+                {% if j < data|length %} <td>
+                    <font color="red">{{ data[j].number }}</font><br>
+                    <font color="yellow">{{ data[j].name }}</font><br>
+                    <font color="gray">{{ data[j].ip }}</font><br>
+                    <font color="blue">{{ data[j].map_ }}</font><br>
+                    {% for Player in data[j].Players %}
+                    <font color="green">{{ Player }}</font><br>
+                    {% endfor %}
+                    <font color="yellow">{{ data[j].max_players }}{{data[j].ping}}</font>
+                    </td>
+                    {% endif %}
+                    {% endfor %}
+            </tr>
+            {% endfor %}
+        </table>
+        <h5>
+            <center>©爱丽数码</center></br>
+            <center>
+                github.com/Agnes4m/nonebot_plugin_l4d2_server
+            </center>
+        </h5>
+    </div>
+</html>

{nonebot_plugin_l4d2_server-0.6.3.post1 → nonebot_plugin_l4d2_server-0.6.4.post1}/nonebot_plugin_l4d2_server/l4d2_file/__init__.py RENAMED Viewed

@@ -53,6 +53,8 @@ smx_file = on_command(
 @up.handle()
 async def _(matcher: Matcher, event: NoticeEvent):
+    if not l4_config.l4_group_upload:
+        return
     args = event.dict()
     if args["notice_type"] != "offline_file":
         matcher.set_arg("txt", args)  # type: ignore

{nonebot_plugin_l4d2_server-0.6.3.post1 → nonebot_plugin_l4d2_server-0.6.4.post1}/nonebot_plugin_l4d2_server/l4d2_image/__init__.py RENAMED Viewed

@@ -4,7 +4,7 @@ import jinja2
 from nonebot.log import logger
 from nonebot_plugin_htmlrender import html_to_pic
-from ..l4d2_utils.classcal import PlayerInfo, ServerStatus
+from ..l4d2_utils.classcal import PlayerInfo, ServerGroup, ServerStatus
 # from .htmlimg import dict_to_dict_img
 # from ..l4d2_anne.anne_telecom import ANNE_API
@@ -107,3 +107,18 @@ async def get_help_img(plugins: List[ServerStatus]) -> Optional[bytes]:
     except Exception as e:
         logger.warning(f"Error in get_help_img: {e}")
         return None
+async def server_group_ip_pic(msg_list: List[ServerGroup]):
+    """
+    输入一个群组字典列表，输出图片
+    msg_dict:folder/name/map_/players/max_players/Players/[Name]
+    """
+    template = env.get_template("group_ip.html")
+    html = await template.render_async(plugins=msg_list)
+    return await html_to_pic(
+        html=html,
+        wait=0,
+        viewport={"width": 1100, "height": 800},
+        template_path=f"file://{template_path.absolute()}",
+    )

{nonebot_plugin_l4d2_server-0.6.3.post1 → nonebot_plugin_l4d2_server-0.6.4.post1}/nonebot_plugin_l4d2_server/l4d2_queries/__init__.py RENAMED Viewed

@@ -11,6 +11,7 @@ from nonebot.params import ArgPlainText, CommandArg, CommandStart, Keyword, RawC
 from nonebot_plugin_saa import Image, MessageFactory, Text
 from ..l4d2_anne.server import updata_anne_server
+from ..l4d2_image import server_group_ip_pic
 from ..l4d2_queries.qqgroup import add_ip, del_ip, get_number_url, show_ip
 from ..l4d2_queries.utils import queries_server
 from ..l4d2_server.rcon import command_server
@@ -20,7 +21,7 @@ from ..l4d2_utils.utils import split_maohao, str_to_picstr
 from .himi import get_himi_ip
 from .local_ip import ALL_HOST
 from .qqgroup import get_tan_jian
-from .send_msg import get_ip_to_mes
+from .send_msg import get_group_ip_to_msg, get_ip_to_mes
 from .utils import server_key
 tan_jian = on_command("tj", aliases={"探监"}, priority=20, block=True)
@@ -134,32 +135,50 @@ async def get_read_ip(ip_anne_list: List[Tuple[str, str, str]]):
         command: str = RawCommand(),
         args: Message = CommandArg(),
     ):
+        """例：
+        指令：  /橘5
+        start: /(command开头指令)
+        command: /橘(响应的全部指令)
+        args: 5(响应的指令后的数字)
+        """
+        print(start, command, args)
         if start:
             command = command.replace(start, "")
         if command == "anne":
             command = "云"
         msg: str = args.extract_plain_text()
-        push_msg = await get_ip_to_mes(msg, command)
-        if push_msg is None:
-            return
-        if isinstance(push_msg, bytes):
-            logger.info("直接发送图片")
-            await MessageFactory([Image(push_msg)]).finish()
-            return
-        if msg and type(push_msg) == list:
-            logger.info("更加构造函数")
-            await MessageFactory([Image(push_msg[0]), Text(push_msg[-1])]).finish()
-            return
-        if msg and isinstance(push_msg, str):
-            send_msg = push_msg
+        if "组" in msg:
+            logger.info(f"关键词：{command}")
+            # 以群组模式输出
+            push_msg = await get_group_ip_to_msg(command)
+            if push_msg is None or not push_msg:
+                await matcher.finish("当前对象里并没有组")
+                return
+            print(push_msg)
+            msg_img = await server_group_ip_pic(push_msg)
+            await MessageFactory([Image(msg_img)]).send()
         else:
-            logger.info("出错了")
-            return
-        logger.info(type(send_msg))
-        if not send_msg:
-            logger.warning("没有")
-        await matcher.finish(send_msg)
+            push_msg = await get_ip_to_mes(msg, command)
+            if push_msg is None:
+                return
+            if isinstance(push_msg, bytes):
+                logger.info("直接发送图片")
+                await MessageFactory([Image(push_msg)]).finish()
+                return
+            if msg and isinstance(push_msg, list):
+                logger.info("更加构造函数")
+                await MessageFactory([Image(push_msg[0]), Text(push_msg[-1])]).finish()
+                return
+            if msg and isinstance(push_msg, str):
+                send_msg = push_msg
+            else:
+                logger.info("出错了")
+                return
+            logger.info(type(send_msg))
+            if not send_msg:
+                logger.warning("没有")
+            await matcher.finish(send_msg)
 # tests = on_command("测试1")

nonebot_plugin_l4d2_server-0.6.4.post1/nonebot_plugin_l4d2_server/l4d2_queries/send_msg.py ADDED Viewed

@@ -0,0 +1,130 @@
+import asyncio
+from typing import Dict, List, Optional, Tuple
+from nonebot.log import logger
+from ..l4d2_queries.local_ip import ALL_HOST
+from ..l4d2_queries.qqgroup import qq_ip_queries_pic
+from ..l4d2_queries.utils import get_anne_server_ip, json_server_to_tag_dict
+from ..l4d2_utils.classcal import ServerGroup, ServerStatus
+from ..l4d2_utils.utils import split_maohao
+from .local_ip import Group_All_HOST
+from .qqgroup import qq_ip_querie
+async def get_ip_to_mes(msg: str, command: str = ""):
+    if not msg:
+        # 以图片输出全部当前
+        igr = False
+        # if command in gamemode_list:
+        #     this_ips = [
+        #         d for l in ALL_HOST.values() for d in l if d.get("version") == command
+        #     ]
+        #     igr = True
+        # else:
+        this_ips = ALL_HOST[command]
+        ip_list: List[Tuple[str, str, str]] = []
+        for one_ip in this_ips:
+            host, port = split_maohao(one_ip["ip"])
+            msg_tuple = (one_ip["id"], host, port)
+            ip_list.append(msg_tuple)
+        img = await qq_ip_queries_pic(ip_list, igr)
+        return img if img else None
+    if not msg[0].isdigit():
+        # if any(mode in msg for mode in gamemode_list):
+        #     pass
+        # else:
+        return None
+    message = await json_server_to_tag_dict(command, msg)
+    if len(message) == 0:
+        # 关键词不匹配，忽略
+        return None
+    ip = str(message["ip"])
+    logger.info(ip)
+    try:
+        msg_send: Optional[str] = await get_anne_server_ip(ip)
+        if msg_send is not None:
+            return msg_send
+    except (OSError, asyncio.exceptions.TimeoutError):
+        return "服务器无响应"
+# async def get_read_group_ip():
+#     """输出群组服务器"""
+#     get_grou_ip = on_command("anne", aliases=group_key(), priority=80, block=True)
+#     @get_grou_ip.handle()
+#     async def _(
+#         matcher: Matcher,
+#         start: str = CommandStart(),
+#         command: str = RawCommand(),
+#         args: Message = CommandArg(),
+#     ):
+#         if start:
+#             command = command.replace(start, "")
+#         msg: str = args.extract_plain_text()
+#         push_msg = await get_group_ip_to_msg(msg, command)
+#         msg_img = await server_group_ip_pic(push_msg)
+#         if isinstance(push_msg, bytes):
+#             await MessageFactory([Image(push_msg)]).finish()
+#         elif msg and type(push_msg) == list:
+#             await MessageFactory([Image(push_msg[0]), Text(push_msg[-1])]).finish()
+#         elif msg and isinstance(push_msg, str):
+#             await str_to_picstr(push_msg, matcher)
+#         await matcher.finish()
+async def get_group_ip_to_msg(command: str):
+    """输出群组ip的dict信息"""
+    if command in Group_All_HOST:
+        group_tag_list: List[str] = Group_All_HOST[command]
+    elif command in ALL_HOST:
+        group_tag_list = [command]
+    else:
+        return None
+    logger.info(f"组内关键词{group_tag_list}")
+    group_ip_dict: Dict[str, List[Dict[str, str]]] = {}
+    tag = len(group_tag_list) == 0
+    return_list: List[ServerGroup] = []
+    id_number = 0
+    for tag, one_group in ALL_HOST.items():
+        id_number += 1
+        if tag in group_tag_list and tag:
+            group_ip_dict.update({tag: one_group})
+            ip_tuple_list: List[Tuple[str, str, int]] = []
+            for one_server in one_group:
+                number = one_server["id"]
+                host, port = split_maohao(one_server["ip"])
+                ip_tuple_list.append((number, host, int(port)))
+            msg_group_server = await qq_ip_querie(ip_tuple_list)
+            return_list.append(
+                await check_group_msg(msg_group_server, id_number, command),
+            )
+    return return_list
+    # 还没写完
+    #     host, port = split_maohao(one_ip["ip"])
+    #     msg_tuple = (one_ip["id"], host, port)
+    #     ip_list.append(msg_tuple)
+    # img = await qq_ip_queries_pic(ip_list, igr)
+async def check_group_msg(msg: Dict[str, List[ServerStatus]], number: int, command: str):
+    server_info = ServerGroup()
+    server_info.server_id = number
+    for server_group in msg["msg_list"]:
+        # 服务器，服务器玩家数量
+        # 当前/总数
+        server_info.server_tag = command
+        if server_group.name == "null":
+            server_info.server_all_number += 1
+            continue
+        server_info.server_all_number += 1
+        server_info.server_number += 1
+        server_info.server_people += server_group.players
+        server_info.server_all_people += server_group.max_players
+    return server_info

{nonebot_plugin_l4d2_server-0.6.3.post1 → nonebot_plugin_l4d2_server-0.6.4.post1}/nonebot_plugin_l4d2_server/l4d2_utils/classcal.py RENAMED Viewed

@@ -39,6 +39,10 @@ class ServerStatus(BaseModel):
 class ServerGroup(BaseModel):
     """组服务器信息"""
+    server_id: int = 0
+    """服务器序号"""
+    server_tag: str = "服务器"
+    """服务器组名字"""
     server_number: int = 0
     """群组当期启动服务器数量"""
     server_all_number: int = 0

{nonebot_plugin_l4d2_server-0.6.3.post1 → nonebot_plugin_l4d2_server-0.6.4.post1}/nonebot_plugin_l4d2_server/l4d2_utils/config.py RENAMED Viewed

@@ -93,6 +93,7 @@ class L4d2Config(BaseModel):
     l4_push_interval: int = Field(3, alias="定时任务间隔")
     l4_push_times: int = Field(10, alias="定时任务次数")
     l4_connect: bool = Field(True, alias="是否在查服命令后加入connect ip")
+    l4_group_upload: bool = Field(False, alias="是否在群里传地图的时候，提示上传服务器")
     group_config: Dict[int, L4d2GroupConfig] = Field({}, alias="分群配置")
     def update(self, **kwargs):

{nonebot_plugin_l4d2_server-0.6.3.post1 → nonebot_plugin_l4d2_server-0.6.4.post1}/pyproject.toml RENAMED Viewed

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-l4d2-server"
-version = "0.6.3-post1"
+version = "0.6.4-post1"
 description = "L4D2 server related operations plugin for NoneBot2"
 authors = [
     { name = "Agnes_Digital", email = "Z735803792@163.com" },

nonebot_plugin_l4d2_server-0.6.3.post1/nonebot_plugin_l4d2_server/data/L4D2/image/template/ip.html DELETED Viewed

@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html class="pc">
-<head>
-	<link rel="stylesheet" type="text/css" href="vue.css">
-    <title>Server Information</title>
-    <style>
-        table {
-            border-collapse: collapse;
-            width: 100%;
-        }
-        th, td {
-            border: 1px solid #ddd;
-            padding: 8px;
-            text-align: left;
-        }
-        th {
-            background-color: #f2f2f2;
-        }
-    </style>
-</head>
-<body style="background-image: url('back2.jpg'); background-size: 1200px 1800px;">
-<div class="myinfo">
-<table>
-    {% for i in range(0, data|length, 3) %}
-        <tr>
-            {% for j in range(i, i + 3) %}
-                {% if j < data|length %}
-                    <td>
-                         <font color="red">{{ data[j].number }}</font><br>
-                        <font color="yellow">{{ data[j].name }}</font><br>
-                        <font color="gray">{{ data[j].ip }}</font><br>
-                        <font color="blue">{{ data[j].map_ }}</font><br>
-                        {% for Player in data[j].Players %}
-                            <font color="green">{{ Player }}</font><br>
-                        {% endfor %}
-                        <font color="yellow">{{ data[j].max_players }}{{data[j].ping}}</font>
-                    </td>
-                {% endif %}
-            {% endfor %}
-        </tr>
-    {% endfor %}
-</table>
-<h5><center>©爱丽数码</center></br>
-	<center>
-		github.com/Agnes4m/nonebot_plugin_l4d2_server
-	</center>
-</h5>
-</div>
-</html>

nonebot_plugin_l4d2_server-0.6.3.post1/nonebot_plugin_l4d2_server/l4d2_queries/send_msg.py DELETED Viewed

@@ -1,128 +0,0 @@
-import asyncio
-from typing import Dict, List, Tuple
-from nonebot import on_command
-from nonebot.adapters import Message
-from nonebot.log import logger
-from nonebot.matcher import Matcher
-from nonebot.params import CommandArg, CommandStart, RawCommand
-from nonebot_plugin_saa import Image, MessageFactory, Text
-from ..l4d2_queries.local_ip import ALL_HOST
-from ..l4d2_queries.qqgroup import qq_ip_queries_pic
-from ..l4d2_queries.utils import get_anne_server_ip, json_server_to_tag_dict
-from ..l4d2_utils.classcal import ServerGroup, ServerStatus
-from ..l4d2_utils.utils import split_maohao, str_to_picstr
-from .local_ip import Group_All_HOST
-from .qqgroup import qq_ip_querie
-from .utils import group_key
-async def get_ip_to_mes(msg: str, command: str = ""):
-    if not msg:
-        # 以图片输出全部当前
-        igr = False
-        # if command in gamemode_list:
-        #     this_ips = [
-        #         d for l in ALL_HOST.values() for d in l if d.get("version") == command
-        #     ]
-        #     igr = True
-        # else:
-        this_ips = ALL_HOST[command]
-        ip_list: List[Tuple[str, str, str]] = []
-        for one_ip in this_ips:
-            host, port = split_maohao(one_ip["ip"])
-            msg_tuple = (one_ip["id"], host, port)
-            ip_list.append(msg_tuple)
-        img = await qq_ip_queries_pic(ip_list, igr)
-        return img if img else None
-    if not msg[0].isdigit():
-        # if any(mode in msg for mode in gamemode_list):
-        #     pass
-        # else:
-        return None
-    message = await json_server_to_tag_dict(command, msg)
-    if len(message) == 0:
-        # 关键词不匹配，忽略
-        return None
-    ip = str(message["ip"])
-    logger.info(ip)
-    try:
-        msg_send = await get_anne_server_ip(ip)
-        if msg_send:
-            return msg_send
-    except (OSError, asyncio.exceptions.TimeoutError):
-        return "服务器无响应"
-async def get_read_group_ip():
-    """输出群组服务器"""
-    get_grou_ip = on_command("anne", aliases=group_key(), priority=80, block=True)
-    @get_grou_ip.handle()
-    async def _(
-        matcher: Matcher,
-        start: str = CommandStart(),
-        command: str = RawCommand(),
-        args: Message = CommandArg(),
-    ):
-        if start:
-            command = command.replace(start, "")
-        msg: str = args.extract_plain_text()
-        push_msg = await get_group_ip_to_msg(msg, command)
-        if isinstance(push_msg, bytes):
-            await MessageFactory([Image(push_msg)]).finish()
-        elif msg and type(push_msg) == list:
-            await MessageFactory([Image(push_msg[0]), Text(push_msg[-1])]).finish()
-        elif msg and isinstance(push_msg, str):
-            await str_to_picstr(push_msg, matcher)
-        await matcher.finish()
-async def get_group_ip_to_msg(command: str, text: str = ""):
-    """输出群组ip的dict信息"""
-    if not text:
-        group_tag_list: List[str] = Group_All_HOST[command]
-        group_ip_dict: Dict[str, List[Dict[str, str]]] = {}
-        tag = len(group_tag_list) == 0
-        for tag, one_group in ALL_HOST.items():
-            if tag in group_tag_list or tag:
-                group_ip_dict.update({tag: one_group})
-                ip_tuple_list: List[Tuple[str, str, int]] = []
-                for one_server in one_group:
-                    number = one_server["id"]
-                    host, port = split_maohao(one_server["ip"])
-                    ip_tuple_list.append((number, host, int(port)))
-                msg_group_server = await qq_ip_querie(ip_tuple_list)
-                return await check_group_msg(msg_group_server)
-    return None
-    # 还没写完
-    #     host, port = split_maohao(one_ip["ip"])
-    #     msg_tuple = (one_ip["id"], host, port)
-    #     ip_list.append(msg_tuple)
-    # img = await qq_ip_queries_pic(ip_list, igr)
-async def check_group_msg(
-    msg: Dict[str, List[ServerStatus]],
-):
-    send_msg: Dict[str, ServerGroup] = {}
-    if msg:
-        for tag, server_group in msg.items():
-            # 服务器，服务器玩家数量
-            # 当前/总数
-            server_info = ServerGroup()
-            for one_server in server_group:
-                if one_server.name == "null":
-                    server_info.server_all_number += 1
-                    continue
-                server_info.server_all_number += 1
-                server_info.server_number += 1
-                server_info.server_people += one_server.players
-                server_info.server_all_people += one_server.max_players
-            send_msg[tag] = server_info
-        return send_msg
-    return None