From 55beccb53ea299c87dbc34076d58fb6afd5d8022 Mon Sep 17 00:00:00 2001
From: zhxy-CN <admin@owo.cab>
Date: Fri, 22 Jul 2022 20:39:14 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=E6=94=AF=E6=8C=81=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=82=B9=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✨支持资源点查询
---
 model/helpers.py             |   4 +-
 plugins/map.py               |  71 ++++++++
 requirements.txt             |   3 +-
 resources/icon/0.png         | Bin 0 -> 13882 bytes
 resources/icon/box.png       | Bin 0 -> 9703 bytes
 resources/icon/box_alpha.png | Bin 0 -> 2986 bytes
 service/map.py               | 313 +++++++++++++++++++++++++++++++++++
 7 files changed, 388 insertions(+), 3 deletions(-)
 create mode 100644 plugins/map.py
 create mode 100644 resources/icon/0.png
 create mode 100644 resources/icon/box.png
 create mode 100644 resources/icon/box_alpha.png
 create mode 100644 service/map.py

diff --git a/model/helpers.py b/model/helpers.py
index 4b16cadf..8313d489 100644
--- a/model/helpers.py
+++ b/model/helpers.py
@@ -16,7 +16,7 @@ from service.cache import RedisCache
 
 USER_AGENT: str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) " \
                   "Chrome/90.0.4430.72 Safari/537.36"
-headers: dict = {'User-Agent': USER_AGENT}
+REQUEST_HEADERS: dict = {'User-Agent': USER_AGENT}
 current_dir = os.getcwd()
 cache_dir = os.path.join(current_dir, "cache")
 if not os.path.exists(cache_dir):
@@ -56,7 +56,7 @@ async def url_to_file(url: str, prefix: str = "file://") -> str:
     temp_file_name = url_sha1 + extension
     file_dir = os.path.join(cache_dir, temp_file_name)
     if not os.path.exists(file_dir):
-        async with httpx.AsyncClient(headers=headers) as client:
+        async with httpx.AsyncClient(headers=REQUEST_HEADERS) as client:
             try:
                 data = await client.get(url)
             except UnsupportedProtocol as error:
diff --git a/plugins/map.py b/plugins/map.py
new file mode 100644
index 00000000..adbdbb4c
--- /dev/null
+++ b/plugins/map.py
@@ -0,0 +1,71 @@
+from os import sep
+
+from PIL import Image
+from telegram import Update
+from telegram.constants import ChatAction
+from telegram.ext import CommandHandler, MessageHandler, filters
+
+from logger import Log
+from manager import listener_plugins_class
+from plugins.base import BasePlugins, restricts
+from plugins.errorhandler import conversation_error_handler
+from service.map import MapHelper
+from utils.base import PaimonContext
+
+
+@listener_plugins_class()
+class Map(BasePlugins):
+
+    def __init__(self):
+        self.init_resource_map = False
+        self.map_helper = MapHelper()
+
+    @classmethod
+    def create_handlers(cls) -> list:
+        map_res = cls()
+        return [
+            CommandHandler("map", map_res.command_start, block=False),
+            MessageHandler(filters.Regex(r"^资源点查询(.*)"), map_res.command_start, block=True)
+        ]
+
+    async def init_point_list_and_map(self):
+        Log.info("正在初始化地图资源节点")
+        if not self.init_resource_map:
+            await self.map_helper.init_point_list_and_map()
+            self.init_resource_map = True
+
+    @conversation_error_handler
+    @restricts(restricts_time=20)
+    async def command_start(self, update: Update, context: PaimonContext):
+        message = update.message
+        args = context.args
+        user = update.effective_user
+        if not self.init_resource_map:
+            await self.init_point_list_and_map()
+        await message.reply_chat_action(ChatAction.TYPING)
+        if len(args) >= 1:
+            resource_name = args[0]
+        else:
+            Log.info(f"用户: {user.full_name} [{user.id}] 使用了 map 命令")
+            await message.reply_text("请输入要查找的资源，或私聊派蒙发送 `/map list` 查看资源列表", parse_mode="Markdown")
+            return
+        if resource_name in ("list", "列表"):
+            if filters.ChatType.GROUPS.filter(message):
+                reply_message = await message.reply_text("请私聊派蒙使用该命令")
+                self._add_delete_message_job(context, reply_message.chat_id, reply_message.message_id, 300)
+                self._add_delete_message_job(context, message.chat_id, message.message_id, 300)
+                return
+            Log.info(f"用户: {user.full_name} [{user.id}] 使用 map 命令查询了 资源列表")
+            text = self.map_helper.get_resource_list_mes()
+            await message.reply_text(text)
+            return
+        Log.info(f"用户: {user.full_name} [{user.id}] 使用 map 命令查询了 {resource_name}")
+        text = await self.map_helper.get_resource_map_mes(resource_name)
+        if "不知道" in text or "没有找到" in text:
+            await message.reply_text(text, parse_mode="Markdown")
+            return
+        img = Image.open(f"cache{sep}map.jpg")
+        if img.size[0] > 2048 or img.size[1] > 2048:
+            await message.reply_document(open(f"cache{sep}map.jpg", mode='rb+'), caption=text)
+        else:
+            await message.reply_photo(open(f"cache{sep}map.jpg", mode='rb+'), caption=text)
diff --git a/requirements.txt b/requirements.txt
index 5d70cbc2..7c90f692 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,4 +16,5 @@ lxml>=4.9.0
 fakeredis>=1.8.1
 aiohttp<=3.8.1
 python-telegram-bot==20.0a2
-pytz>=2021.3
\ No newline at end of file
+pytz>=2021.3
+Pillow
\ No newline at end of file
diff --git a/resources/icon/0.png b/resources/icon/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdf2090bc9e19355111b3f839cb09c157e6a6e2d
GIT binary patch
literal 13882
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
IM6N<$f+Z__$^ZZW

literal 0
HcmV?d00001

diff --git a/resources/icon/box.png b/resources/icon/box.png
new file mode 100644
index 0000000000000000000000000000000000000000..dadec3443cfa2ba8bf967f1365640a08e64ee070
GIT binary patch
literal 9703
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

literal 0
HcmV?d00001

diff --git a/resources/icon/box_alpha.png b/resources/icon/box_alpha.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c634fa2905065a7af818d62f6444bd983bc1e84
GIT binary patch
literal 2986
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
NYw*ZKr(W9;{a+{<%0vJF

literal 0
HcmV?d00001

diff --git a/service/map.py b/service/map.py
new file mode 100644
index 00000000..db99ee70
--- /dev/null
+++ b/service/map.py
@@ -0,0 +1,313 @@
+import os
+import time
+from io import BytesIO
+from typing import Optional, List
+
+import httpx
+import ujson
+from PIL import Image, ImageMath
+
+from model.helpers import REQUEST_HEADERS
+
+Image.MAX_IMAGE_PIXELS = None
+
+ZOOM = 0.5
+RESOURCE_ICON_OFFSET = (-int(150 * 0.5 * ZOOM), -int(150 * ZOOM))
+
+
+class MapHelper:
+    LABEL_URL = 'https://api-static.mihoyo.com/common/blackboard/ys_obc/v1/map/label/tree?app_sn=ys_obc'
+    POINT_LIST_URL = 'https://api-static.mihoyo.com/common/blackboard/ys_obc/v1/map/point/list?map_id=2&app_sn=ys_obc'
+    MAP_URL = 'https://api-static.mihoyo.com/common/map_user/ys_obc/v1/map/info?map_id=2&app_sn=ys_obc&lang=zh-cn'
+
+    def __init__(self, cache_dir_name: str = "cache"):
+        self._current_dir = os.getcwd()
+        self._output_dir = os.path.join(self._current_dir, cache_dir_name)
+        self._resources_icon_dir = os.path.join(self._current_dir, "resources", "icon")
+        self._cache_dir = os.path.join(self._current_dir, "cache")
+        self._map_dir = os.path.join(self._cache_dir, "map_icon.jpg")
+        self.client = httpx.AsyncClient(headers=REQUEST_HEADERS, timeout=10.0)
+        self.all_resource_type: dict = {}
+        """这个字典保存所有资源类型
+
+        "1": {
+            "id": 1,
+            "name": "传送点",
+            "icon": "",
+            "parent_id": 0,
+            "depth": 1,
+            "node_type": 1,
+            "jump_type": 0,
+            "jump_target_id": 0,
+            "display_priority": 0,
+            "children": []
+        }
+        """
+        self.can_query_type_list: dict = {}
+        """这个字典保存所有可以查询的资源类型名称和ID，这个字典只有名称和ID
+
+        上边字典里"depth": 2的类型才可以查询，"depth": 1的是1级目录，不能查询
+        
+        "七天神像":"2"
+        
+        "风神瞳":"5"
+        """
+        self.all_resource_point_list: list = []
+        """这个列表保存所有资源点的数据
+
+        {
+            "id": 2740,
+            "label_id": 68,
+            "x_pos": -1789,
+            "y_pos": 2628,
+            "author_name": "作者名称",
+            "ctime": "更新时间",
+            "display_state": 1
+        }
+        """
+        self.date: str = ""
+        """记录上次更新"all_resource_point_list"的日期
+        """
+
+        self.center: Optional[List[float]] = None
+        """center
+        """
+
+        self.map_icon: Optional[Image] = None
+        """map_icon
+        """
+
+    async def download_icon(self, url):
+        """下载图片 返回Image对象
+        :param url:
+        :return:
+        """
+        resp = await self.client.get(url=url)
+        if resp.status_code != 200:
+            raise ValueError(f"获取图片数据失败，错误代码 {resp.status_code}")
+        icon = resp.content
+        return Image.open(BytesIO(icon))
+
+    async def download_json(self, url):
+        """
+        获取资源数据，返回 JSON
+        :param url:
+        :return: dict
+        """
+        resp = await self.client.get(url=url)
+        if resp.status_code != 200:
+            raise RuntimeError(f"获取资源点数据失败，错误代码 {resp.status_code}")
+        return resp.json()
+
+    async def init_point_list_and_map(self):
+        await self.up_label_and_point_list()
+        await self.up_map()
+
+    async def up_map(self):
+        """更新地图文件 并按照资源点的范围自动裁切掉不需要的地方
+        裁切地图需要最新的资源点位置，所以要先调用 up_label_and_point_list 再更新地图
+        :return: None
+        """
+        map_info = await self.download_json(self.MAP_URL)
+        map_info = map_info["data"]["info"]["detail"]
+        map_info = ujson.loads(map_info)
+
+        map_url_list = map_info['slices'][0]
+        origin = map_info["origin"]
+
+        x_start = map_info['total_size'][1]
+        y_start = map_info['total_size'][1]
+        x_end = 0
+        y_end = 0
+        for resource_point in self.all_resource_point_list:
+            x_pos = resource_point["x_pos"] + origin[0]
+            y_pos = resource_point["y_pos"] + origin[1]
+            x_start = min(x_start, x_pos)
+            y_start = min(y_start, y_pos)
+            x_end = max(x_end, x_pos)
+            y_end = max(y_end, y_pos)
+
+        x_start -= 200
+        y_start -= 200
+        x_end += 200
+        y_end += 200
+
+        self.center = [origin[0] - x_start, origin[1] - y_start]
+        x = int(x_end - x_start)
+        y = int(y_end - y_start)
+        self.map_icon = Image.new("RGB", (x, y))
+        x_offset = 0
+        for i in map_url_list:
+            map_url = i["url"]
+            map_icon = await self.download_icon(map_url)
+            self.map_icon.paste(map_icon, (int(-x_start) + x_offset, int(-y_start)))
+            x_offset += map_icon.size[0]
+
+    async def up_label_and_point_list(self):
+        """更新label列表和资源点列表
+        :return:
+        """
+        label_data = await self.download_json(self.LABEL_URL)
+        for label in label_data["data"]["tree"]:
+            self.all_resource_type[str(label["id"])] = label
+            for sublist in label["children"]:
+                self.all_resource_type[str(sublist["id"])] = sublist
+                self.can_query_type_list[sublist["name"]] = str(sublist["id"])
+                await self.up_icon_image(sublist)
+            label["children"] = []
+        test = await self.download_json(self.POINT_LIST_URL)
+        self.all_resource_point_list = test["data"]["point_list"]
+        self.date = time.strftime("%d")
+
+    async def up_icon_image(self, sublist: dict):
+        """检查是否有图标，没有图标下载保存到本地
+        :param sublist:
+        :return:
+        """
+        icon_id = sublist["id"]
+        icon_path = os.path.join(self._cache_dir, f"{icon_id}.png")
+
+        if not os.path.exists(icon_path):
+            icon_url = sublist["icon"]
+            icon = await self.download_icon(icon_url)
+            icon = icon.resize((150, 150))
+
+            box_alpha = Image.open(
+                os.path.join(os.path.dirname(__file__), os.path.pardir,
+                             "resources", "icon", "box_alpha.png")).getchannel("A")
+            box = Image.open(os.path.join(os.path.dirname(__file__), os.path.pardir, "resources", "icon", "box.png"))
+
+            try:
+                icon_alpha = icon.getchannel("A")
+                icon_alpha = ImageMath.eval("convert(a*b/256, 'L')", a=icon_alpha, b=box_alpha)
+            except ValueError:
+                # 米游社的图有时候会没有alpha导致报错，这时候直接使用box_alpha当做alpha就行
+                icon_alpha = box_alpha
+
+            icon2 = Image.new("RGBA", (150, 150), "#00000000")
+            icon2.paste(icon, (0, -10))
+
+            bg = Image.new("RGBA", (150, 150), "#00000000")
+            bg.paste(icon2, mask=icon_alpha)
+            bg.paste(box, mask=box)
+
+            with open(icon_path, "wb") as icon_file:
+                bg.save(icon_file)
+
+    async def get_resource_map_mes(self, name):
+        if self.date != time.strftime("%d"):
+            await self.init_point_list_and_map()
+        if name not in self.can_query_type_list:
+            return f"派蒙还不知道 {name} 在哪里呢，可以发送 `/map list` 查看资源列表"
+        resource_id = self.can_query_type_list[name]
+        map_res = ResourceMap(self.all_resource_point_list, self.map_icon, self.center, resource_id)
+        count = map_res.get_resource_count()
+        if not count:
+            return f"派蒙没有找到 {name} 的位置，可能米游社wiki还没更新"
+        map_res.gen_jpg()
+        return f"派蒙一共找到 {name} 的 {count} 个位置点\n* 数据来源于米游社wiki"
+
+    def get_resource_list_mes(self):
+        temp = {list_id: [] for list_id in self.all_resource_type if self.all_resource_type[list_id]["depth"] == 1}
+
+        for list_id in self.all_resource_type:
+            # 再找2级目录
+            if self.all_resource_type[list_id]["depth"] == 2:
+                temp[str(self.all_resource_type[list_id]["parent_id"])].append(list_id)
+        mes = "当前资源列表如下：\n"
+
+        for resource_type_id, value in temp.items():
+            if resource_type_id in ["1", "12", "50", "51", "95", "131"]:
+                # 在游戏里能查到的数据这里就不列举了，不然消息太长了
+                continue
+            mes += f"{self.all_resource_type[resource_type_id]['name']}："
+            for resource_id in value:
+                mes += f"{self.all_resource_type[resource_id]['name']}，"
+            mes += "\n"
+        return mes
+
+
+class ResourceMap:
+
+    def __init__(self, all_resource_point_list: List[dict], map_icon: Image, center: List[float], resource_id: int):
+        self.all_resource_point_list = all_resource_point_list
+        self.resource_id = resource_id
+        self.center = center
+        self.map_image = map_icon.copy()
+        self.map_size = self.map_image.size
+        # 地图要要裁切的左上角和右下角坐标
+        # 这里初始化为地图的大小
+        self.x_start = self.map_size[0]
+        self.y_start = self.map_size[1]
+        self.x_end = 0
+        self.y_end = 0
+        resource_icon = Image.open(self.get_icon_path())
+        self.resource_icon = resource_icon.resize((int(150 * ZOOM), int(150 * ZOOM)))
+        self.resource_xy_list = self.get_resource_point_list()
+
+    def get_icon_path(self):
+        # 检查有没有图标，有返回正确图标，没有返回默认图标
+        icon_path = os.path.join(os.path.dirname(__file__), os.path.pardir,
+                                 "resources", "icon", f"{self.resource_id}.png")
+        if os.path.exists(icon_path):
+            return icon_path
+        return os.path.join(os.path.dirname(__file__), os.path.pardir, "resources", "icon", "0.png")
+
+    def get_resource_point_list(self):
+        temp_list = []
+        for resource_point in self.all_resource_point_list:
+            if str(resource_point["label_id"]) == self.resource_id:
+                # 获取xy坐标，然后加上中心点的坐标完成坐标转换
+                x = resource_point["x_pos"] + self.center[0]
+                y = resource_point["y_pos"] + self.center[1]
+                temp_list.append((int(x), int(y)))
+        return temp_list
+
+    def paste(self):
+        for x, y in self.resource_xy_list:
+            # 把资源图片贴到地图上
+            # 这时地图已经裁切过了，要以裁切后的地图左上角为中心再转换一次坐标
+            x -= self.x_start
+            y -= self.y_start
+            self.map_image.paste(self.resource_icon, (x + RESOURCE_ICON_OFFSET[0], y + RESOURCE_ICON_OFFSET[1]),
+                                 self.resource_icon)
+
+    def crop(self):
+        # 把大地图裁切到只保留资源图标位置
+        for x, y in self.resource_xy_list:
+            # 找出4个方向最远的坐标，用于后边裁切
+            self.x_start = min(x, self.x_start)
+            self.y_start = min(y, self.y_start)
+            self.x_end = max(x, self.x_end)
+            self.y_end = max(y, self.y_end)
+
+        # 先把4个方向扩展150像素防止把资源图标裁掉
+        self.x_start -= 150
+        self.y_start -= 150
+        self.x_end += 150
+        self.y_end += 150
+
+        # 如果图片裁切得太小会看不出资源的位置在哪，检查图片裁切的长和宽看够不够1000，不到1000的按1000裁切
+        if (self.x_end - self.x_start) < 1000:
+            center = int((self.x_end + self.x_start) / 2)
+            self.x_start = center - 500
+            self.x_end = center + 500
+        if (self.y_end - self.y_start) < 1000:
+            center = int((self.y_end + self.y_start) / 2)
+            self.y_start = center - 500
+            self.y_end = center + 500
+
+        self.map_image = self.map_image.crop((self.x_start, self.y_start,
+                                              self.x_end, self.y_end))
+
+    def gen_jpg(self):
+        if not self.resource_xy_list:
+            return "没有这个资源的信息"
+        if not os.path.exists("cache"):
+            os.mkdir("cache")  # 查找 cache 目录 (缓存目录) 是否存在，如果不存在则创建
+        self.crop()
+        self.paste()
+        self.map_image.save(f'cache{os.sep}map.jpg', format='JPEG')
+
+    def get_resource_count(self):
+        return len(self.resource_xy_list)