From 7c5c0101174090565bc079863fe3980e9f7752ee Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Thu, 8 Nov 2007 23:59:26 +0000 Subject: [PATCH] weather plugin: properly support multiple US and non-US stations --- data/rbot/plugins/weather.rb | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/data/rbot/plugins/weather.rb b/data/rbot/plugins/weather.rb index c241daa8..b5835447 100644 --- a/data/rbot/plugins/weather.rb +++ b/data/rbot/plugins/weather.rb @@ -202,9 +202,8 @@ class WeatherPlugin < Plugin else m.reply "couldn't parse weather data from #{where}" end - when //) - m.reply "multiple stations available, use 'weather station ' where code is one of " + stations.join(", ") + when /\s*(.*?)<\/a>\s*:\s*(.*?)<\/td>/m) + m.reply "multiple stations available, use 'weather station ' or 'weather ' as appropriate, for one of the following (current temp shown):" + stations.map! { |ar| + if ar.first # US state + "%s, %s (%s): %s" % [ar[1], ar[0], ar[2], wu_clean(ar[3])] + else # non-US station + "station %s (%s): %s" % [ar[1], ar[2], wu_clean(ar[3])] + end + } + m.reply stations.join("; ") + end + def wu_weather_filter(stuff) txt = wu_clean(stuff) -- 2.39.5