update code

This commit is contained in:
hibiki
2021-08-17 23:17:08 +08:00
parent 3c6a365718
commit 1996f0d96a
73 changed files with 1501 additions and 1163 deletions
+5 -2
View File
@@ -17,8 +17,11 @@ weather = on_regex(r".*?(.*)市?的?天气.*?", priority=5, block=True)
@weather.handle()
async def _(bot: Bot, event: MessageEvent, state: T_State):
msg = get_message_text(event.json())
msg = re.search(r".*?(.*)市?的?天气.*?", msg)
msg = msg.group(1)
msg1 = re.search(r".*?(.*)市?的?天气.*?", msg)
msg2 = re.search(r".*?天气(.*).*?", msg)
msg1 = msg1.group(1)
msg2 = msg2.group(1)
msg = msg1 if msg1 else msg2
if msg[-1] == "的":
msg = msg[:-1]
if msg[-1] != "市":
+3 -2
View File
@@ -2,6 +2,7 @@ from services.log import logger
from utils.message_builder import image
from utils.user_agent import get_user_agent
from configs.path_config import TXT_PATH
from configs.config import NICKNAME
from asyncio.exceptions import TimeoutError
from typing import List
from nonebot import Driver
@@ -26,7 +27,7 @@ async def get_weather_of_city(city: str) -> str:
if code == 999:
return "不要查一个省份的天气啊,很累人的!"
elif code == 998:
return "真寻只可以查询国内的天气喔..."
return f"{NICKNAME}只可以查询国内城市的天气喔..."
else:
async with aiohttp.ClientSession(headers=get_user_agent()) as session:
async with session.get(
@@ -35,7 +36,7 @@ async def get_weather_of_city(city: str) -> str:
data_json = json.loads(await res.text(encoding="utf8"))
if "desc" in data_json:
if data_json["desc"] == "invilad-citykey":
return "你为啥不查火星的天气呢?小真寻只支持国内天气查询!!" + image(
return f"你为啥不查火星的天气呢?{NICKNAME}只支持国内天气查询!!" + image(
"shengqi", "zhenxun"
)
elif data_json["desc"] == "OK":