X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/4b5f28dde311d1f8cc5cce200329207e95f4d8f0..d4cfb340ddd9659422ec8a6a3ecf3abf25f00190:/modules/weather.py

diff --git a/modules/weather.py b/modules/weather.py
index 2249aba..6b50771 100644
--- a/modules/weather.py
+++ b/modules/weather.py
@@ -6,7 +6,7 @@
 modinfo = {
 	'author': 'Erebus Team',
 	'license': 'public domain',
-	'compatible': [2],
+	'compatible': [0],
 	'depends': ['userinfo'],
 	'softdeps': ['help'],
 }
@@ -22,25 +22,24 @@ import json, urllib, time, rfc822
 
 def location(person, default=None): return lib.mod('userinfo')._get(person, 'location', default=None)
 
-@lib.hook(('weather','w'), needchan=False)
-@lib.help('[<location>]', 'show weather for your location')
-def weather(bot, user, chan, realtarget, *args):
-	if len(args) == 0:
-		place = location(user)
-	else:
-		place = ' '.join(args)
-
+def _weather(place):
 	if place is not None:
 		weather = json.load(urllib.urlopen('http://api.wunderground.com/api/8670e6d2e69ff3c7/conditions/q/%s.json' % (place)))
-		if 'error' in weather:
-			bot.msg(chan, "Error from Wunderground: %s" % (weather['error']['description']))
-			return
+		if lib.parent.cfg.getboolean('debug', 'weather'):
+			lib.parent.log('*', "?", repr(weather))
+		if 'response' in weather:
+			if 'error' in weather['response']:
+				return "Error from Wunderground: %s" % (weather['response']['error']['description'])
+			if 'results' in weather['response']:
+				return "That search term is ambiguous. Please be more specific."
 
 		current = weather['current_observation']
-		measuredat = rfc822.parsedate_tz(current['observation_time_rfc822'])[:-1] # parsedate_tz returns a 10-tuple which strftime DOESN'T ACCEPT
+		measuredat = rfc822.parsedate(current['observation_time_rfc822']) # parsedate_tz returns a 10-tuple which strftime DOESN'T ACCEPT
 		measuredatTZ = current['local_tz_short']
-		output = u"Weather in %(location)s: As of %(time)s %(tz)s, %(conditions)s, %(cel)s\u00B0C (%(far)s\u00B0F) (feels like %(flcel)s\u00B0C (%(flfar)s\u00B0F)). Wind %(wind)s. %(link)s" % {
-			'location': current['observation_location']['full'],
+		loc = current['observation_location']
+		if loc['city'] == "" or loc['state'] == "": loc = current['display_location']
+		return u"Weather in %(location)s: As of %(time)s %(tz)s, %(conditions)s, %(cel)s\u00B0C (%(far)s\u00B0F) (feels like %(flcel)s\u00B0C (%(flfar)s\u00B0F)). Wind %(wind)s. %(link)s" % {
+			'location': loc['full'],
 			'time': time.strftime("%a %H:%M", measuredat), 'tz': measuredatTZ,
 			'conditions': current['weather'],
 			'cel': current['temp_c'], 'far': current['temp_f'],
@@ -48,6 +47,21 @@ def weather(bot, user, chan, realtarget, *args):
 			'wind': current['wind_string'],
 			'link': current['forecast_url'],
 		}
-		bot.msg(chan, output)
 	else:
-		bot.msg(chan, "I don't know where to look! Try SETINFO LOCATION <your location>")
+		return "I don't know where to look! Try %sSETINFO LOCATION <your location>" % (lib.parent.trigger)
+
+@lib.hook(('weather','w'), needchan=False, wantchan=True)
+@lib.help('[<location>]', 'show weather for your location')
+def weather(bot, user, chan, realtarget, *args):
+	if chan is None:
+		chan = user
+	if len(args) == 0:
+		place = location(user)
+	else:
+		place = ' '.join(args)
+	bot.msg(chan, _weather(place))
+
+@lib.hook(('weatheruser','wu'))
+@lib.help('<user>', 'show weather for <user>\'s location')
+def wu(bot, user, chan, realtarget, *args):
+	bot.msg(chan, _weather(location(' '.join(args))))