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

nonebot_plugin_l4d2_server/l4_image/convert.py

@@ -21,32 +21,28 @@ def core_font(size: int) -> ImageFont.FreeTypeFont:
 async def convert_img(
     img: Image.Image,
     is_base64: bool = False,
-) -> bytes:
-    ...
+) -> bytes: ...
 
 
 @overload
 async def convert_img(
     img: Image.Image,
-    is_base64: bool = True,
-) -> str:
-    ...
+    is_base64: bool = True,  # noqa: FBT001
+) -> str: ...
 
 
 @overload
 async def convert_img(
     img: bytes,
     is_base64: bool = False,
-) -> str:
-    ...
+) -> str: ...
 
 
 @overload
 async def convert_img(
     img: Path,
     is_base64: bool = False,
-) -> str:
-    ...
+) -> str: ...
 
 
 async def convert_img(
@@ -78,7 +74,7 @@ async def convert_img(
         async with aiofiles.open(img, "rb") as fp:
             img = await fp.read()
 
-    logger.success("图片处理完成！")
+    logger.success("图片处理完成!")
 
     return f"base64://{b64encode(img).decode()}"
 
@@ -90,7 +86,7 @@ def convert_img_sync(img_path: Path):
     return f"base64://{b64encode(img).decode()}"
 
 
-async def str_lenth(r: str, size: int, limit: int = 540) -> str:
+async def str_lenth(r: str, size: int, limit: int = 540) -> str:  # noqa: RUF029
     result = ""
     temp = 0
     for i in r:
@@ -158,7 +154,7 @@ async def text2pic(text: str, max_size: int = 800, font_size: int = 24):
 
     img = Image.new(
         "RGB",
-        (max_size, len(text) * font_size // 3),
+        (max_size, len(text) * font_size // 10),
         (255, 255, 255),
     )
     img_draw = ImageDraw.ImageDraw(img)
@@ -169,7 +165,7 @@ async def text2pic(text: str, max_size: int = 800, font_size: int = 24):
         core_font(font_size),
         "black",
         max_size - 80,
-        True,
+        True,  # noqa: FBT003
     )
     img = img.crop((0, 0, max_size, int(y + 80)))
     return await convert_img(img)

nonebot_plugin_l4d2_server/l4_image/download.py

@@ -27,20 +27,22 @@ async def download_url(url: str) -> bytes:
                 logger.warning(f"Error downloading {url}, retry {i}/3: {e}")
                 await asyncio.sleep(3)
 
-    raise Exception(f"{url} 下载失败！")
+    raise Exception(f"{url} 下载失败!")
 
 
 async def download_head(user_id: str) -> bytes:
     url = f"http://q1.qlogo.cn/g?b=qq&nk={user_id}&s=640"
     data = await download_url(url)
-    if hashlib.md5(data).hexdigest() == "acef72340ac0e914090bd35799f5594e":
+    if (
+        hashlib.md5(data).hexdigest() == "acef72340ac0e914090bd35799f5594e"
+    ):  # noqa: S324
         url = f"http://q1.qlogo.cn/g?b=qq&nk={user_id}&s=100"
         data = await download_url(url)
     return data
 
 
 def square_to_circle(im: ImageS):
-    """im是正方形，变圆形"""
+    """im是正方形,变圆形"""
     size = im.size
     mask = Image.new("L", size, 0)
     draw = ImageDraw.Draw(mask)
@@ -50,7 +52,7 @@ def square_to_circle(im: ImageS):
     return im
 
 
-async def get_head_by_user_id_and_save(user_id):
+async def get_head_by_user_id_and_save(user_id: str):
     """qq转头像"""
     user_id = str(user_id)
 
@@ -61,7 +63,7 @@ async def get_head_by_user_id_and_save(user_id):
         os.listdir(default_header_path),
     )
     default_head = default_head_path / random.choice(os.listdir(default_head_path))
-    ## im头像 im2头像框 im3合成
+    # im头像 im2头像框 im3合成
     if user_head_path.exists():
         logger.info("使用本地头像")
         im = Image.open(user_head_path).resize((280, 280)).convert("RGBA")
@@ -86,8 +88,8 @@ async def get_head_by_user_id_and_save(user_id):
                 return None
     im2 = Image.open(default_head).resize((450, 450)).convert("RGBA")
     im3 = Image.new("RGBA", im2.size, (255, 255, 255, 0))
-    r, g, b, a1 = im.split()
-    r, g, b, a2 = im2.split()
+    _, _, _, a1 = im.split()
+    _, _, _, a2 = im2.split()
     im = square_to_circle(im)
     im3.paste(im, (75, 75), mask=a1)
     im3.paste(im2, mask=a2)

nonebot_plugin_l4d2_server/l4_image/html_img.py

@@ -8,83 +8,50 @@ from nonebot_plugin_htmlrender import html_to_pic
 
 from ..config import config
 from ..utils.api.models import OutServer
-from .convert import convert_img
 
 # from .htmlimg import dict_to_dict_img
 # from ..l4d2_anne.anne_telecom import ANNE_API
-from .download import get_head_by_user_id_and_save
 
 template_path = Path(__file__).parent / "img/template"
 
 env = jinja2.Environment(
     loader=jinja2.FileSystemLoader(template_path),
     enable_async=True,
+    autoescape=True,
 )
 
 
-async def out_png(usr_id, data_dict: dict):
-    """使用html来生成图片"""
-    # content = template.render_async()
-    msg_dict = await dict_to_html(usr_id, data_dict)
-    template = env.get_template("anne.html")
-    html = await template.render_async(data=msg_dict)
-    return await html_to_pic(
-        html=html,
-        wait=0,
-        viewport={"width": 1100, "height": 800},
-        template_path=f"file://{template_path.absolute()}",
-    )
-
-
-async def dict_to_html(usr_id, detail_map: dict):
-    """输入qq、字典，获取新的msg替换html"""
-    detail_right = {}
-    detail_right["name"] = detail_map["Steam 名字:"]
-    detail_right["Steam_ID"] = detail_map["Steam ID:"]
-    detail_right["play_time"] = detail_map["游玩时间:"]
-    detail_right["last_online"] = detail_map["最后上线:"]
-    detail_right["rank"] = detail_map["排行:"]
-    detail_right["points"] = detail_map["分数:"]
-    detail_right["point_min"] = detail_map["每分钟获取分数:"]
-    detail_right["killed"] = detail_map["感染者消灭:"]
-    detail_right["shut"] = detail_map["爆头:"]
-    detail_right["out"] = detail_map["爆头率:"]
-    detail_right["playtimes"] = detail_map["游玩地图数量:"]
-    detail_right["url"] = detail_map["个人资料"]
-    detail_right["one_msg"] = detail_map["一言"]
-    detail_right["last_one"] = detail_map["救援关"]
-
-    # html_text = soup.prettify()
-    # for key, value in detail_right.items():
-    #     html_text = html_text.replace(key,value)
-    # 头像
-    temp = await get_head_by_user_id_and_save(usr_id)
-    # temp = await get_head_steam_and_save(usr_id,detail_right['url'])
-    if not temp:
-        return None
-    res = await convert_img(temp, is_base64=True)
-    detail_right["header"] = f"data:image/png;base64,{res}"
-    data_list: List[dict] = [detail_right]
-    return data_list
-
-
 async def server_ip_pic(server_dict: List[OutServer]):
     """
-    输入一个字典列表，输出图片
+    输入一个字典列表,输出图片
     msg_dict:folder/name/map_/players/max_players/Players/[Name]
     """
     for server_info in server_dict:
+        server_info["server"].player_count = (
+            0
+            if server_info["server"].player_count is None
+            else server_info["server"].player_count
+        )
+        server_info["server"].max_players = (
+            0
+            if server_info["server"].max_players is None
+            else server_info["server"].max_players
+        )
+
         max_number = config.l4_players
         if server_info.get("player"):
-            sorted_players = sorted(server_info["player"], key=lambda x: x.score)[
-                :max_number
-            ]
+            sorted_players = sorted(
+                server_info["player"],
+                key=lambda x: x.score,
+                reverse=True,
+            )[:max_number]
+            print(sorted_players)
             server_info["player"] = sorted_players
         else:
             server_info["player"] = []
 
         # server_info["server"].server_type= f"{server_info['server'].server_type}.svg"
-
+    print(server_dict)
     pic = await get_server_img(server_dict)
     if pic:
         logger.success("正在输出图片")
@@ -94,34 +61,38 @@ async def server_ip_pic(server_dict: List[OutServer]):
 
 
 async def get_server_img(plugins: List[OutServer]) -> Optional[bytes]:
-    # try:
-
-    if config.l4_style == "孤独摇滚":
-        template = env.get_template("Bocchi_The_Rock.html")
-    elif config.l4_style == "电玩像素":
-        template = env.get_template("Pixel.html")
-    elif config.l4_style == "缤纷彩虹":
-        template = env.get_template("Rainbow.html")
-    elif config.l4_style == "随机":
-        html_files = [str(f.name) for f in template_path.rglob("*.html") if f.is_file()]
-        template = env.get_template(random.choice(html_files))
-    else:
-        template = env.get_template("normal.html")
-    content = await template.render_async(plugins=plugins, max_count=config.l4_players)
-    return await html_to_pic(
-        content,
-        wait=0,
-        viewport={"width": 100, "height": 100},
-        template_path=f"file://{template_path.absolute()}",
-    )
-    # except Exception as e:
-    #     logger.warning(f"Error in get_help_img: {e}")
+    try:
+        if config.l4_style == "孤独摇滚":
+            template = env.get_template("Bocchi_The_Rock.html")
+        elif config.l4_style == "电玩像素":
+            template = env.get_template("Pixel.html")
+        elif config.l4_style == "缤纷彩虹":
+            template = env.get_template("Rainbow.html")
+        elif config.l4_style == "随机":
+            html_files = [
+                str(f.name) for f in template_path.rglob("*.html") if f.is_file()
+            ]
+            template = env.get_template(random.choice(html_files))
+        else:
+            template = env.get_template("normal.html")
+        content = await template.render_async(
+            plugins=plugins,
+            max_count=config.l4_players,
+        )
+        return await html_to_pic(
+            content,
+            wait=0,
+            viewport={"width": 100, "height": 100},
+            template_path=f"file://{template_path.absolute()}",
+        )
+    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]) -> bytes:
 #     """
-#     输入一个群组字典列表，输出图片
+#     输入一个群组字典列表,输出图片
 #     msg_dict:folder/name/map_/players/max_players/Players/[Name]
 #     """
 #     template = env.get_template("group_ip.html")

nonebot_plugin_l4d2_server/l4_image/image_tools.py

@@ -17,7 +17,7 @@ def get_div():
 
 
 async def sget(url: str):
-    async with httpx.AsyncClient(timeout=None) as client:
+    async with httpx.AsyncClient(timeout=None) as client:  # noqa: S113
         return await client.get(url=url)
 
 
@@ -44,7 +44,10 @@ def get_v4_bg(w: int, h: int, is_dark: bool = False, is_blur: bool = False):
     return img.convert("RGBA")
 
 
-async def shift_image_hue(img: Image.Image, angle: float = 30) -> Image.Image:
+async def shift_image_hue(
+    img: Image.Image,
+    angle: float = 30,
+) -> Image.Image:  # noqa: RUF029
     alpha = img.getchannel("A")
     img = img.convert("HSV")
 
@@ -63,11 +66,11 @@ async def shift_image_hue(img: Image.Image, angle: float = 30) -> Image.Image:
     return img
 
 
-async def get_pic(url, size: Optional[Tuple[int, int]] = None) -> Image.Image:
+async def get_pic(url: str, size: Optional[Tuple[int, int]] = None) -> Image.Image:
     """
     从网络获取图片, 格式化为RGBA格式的指定尺寸
     """
-    async with httpx.AsyncClient(timeout=None) as client:
+    async with httpx.AsyncClient(timeout=None) as client:  # noqa: S113
         resp = await client.get(url=url)
         if resp.status_code != 200:
             if size is None:
@@ -120,7 +123,7 @@ def draw_center_text_by_line(
                 line = line.replace("\n", "")
                 img.text((x, y), line, fill, font, anchor)
                 line, lenth = "", 0
-                y += h * 2.5
+                y += h * 1.5
     else:
         img.text((x, y), line, fill, font, anchor)
     return y
@@ -133,7 +136,7 @@ def draw_text_by_line(
     font: ImageFont.FreeTypeFont,
     fill: Union[Tuple[int, int, int, int], str],
     max_length: float,
-    center=False,
+    center=False,  # noqa: ANN001
     line_space: Optional[float] = None,
 ) -> float:
     """
@@ -192,13 +195,13 @@ def draw_text_by_line(
 def easy_paste(
     im: Image.Image,
     im_paste: Image.Image,
-    pos=(0, 0),
-    direction="lt",
+    pos=(0, 0),  # noqa: ANN001
+    direction="lt",  # noqa: ANN001
 ):
     """
     inplace method
     快速粘贴, 自动获取被粘贴图像的坐标。
-    pos应当是粘贴点坐标，direction指定粘贴点方位，例如lt为左上
+    pos应当是粘贴点坐标,direction指定粘贴点方位,例如lt为左上
     """
     x, y = pos
     size_x, size_y = im_paste.size
@@ -215,8 +218,8 @@ def easy_paste(
 def easy_alpha_composite(
     im: Image.Image,
     im_paste: Image.Image,
-    pos=(0, 0),
-    direction="lt",
+    pos=(0, 0),  # noqa: ANN001
+    direction="lt",  # noqa: ANN001
 ) -> Image.Image:
     """
     透明图像快速粘贴
@@ -379,11 +382,11 @@ class CustomizeImage:
         for i in range(color):
             bg = tuple(
                 q.getpalette()[  # type:ignore
-                    i * 3 : (i * 3) + 3  # noqa:E203
+                    i * 3 : (i * 3) + 3
                 ],
             )
             light_value = bg[0] * 0.3 + bg[1] * 0.6 + bg[2] * 0.1
-            if abs(light_value - based_light) < temp:  # noqa:E203
+            if abs(light_value - based_light) < temp:
                 bg_color = bg
                 temp = abs(light_value - based_light)
         return bg_color  # type:ignore
@@ -395,9 +398,9 @@ class CustomizeImage:
         if max(*bg_color) > 255 - r:
             r *= -1
         return (
-            math.floor(bg_color[0] + r if bg_color[0] + r <= 255 else 255),
-            math.floor(bg_color[1] + r if bg_color[1] + r <= 255 else 255),
-            math.floor(bg_color[2] + r if bg_color[2] + r <= 255 else 255),
+            math.floor(min(bg_color[0] + r, 255)),
+            math.floor(min(bg_color[1] + r, 255)),
+            math.floor(min(bg_color[2] + r, 255)),
         )
 
     @staticmethod

nonebot_plugin_l4d2_server/l4_image/img/template/Bocchi_The_Rock.html

@@ -4,11 +4,8 @@
   <style>
     body {
       background-image: url("Bocchi_The_Rock.png");
-      background-repeat: no-repeat;
+      background-repeat: repeat;
       background-size: cover;
-      /* 调整背景图片大小适应屏幕 */
-      /*background-position: center center; /* 使背景图片始终居中 */
-      /*background-attachment: fixed; /* 背景图片不随内容滚动 */
       margin: 0px;
       zoom: 150%;
     }
@@ -28,6 +25,13 @@
       transform: translateX(-100px);
     }
 
+    /* Vac图标样式 */
+    .vac-icon {
+      width: 13px;
+      height: auto;
+      margin-left: 190px;
+    }
+
     .image {
       display: flex;
       flex-direction: column;
@@ -81,8 +85,8 @@
       border: 1px solid;
       border-radius: 5px;
       border-color: #e5e7eb;
-      box-shadow: 0px 2px 6px 1px rgba(0, 0, 0, 0.2);
-      background-color: #f5f5f530;
+      box-shadow: 0px 2px 6px 2px rgba(0, 0, 0, 0.2);
+      background-color: #ffffff3d;
     }
 
     .plugin_meta {
@@ -255,35 +259,18 @@
           </div>
           <div class="plugin_meta_line3">
             {% if plugin.server.platform == 'l' %}
-            <svg t="1721445719912" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-              p-id="2665" width="13" height="13">
-              <path
-                d="M433.700571 234.861714c-11.446857 1.133714-7.424 11.446857-13.714285 11.446857-5.705143 0.585143-4.571429-12.580571 13.714285-11.446857z m49.737143 8.009143c-5.705143 1.718857-6.290286-9.142857-16.566857-6.290286 16.566857-7.424 22.272 3.986286 16.566857 6.290286z m-200.594285 243.968c-5.156571-1.718857-3.986286 8.557714-9.142858 16.566857-3.986286 7.424-14.299429 13.129143-6.290285 14.299429 2.852571 0.585143 10.861714-6.290286 14.299428-14.299429 2.852571-9.728 5.705143-14.848 1.133715-16.566857z m488.594285 205.165714c0-10.276571-22.272-20.004571-31.414857-23.990857 15.433143-51.419429 8.557714-72.009143-1.718857-120.576-8.009143-36.571429-41.728-86.272-67.986286-101.705143 6.838857 5.705143 19.419429 22.272 32.585143 47.433143 22.857143 42.861714 45.714286 106.276571 30.866286 158.866286-5.705143 20.553143-19.419429 23.442286-28.562286 23.990857-40.009143 4.571429-16.566857-48.018286-33.133714-119.442286-18.870857-80.018286-38.290286-85.723429-42.861714-92.013714-23.442286-104.009143-49.152-93.696-56.576-132.571428-6.290286-34.852571 30.281143-63.414857-19.419429-73.142858-15.433143-2.852571-37.156571-18.285714-45.714286-19.419428s-13.129143-57.709714 18.870857-59.428572c31.414857-2.304 37.156571 35.437714 31.414858 50.285715-9.142857 14.848 0.585143 20.553143 16.018285 15.433143 12.580571-3.986286 4.571429-37.156571 7.424-41.728-8.009143-48.018286-28.013714-54.857143-48.566857-58.843429-78.848 6.290286-43.446857 93.147429-51.419428 85.138286-11.446857-11.995429-44.580571-1.133714-44.580572-8.557715 0.585143-44.580571-14.299429-70.290286-34.852571-70.838857-22.857143-0.585143-32 31.414857-33.133715 49.700572-1.718857 17.152 9.728 53.138286 18.285715 50.285714 5.705143-1.718857 15.433143-13.129143 5.156571-12.580571-5.156571 0-13.129143-12.580571-14.299428-27.428572-0.585143-14.848 5.156571-29.696 24.576-29.147428 22.272 0.585143 22.272 45.129143 20.004571 46.848a104.850286 104.850286 0 0 0-17.700571 16.566857c-7.424 11.995429-21.723429 15.433143-27.428572 20.553143-9.728 10.276571-11.995429 21.723429-4.571428 25.709714 26.294857 14.848 17.700571 32 54.272 33.133714 23.990857 1.133714 41.728-3.437714 58.294857-8.557714 12.580571-3.986286 53.138286-12.580571 61.696-27.428572 3.986286-6.290286 8.557714-6.290286 11.446857-4.571428 5.705143 2.852571 6.838857 13.714286-7.424 17.152-20.004571 5.705143-40.009143 16.566857-58.294857 23.442286-17.700571 7.424-23.442286 10.276571-40.009143 13.129142-37.705143 6.838857-65.718857-13.714286-40.557714 10.861715 8.557714 8.009143 16.566857 13.129143 38.290285 12.580571 48.018286-1.718857 101.156571-59.428571 106.276572-33.718857 1.133714 5.705143-14.848 12.580571-27.428572 18.870857-44.580571 21.723429-75.995429 65.133714-104.557714 50.285714-25.709714-13.714286-51.419429-77.129143-50.870857-48.566857 0.585143 43.995429-57.709714 82.870857-30.866286 133.156572-17.700571 4.571429-57.161143 88.576-62.866286 131.986285-3.437714 25.161143 2.304 55.990857-3.986285 73.142858-8.557714 25.161143-47.433143-23.990857-34.852572-84.004572 2.304-10.276571 0-12.580571-2.852571-7.424-15.433143 28.013714-6.838857 67.437714 5.705143 94.866286 5.156571 11.995429 18.285714 17.152 28.013714 27.428571 20.004571 22.857143 98.852571 81.152 112.566857 95.414857 17.700571 16.566857 12.580571 55.442286-23.990857 59.428572 18.870857 35.437714 37.156571 38.838857 36.571429 96.585143 21.723429-11.446857 13.129143-36.571429 3.986285-52.553143-6.290286-11.446857-14.299429-16.566857-12.580571-19.419429 1.133714-1.718857 12.580571-11.446857 18.870857-3.986285 19.419429 21.723429 55.990857 25.709714 94.866286 20.553142 39.424-4.571429 81.700571-18.285714 101.156571-49.700571 9.142857-14.848 15.433143-20.004571 19.419429-17.152 4.571429 2.304 6.290286 12.580571 5.705143 29.696-0.585143 18.285714-8.009143 37.156571-13.129143 52.553143-5.156571 17.700571-6.838857 29.696 10.276571 30.281143 4.571429-32 13.714286-63.414857 16.018286-95.414857 2.852571-36.571429-23.442286-104.009143 5.156571-137.728 7.424-9.142857 16.566857-10.276571 29.147429-10.276572 1.718857-45.714286 72.009143-42.276571 95.414857-23.442286zM412.562286 219.428571c2.304-14.299429-4.571429-24.576-8.009143-25.709714-6.838857-1.718857-5.705143 8.557714-2.304 7.424 2.304 0 5.156571 3.437714 3.986286 8.557714-1.133714 6.838857-0.585143 11.446857 4.571428 11.446858 0.585143 0 1.718857 0 1.718857-1.718858z m239.433143 112.566858c-2.304-10.861714-10.276571-6.838857-19.419429-12.580572-10.861714-6.838857-13.129143-18.285714-17.152-14.299428-11.995429 13.129143 14.848 40.557714 26.294857 42.861714 6.838857 1.133714 11.995429-8.009143 10.276572-16.018286zM550.290286 210.285714c0.585143-13.714286-11.446857-20.553143-14.299429-20.004571-7.424 0.585143-5.156571 3.986286-1.718857 5.156571 4.571429 1.133714 9.142857 9.142857 10.276571 17.700572 0 1.133714 5.705143-1.133714 5.705143-2.852572z m30.866285-133.156571c0.585143-2.852571-6.838857-6.290286-11.995428-10.276572-4.571429-4.571429-9.142857-8.557714-13.714286-8.557714-11.446857 1.133714-5.705143 13.129143-7.424 18.870857-2.304 6.290286-10.861714 11.446857-5.156571 16.018286 5.156571 3.986286 8.557714-6.290286 19.419428-10.276571 2.852571-1.133714 16.018286 0.585143 18.870857-5.705143z m322.852572 766.317714c70.290286 43.446857-26.294857 79.433143-67.986286 100.571429-32.585143 16.566857-75.995429 53.138286-92.013714 68.571428-11.995429 11.446857-61.696 17.152-89.709714 2.852572-32.585143-16.566857-15.433143-42.861714-65.718858-44.580572-25.161143-0.585143-49.700571-0.585143-74.276571-0.585143-21.723429 0.585143-43.446857 1.718857-65.718857 2.304-75.446857 1.718857-82.870857 50.285714-131.437714 48.566858-33.133714-1.133714-74.861714-27.428571-146.870858-42.276572-50.285714-10.276571-98.852571-13.129143-109.129142-35.437714s12.580571-47.433143 14.299428-69.156572c1.718857-29.147429-21.723429-68.571429-4.571428-83.419428 14.848-13.129143 46.299429-3.437714 66.852571-14.848 21.723429-12.580571 30.866286-22.272 30.866286-49.152 8.009143 27.428571-0.585143 49.700571-18.285715 60.562286-10.861714 6.838857-30.866286 10.276571-47.433142 8.557714-13.129143-1.133714-21.138286 0.585143-24.576 5.705143-5.156571 6.290286-3.437714 17.700571 2.852571 32.585143s13.714286 24.576 12.580571 42.861714c-0.585143 18.285714-21.138286 40.009143-17.700571 55.442286 1.133714 5.705143 6.838857 10.861714 21.138286 14.848 22.857143 6.290286 64.585143 12.580571 105.142857 22.272 45.129143 11.446857 92.013714 32 121.161143 28.013714 86.857143-11.995429 37.156571-105.142857 23.442285-127.414857-73.728-115.419429-122.294857-190.866286-161.133714-161.133715-9.728 8.009143-10.276571-19.419429-9.728-30.281142 1.718857-37.705143 20.553143-51.419429 32-80.566858 21.723429-55.442286 38.290286-118.857143 71.424-151.442285 24.576-32 63.414857-84.004571 70.838857-111.433143-6.290286-59.428571-8.009143-122.294857-9.142857-177.152-1.133714-58.843429 8.009143-110.299429 74.276572-146.285714C431.469714 3.437714 452.608 0 474.88 0c39.424-0.585143 83.419429 10.861714 111.433143 31.414857 44.580571 33.133714 72.557714 103.424 69.156571 153.709714-2.304 39.424 4.571429 80.018286 17.152 122.294858 14.848 49.700571 38.290286 84.553143 75.995429 124.562285 45.129143 48.018286 80.566857 142.299429 90.843428 202.276572 9.142857 55.990857-3.437714 90.843429-15.433142 92.562285-18.285714 2.852571-29.696 60.562286-86.857143 58.294858-36.571429-1.718857-40.009143-23.442286-50.285715-42.276572-16.566857-29.147429-33.133714-20.004571-39.424 10.861714-3.437714 15.433143-1.133714 38.290286 3.986286 55.442286 10.276571 35.986286 6.838857 69.705143 0.585143 111.433143-11.995429 78.848 55.442286 93.696 100.571429 55.990857 44.580571-37.156571 54.272-42.861714 110.299428-62.281143 85.138286-29.147429 56.576-54.857143 10.861714-70.290285-41.142857-13.714286-42.861714-82.870857-28.013714-96 3.437714 74.276571 42.276571 85.138286 58.294857 95.414857z"
-                fill="" p-id="2666"></path>
+            <image xlink:href="l.svg" width="13" height="13" fill="#FFFFFF" />
             </svg>
             {% elif plugin.server.platform == 'w' %}
-            <svg t="1721445856168" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-              p-id="3630" width="13" height="13">
-              <path
-                d="M456 484V160.1l-335.9 72V484H456zM512 484h391.8V64.2l-391.8 84V484zM456 540H120.2v251.9l335.9 72V540zM512 540v335.9l391.8 84V540H512z"
-                fill="#00adef" p-id="3631"></path>
-            </svg>
+            <image xlink:href="w.svg" width="13" height="13" fill="#00adef" />
             {% else %}
-            <svg t="1721445911301" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-              p-id="5446" width="13" height="13">
-              <path
-                d="M185.952 688l23.872-33.824c85.536 43.232 186.816 67.808 333.184 62.272 0.992-42.304 5.696-82.72 14.496-118.848H396.736c3.776-172.288 67.168-325.024 138.592-441.28H51.264l0.192 740.32h512.64a658.112 658.112 0 0 1-20.832-138.048c-132.8 5.664-269.856-18.304-357.312-70.592z m86.752-422.016h46.848V375.52h-46.848V265.984z"
-                fill="#4F8FCC" p-id="5447"></path>
-              <path
-                d="M959.04 156.352H584.8c-65.472 100.576-129.984 236-144.32 398.976h169.44c-13.792 50.304-24.448 102.176-24.96 157.952 95.072-11.68 145.408-23.872 215.904-59.456l23.84 33.824c-61.312 36.672-148.224 59.2-239.744 67.584 1.408 46.944 8.448 93.984 22.08 141.472h352V156.352zM707.808 375.456h-46.88V265.92h46.88v109.536z"
-                fill="#BABEE0" p-id="5448"></path>
-              <path
-                d="M319.584 375.52h-46.88V265.984h46.848V375.52zM209.792 654.176L185.952 688c87.456 52.288 224.544 76.256 357.312 70.624a618.4 618.4 0 0 1-0.256-42.144c-146.368 5.536-247.68-19.072-333.216-62.304zM707.808 265.92v109.536h-46.88V265.92h46.88zM584.96 755.232c91.52-8.416 178.432-30.944 239.744-67.584l-23.84-33.824C730.368 689.408 680.032 701.6 584.96 713.28c0.544-55.744 11.2-107.616 24.96-157.952H440.48c14.336-163.008 78.848-298.432 144.32-398.976a1182.144 1182.144 0 0 1 73.76-101.024l-31.616-26.4a1066.656 1066.656 0 0 0-91.68 127.424C463.84 272.576 400.48 425.344 396.672 597.632H557.44c-8.8 36.128-13.504 76.544-14.496 118.848-0.32 13.92-0.352 27.872 0.256 42.144 1.92 45.056 8.704 91.68 20.832 138.048a604.48 604.48 0 0 0 46.624 124.256l38.016-18.304a602.912 602.912 0 0 1-41.632-105.952 571.936 571.936 0 0 1-22.08-141.44z"
-                fill="#224477" p-id="5449"></path>
-            </svg>
+            <image xlink:href="m.svg" width="13" height="13" />
             {% endif %}
             <div class="package_name">&nbsp{{ plugin.server.player_count }}/{{ plugin.server.max_players }} </div>
-            <div class="package_name">&nbsp{{ plugin.server.vac_enabled}} </div>
+            {% if plugin.server.vac_enabled %}
+            <img class="vac-icon" src="vac.png" alt="VAC Enabled">
+            {% else %}
+            {% endif %}
           </div>
         </div>
       </div>

nonebot_plugin_l4d2_server/l4_image/img/template/Pixel.html

@@ -4,7 +4,7 @@
   <style>
     body {
       background-image: url("Pixel.png");
-      background-repeat: no-repeat;
+      background-repeat: repeat;
       background-size: cover;
       /* 调整背景图片大小适应屏幕 */
       /*background-position: center center; /* 使背景图片始终居中 */
@@ -28,6 +28,13 @@
       transform: translateX(-100px);
     }
 
+    .vac-icon {
+      width: 13px;
+      height: auto;
+      margin-left: 190px;
+
+    }
+
     .image {
       display: flex;
       flex-direction: column;
@@ -97,7 +104,6 @@
       border-radius: 5px;
     }
 
-
     .plugin_meta {
       display: flex;
       flex-direction: column;
@@ -148,10 +154,10 @@
 
     .package_name_label {
       background-image: url(./fingerprint.svg);
-      width: 13px;
+      width: 20px;
       height: 13px;
       color: #efefef;
-      margin-right: 8px;
+      margin-right: 20px;
     }
 
     .package_name {
@@ -302,31 +308,18 @@
               p-id="2665" width="13" height="13">
               <path
                 d="M433.700571 234.861714c-11.446857 1.133714-7.424 11.446857-13.714285 11.446857-5.705143 0.585143-4.571429-12.580571 13.714285-11.446857z m49.737143 8.009143c-5.705143 1.718857-6.290286-9.142857-16.566857-6.290286 16.566857-7.424 22.272 3.986286 16.566857 6.290286z m-200.594285 243.968c-5.156571-1.718857-3.986286 8.557714-9.142858 16.566857-3.986286 7.424-14.299429 13.129143-6.290285 14.299429 2.852571 0.585143 10.861714-6.290286 14.299428-14.299429 2.852571-9.728 5.705143-14.848 1.133715-16.566857z m488.594285 205.165714c0-10.276571-22.272-20.004571-31.414857-23.990857 15.433143-51.419429 8.557714-72.009143-1.718857-120.576-8.009143-36.571429-41.728-86.272-67.986286-101.705143 6.838857 5.705143 19.419429 22.272 32.585143 47.433143 22.857143 42.861714 45.714286 106.276571 30.866286 158.866286-5.705143 20.553143-19.419429 23.442286-28.562286 23.990857-40.009143 4.571429-16.566857-48.018286-33.133714-119.442286-18.870857-80.018286-38.290286-85.723429-42.861714-92.013714-23.442286-104.009143-49.152-93.696-56.576-132.571428-6.290286-34.852571 30.281143-63.414857-19.419429-73.142858-15.433143-2.852571-37.156571-18.285714-45.714286-19.419428s-13.129143-57.709714 18.870857-59.428572c31.414857-2.304 37.156571 35.437714 31.414858 50.285715-9.142857 14.848 0.585143 20.553143 16.018285 15.433143 12.580571-3.986286 4.571429-37.156571 7.424-41.728-8.009143-48.018286-28.013714-54.857143-48.566857-58.843429-78.848 6.290286-43.446857 93.147429-51.419428 85.138286-11.446857-11.995429-44.580571-1.133714-44.580572-8.557715 0.585143-44.580571-14.299429-70.290286-34.852571-70.838857-22.857143-0.585143-32 31.414857-33.133715 49.700572-1.718857 17.152 9.728 53.138286 18.285715 50.285714 5.705143-1.718857 15.433143-13.129143 5.156571-12.580571-5.156571 0-13.129143-12.580571-14.299428-27.428572-0.585143-14.848 5.156571-29.696 24.576-29.147428 22.272 0.585143 22.272 45.129143 20.004571 46.848a104.850286 104.850286 0 0 0-17.700571 16.566857c-7.424 11.995429-21.723429 15.433143-27.428572 20.553143-9.728 10.276571-11.995429 21.723429-4.571428 25.709714 26.294857 14.848 17.700571 32 54.272 33.133714 23.990857 1.133714 41.728-3.437714 58.294857-8.557714 12.580571-3.986286 53.138286-12.580571 61.696-27.428572 3.986286-6.290286 8.557714-6.290286 11.446857-4.571428 5.705143 2.852571 6.838857 13.714286-7.424 17.152-20.004571 5.705143-40.009143 16.566857-58.294857 23.442286-17.700571 7.424-23.442286 10.276571-40.009143 13.129142-37.705143 6.838857-65.718857-13.714286-40.557714 10.861715 8.557714 8.009143 16.566857 13.129143 38.290285 12.580571 48.018286-1.718857 101.156571-59.428571 106.276572-33.718857 1.133714 5.705143-14.848 12.580571-27.428572 18.870857-44.580571 21.723429-75.995429 65.133714-104.557714 50.285714-25.709714-13.714286-51.419429-77.129143-50.870857-48.566857 0.585143 43.995429-57.709714 82.870857-30.866286 133.156572-17.700571 4.571429-57.161143 88.576-62.866286 131.986285-3.437714 25.161143 2.304 55.990857-3.986285 73.142858-8.557714 25.161143-47.433143-23.990857-34.852572-84.004572 2.304-10.276571 0-12.580571-2.852571-7.424-15.433143 28.013714-6.838857 67.437714 5.705143 94.866286 5.156571 11.995429 18.285714 17.152 28.013714 27.428571 20.004571 22.857143 98.852571 81.152 112.566857 95.414857 17.700571 16.566857 12.580571 55.442286-23.990857 59.428572 18.870857 35.437714 37.156571 38.838857 36.571429 96.585143 21.723429-11.446857 13.129143-36.571429 3.986285-52.553143-6.290286-11.446857-14.299429-16.566857-12.580571-19.419429 1.133714-1.718857 12.580571-11.446857 18.870857-3.986285 19.419429 21.723429 55.990857 25.709714 94.866286 20.553142 39.424-4.571429 81.700571-18.285714 101.156571-49.700571 9.142857-14.848 15.433143-20.004571 19.419429-17.152 4.571429 2.304 6.290286 12.580571 5.705143 29.696-0.585143 18.285714-8.009143 37.156571-13.129143 52.553143-5.156571 17.700571-6.838857 29.696 10.276571 30.281143 4.571429-32 13.714286-63.414857 16.018286-95.414857 2.852571-36.571429-23.442286-104.009143 5.156571-137.728 7.424-9.142857 16.566857-10.276571 29.147429-10.276572 1.718857-45.714286 72.009143-42.276571 95.414857-23.442286zM412.562286 219.428571c2.304-14.299429-4.571429-24.576-8.009143-25.709714-6.838857-1.718857-5.705143 8.557714-2.304 7.424 2.304 0 5.156571 3.437714 3.986286 8.557714-1.133714 6.838857-0.585143 11.446857 4.571428 11.446858 0.585143 0 1.718857 0 1.718857-1.718858z m239.433143 112.566858c-2.304-10.861714-10.276571-6.838857-19.419429-12.580572-10.861714-6.838857-13.129143-18.285714-17.152-14.299428-11.995429 13.129143 14.848 40.557714 26.294857 42.861714 6.838857 1.133714 11.995429-8.009143 10.276572-16.018286zM550.290286 210.285714c0.585143-13.714286-11.446857-20.553143-14.299429-20.004571-7.424 0.585143-5.156571 3.986286-1.718857 5.156571 4.571429 1.133714 9.142857 9.142857 10.276571 17.700572 0 1.133714 5.705143-1.133714 5.705143-2.852572z m30.866285-133.156571c0.585143-2.852571-6.838857-6.290286-11.995428-10.276572-4.571429-4.571429-9.142857-8.557714-13.714286-8.557714-11.446857 1.133714-5.705143 13.129143-7.424 18.870857-2.304 6.290286-10.861714 11.446857-5.156571 16.018286 5.156571 3.986286 8.557714-6.290286 19.419428-10.276571 2.852571-1.133714 16.018286 0.585143 18.870857-5.705143z m322.852572 766.317714c70.290286 43.446857-26.294857 79.433143-67.986286 100.571429-32.585143 16.566857-75.995429 53.138286-92.013714 68.571428-11.995429 11.446857-61.696 17.152-89.709714 2.852572-32.585143-16.566857-15.433143-42.861714-65.718858-44.580572-25.161143-0.585143-49.700571-0.585143-74.276571-0.585143-21.723429 0.585143-43.446857 1.718857-65.718857 2.304-75.446857 1.718857-82.870857 50.285714-131.437714 48.566858-33.133714-1.133714-74.861714-27.428571-146.870858-42.276572-50.285714-10.276571-98.852571-13.129143-109.129142-35.437714s12.580571-47.433143 14.299428-69.156572c1.718857-29.147429-21.723429-68.571429-4.571428-83.419428 14.848-13.129143 46.299429-3.437714 66.852571-14.848 21.723429-12.580571 30.866286-22.272 30.866286-49.152 8.009143 27.428571-0.585143 49.700571-18.285715 60.562286-10.861714 6.838857-30.866286 10.276571-47.433142 8.557714-13.129143-1.133714-21.138286 0.585143-24.576 5.705143-5.156571 6.290286-3.437714 17.700571 2.852571 32.585143s13.714286 24.576 12.580571 42.861714c-0.585143 18.285714-21.138286 40.009143-17.700571 55.442286 1.133714 5.705143 6.838857 10.861714 21.138286 14.848 22.857143 6.290286 64.585143 12.580571 105.142857 22.272 45.129143 11.446857 92.013714 32 121.161143 28.013714 86.857143-11.995429 37.156571-105.142857 23.442285-127.414857-73.728-115.419429-122.294857-190.866286-161.133714-161.133715-9.728 8.009143-10.276571-19.419429-9.728-30.281142 1.718857-37.705143 20.553143-51.419429 32-80.566858 21.723429-55.442286 38.290286-118.857143 71.424-151.442285 24.576-32 63.414857-84.004571 70.838857-111.433143-6.290286-59.428571-8.009143-122.294857-9.142857-177.152-1.133714-58.843429 8.009143-110.299429 74.276572-146.285714C431.469714 3.437714 452.608 0 474.88 0c39.424-0.585143 83.419429 10.861714 111.433143 31.414857 44.580571 33.133714 72.557714 103.424 69.156571 153.709714-2.304 39.424 4.571429 80.018286 17.152 122.294858 14.848 49.700571 38.290286 84.553143 75.995429 124.562285 45.129143 48.018286 80.566857 142.299429 90.843428 202.276572 9.142857 55.990857-3.437714 90.843429-15.433142 92.562285-18.285714 2.852571-29.696 60.562286-86.857143 58.294858-36.571429-1.718857-40.009143-23.442286-50.285715-42.276572-16.566857-29.147429-33.133714-20.004571-39.424 10.861714-3.437714 15.433143-1.133714 38.290286 3.986286 55.442286 10.276571 35.986286 6.838857 69.705143 0.585143 111.433143-11.995429 78.848 55.442286 93.696 100.571429 55.990857 44.580571-37.156571 54.272-42.861714 110.299428-62.281143 85.138286-29.147429 56.576-54.857143 10.861714-70.290285-41.142857-13.714286-42.861714-82.870857-28.013714-96 3.437714 74.276571 42.276571 85.138286 58.294857 95.414857z"
-                fill="" p-id="2666"></path>
+                fill="#FFFFFF" p-id="2666"></path>
             </svg>
             {% elif plugin.server.platform == 'w' %}
-            <svg t="1721445856168" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-              p-id="3630" width="13" height="13">
-              <path
-                d="M456 484V160.1l-335.9 72V484H456zM512 484h391.8V64.2l-391.8 84V484zM456 540H120.2v251.9l335.9 72V540zM512 540v335.9l391.8 84V540H512z"
-                fill="#00adef" p-id="3631"></path>
-            </svg>
+            <image xlink:href="w.svg" width="13" height="13" />
             {% else %}
-            <svg t="1721445911301" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-              p-id="5446" width="13" height="13">
-              <path
-                d="M185.952 688l23.872-33.824c85.536 43.232 186.816 67.808 333.184 62.272 0.992-42.304 5.696-82.72 14.496-118.848H396.736c3.776-172.288 67.168-325.024 138.592-441.28H51.264l0.192 740.32h512.64a658.112 658.112 0 0 1-20.832-138.048c-132.8 5.664-269.856-18.304-357.312-70.592z m86.752-422.016h46.848V375.52h-46.848V265.984z"
-                fill="#4F8FCC" p-id="5447"></path>
-              <path
-                d="M959.04 156.352H584.8c-65.472 100.576-129.984 236-144.32 398.976h169.44c-13.792 50.304-24.448 102.176-24.96 157.952 95.072-11.68 145.408-23.872 215.904-59.456l23.84 33.824c-61.312 36.672-148.224 59.2-239.744 67.584 1.408 46.944 8.448 93.984 22.08 141.472h352V156.352zM707.808 375.456h-46.88V265.92h46.88v109.536z"
-                fill="#BABEE0" p-id="5448"></path>
-              <path
-                d="M319.584 375.52h-46.88V265.984h46.848V375.52zM209.792 654.176L185.952 688c87.456 52.288 224.544 76.256 357.312 70.624a618.4 618.4 0 0 1-0.256-42.144c-146.368 5.536-247.68-19.072-333.216-62.304zM707.808 265.92v109.536h-46.88V265.92h46.88zM584.96 755.232c91.52-8.416 178.432-30.944 239.744-67.584l-23.84-33.824C730.368 689.408 680.032 701.6 584.96 713.28c0.544-55.744 11.2-107.616 24.96-157.952H440.48c14.336-163.008 78.848-298.432 144.32-398.976a1182.144 1182.144 0 0 1 73.76-101.024l-31.616-26.4a1066.656 1066.656 0 0 0-91.68 127.424C463.84 272.576 400.48 425.344 396.672 597.632H557.44c-8.8 36.128-13.504 76.544-14.496 118.848-0.32 13.92-0.352 27.872 0.256 42.144 1.92 45.056 8.704 91.68 20.832 138.048a604.48 604.48 0 0 0 46.624 124.256l38.016-18.304a602.912 602.912 0 0 1-41.632-105.952 571.936 571.936 0 0 1-22.08-141.44z"
-                fill="#224477" p-id="5449"></path>
-            </svg>
+            <image xlink:href="m.svg" width="13" height="13" />
             {% endif %}
             <div class="package_name">&nbsp{{ plugin.server.player_count }}/{{ plugin.server.max_players }} </div>
-            <div class="package_name">&nbsp{{ plugin.server.vac_enabled}} </div>
+            {% if plugin.server.vac_enabled %}
+            <img class="vac-icon" src="vac_white.png" alt="VAC Enabled">
+            {% else %}
+            {% endif %}
           </div>
         </div>
       </div>
@@ -343,8 +336,6 @@
       <span class="loaded-text"><b>©爱丽数码</b></span>
     </div>
   </div>
-
-
 </body>
 
 </html>