diff options
author | Kyomotoi <[email protected]> | 2020-07-07 13:55:13 +0800 |
---|---|---|
committer | Kyomotoi <[email protected]> | 2020-07-07 13:55:13 +0800 |
commit | 76bc5249a90c371db53acd797aa8241d6d67b2e2 (patch) | |
tree | e7c236a7b11d0d3aa3968d4b8b2d8b5ba0774c5a /AyaBot/plugins | |
parent | 7f4ba5aab9db1695a3bc77efca5f92708ae41d65 (diff) | |
parent | 1dfaebb282eeeda813c6e42a876fcffb313ccdce (diff) | |
download | ATRI-76bc5249a90c371db53acd797aa8241d6d67b2e2.tar.gz ATRI-76bc5249a90c371db53acd797aa8241d6d67b2e2.tar.bz2 ATRI-76bc5249a90c371db53acd797aa8241d6d67b2e2.zip |
Merge branch 'master' of https://github.com/Kyomotoi/Aya
Diffstat (limited to 'AyaBot/plugins')
-rw-r--r-- | AyaBot/plugins/mojang.py | 10 | ||||
-rw-r--r-- | AyaBot/plugins/weather.py | 5 |
2 files changed, 5 insertions, 10 deletions
diff --git a/AyaBot/plugins/mojang.py b/AyaBot/plugins/mojang.py index 61a7dab..f7c4f35 100644 --- a/AyaBot/plugins/mojang.py +++ b/AyaBot/plugins/mojang.py @@ -1,6 +1,4 @@ import json -import base64 -import nonebot import requests from mcstatus import MinecraftServer from nonebot import on_command, CommandSession @@ -14,16 +12,16 @@ async def _(session: CommandSession): if ip == '南外手艺': ip = str('mc.nflsedition.com:26164') - + elif ip == 'hypixel': ip = str('mc.hypixel.net') elif ip == 'shotbow': ip = str('us.shotbow.net') - + elif ip == 'potterworld': ip = str('potterworldmc.com') - + else: pass @@ -57,4 +55,4 @@ async def check_mc_id(session: CommandSession): await session.send(f'{player}可能为非正版玩家,无法查询到其信息') except: - await session.send('mojang似乎炸了...等一会吧')
\ No newline at end of file + await session.send('mojang似乎炸了...等一会吧') diff --git a/AyaBot/plugins/weather.py b/AyaBot/plugins/weather.py index 69daa71..bfb4e58 100644 --- a/AyaBot/plugins/weather.py +++ b/AyaBot/plugins/weather.py @@ -1,9 +1,6 @@ # -*- coding:utf-8 -*- -import os -import re import json import requests -from os import path from nonebot import on_command, CommandSession from AyaBot.plugins.module import google_translate @@ -215,4 +212,4 @@ async def _(session: CommandSession): if not stripped_arg: session.pause('要查询的城市不能为空,请重新输入') - session.state[session.current_key] = stripped_arg
\ No newline at end of file + session.state[session.current_key] = stripped_arg |