Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

dont fail !weather when we decide a nickname is a location

Browse source
This commit is contained in:
jesopo 2019-10-16 15:53:34 +01:00
parent 6d29291f47
commit 4a4a0ac45b
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/weather.py
View file

@ -25,15 +25,15 @@ class Module(ModuleManager.BaseModule):
api_key = self.bot.config["openweathermap-api-key"] api_key = self.bot.config["openweathermap-api-key"]
location = None location = None
query = None
nickname = None nickname = None
if event["args"]: if event["args"]:
query = event["args"]
if len(event["args_split"]) == 1 and event["server"].has_user_id( if len(event["args_split"]) == 1 and event["server"].has_user_id(
event["args_split"][0]): event["args_split"][0]):
target_user = event["server"].get_user(event["args_split"][0]) target_user = event["server"].get_user(event["args_split"][0])
location = self._user_location(target_user) location = self._user_location(target_user)
if location == None: if not location == None:
location = event["args_split"][0]
else:
nickname = target_user.nickname nickname = target_user.nickname
else: else:
location = self._user_location(event["user"]) location = self._user_location(event["user"])
@ -44,12 +44,13 @@ class Module(ModuleManager.BaseModule):
args = {"units": "metric", "APPID": api_key} args = {"units": "metric", "APPID": api_key}
if location == None and query:
location_info = self.exports.get_one("get-location")(query)
if not location_info == None:
location = [location_info["lat"], location_info["lon"],
location_info.get("name", None)]
if location == None: if location == None:
location_info = self.exports.get_one("get-location")(event["args"]) raise utils.EventError("Unknown location")
if location_info == None:
raise utils.EventError("Unknown location")
location = [location_info["lat"], location_info["lon"],
location_info.get("name", None)]
lat, lon, location_name = location lat, lon, location_name = location
args["lat"] = lat args["lat"] = lat