From 5476f63566dc66149e6f3ecafa8edaa473a3d056 Mon Sep 17 00:00:00 2001
From: xtaodada <xtao@xtaolink.cn>
Date: Sat, 20 Nov 2021 21:49:22 +0800
Subject: [PATCH] =?UTF-8?q?vip=20=E6=94=AF=E6=8C=81=E5=92=8C=E9=A3=8E?=
 =?UTF-8?q?=E5=A4=A9=E6=B0=94=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore |  1 +
 list.json  |  4 ++--
 vip.py     | 24 +++++++++++++++++++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1ff4a37..1e7a64e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ __pycache__/
 
 # C extensions
 *.so
+*/desktop.files.json
 
 # Distribution / packaging
 .Python
diff --git a/list.json b/list.json
index 1c6f0cc..cb4d1a7 100644
--- a/list.json
+++ b/list.json
@@ -342,13 +342,13 @@
         },
         {
             "name": "vip",
-            "version": "0.61",
+            "version": "0.62",
             "section": "chat",
             "maintainer": "xtaodada",
             "size": "9.8 kb",
             "supported": true,
             "des-short": "vip 捐赠用户功能",
-            "des": "命令：天气：weather weather_pic \nPixiv：pixiv \n百度：baidu Duckduckgo：duckduckgo\n相似动漫：whatanime。与 weather 插件冲突"
+            "des": "命令：天气：weather weather_pic weather_he\nPixiv：pixiv \n百度：baidu Duckduckgo：duckduckgo\n相似动漫：whatanime。与 weather 插件冲突"
         },
         {
             "name": "calculator",
diff --git a/vip.py b/vip.py
index 025e76b..d2a0c0b 100644
--- a/vip.py
+++ b/vip.py
@@ -78,7 +78,7 @@ async def weather(context):
 @listener(is_plugin=True, outgoing=True, command=alias_command("weather_pic"),
           description="使用彩云天气 api 查询国内实时天气。",
           parameters="<位置>")
-async def weather(context):
+async def weather_pic(context):
     await context.edit("获取中 . . .")
     reply = await context.get_reply_message()
     try:
@@ -97,6 +97,28 @@ async def weather(context):
     await context.delete()
 
 
+@listener(is_plugin=True, outgoing=True, command=alias_command("weather_he"),
+          description="使用和风天气 api 查询国内省市实时天气。",
+          parameters="<位置>")
+async def weather_he(context):
+    await context.edit("获取中 . . .")
+    reply = await context.get_reply_message()
+    try:
+        message = await obtain_message(context)
+    except ValueError:
+        await context.edit("出错了呜呜呜 ~ 无效的参数。")
+        return
+    async with bot.conversation('PagerMaid_Modify_bot') as conversation:
+        await conversation.send_message('/weather_he ' + message)
+        chat_response = await conversation.get_response()
+        await bot.send_read_acknowledge(conversation.chat_id)
+    if reply:
+        await context.respond(chat_response, reply_to=reply)
+    else:
+        await context.respond(chat_response)
+    await context.delete()
+
+
 @listener(is_plugin=True, outgoing=True, command=alias_command("pixiv"),
           description="查询插画信息 （或者回复一条消息）。使用 set [num] 更改镜像源，序号 2 为官方源， 3 为凯露自建源。异步下载需要依赖库 "
                       "aiohttp[speedups] 、 aiofiles",