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

'location' wasn't the variable i thought it was

Browse source
This commit is contained in:
jesopo 2019-06-18 16:40:42 +01:00
parent d43cef6543
commit 14303f354c
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/weather.py
View file

@ -10,7 +10,8 @@ class Module(ModuleManager.BaseModule):
def _user_location(self, user): def _user_location(self, user):
user_location = user.get_setting("location", None) user_location = user.get_setting("location", None)
if not user_location == None: if not user_location == None:
return [user_location["lat"], user_location["lon"]] name = user_location.get("name", None)
return [user_location["lat"], user_location["lon"], name]
@utils.hook("received.command.w", alias_of="weather") @utils.hook("received.command.w", alias_of="weather")
@utils.hook("received.command.weather") @utils.hook("received.command.weather")
@ -40,7 +41,7 @@ class Module(ModuleManager.BaseModule):
args = {"units": "metric", "APPID": api_key} args = {"units": "metric", "APPID": api_key}
if location: if location:
lat, lon = location lat, lon, location_name = location
args["lat"] = lat args["lat"] = lat
args["lon"] = lon args["lon"] = lon
else: else:
@ -49,8 +50,8 @@ class Module(ModuleManager.BaseModule):
page = utils.http.request(URL_WEATHER, get_params=args, json=True) page = utils.http.request(URL_WEATHER, get_params=args, json=True)
if page: if page:
if "weather" in page.data: if "weather" in page.data:
if "name" in location: if location_name:
location_str = location["name"] location_str = location_name
else: else:
location_parts = [page.data["name"]] location_parts = [page.data["name"]]
if "country" in page.data["sys"]: if "country" in page.data["sys"]: