quiz: stop quizzes and timers on cleanup

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / digg.rb

diff --git a/data/rbot/plugins/digg.rb b/data/rbot/plugins/digg.rb
index 43b7c9f5f9a4bbbb65be6d6906dc0ce2bf033de5..dc0ea6c897abaaf0d5d295bc8f51e0cbe963fd9f 100644 (file)
--- a/data/rbot/plugins/digg.rb
+++ b/data/rbot/plugins/digg.rb
@@ -9,13 +9,13 @@ class DiggPlugin < Plugin
   def help(plugin, topic="")
     "digg [<max>=5] => show digg headlines, [<max>=5] => return up to <max> headlines (use a negative number to show all the headlines on one line)"
   end
-  
+
   def digg(m, params)
     max = params[:limit].to_i
     debug "max is #{max}"
-    xml = @bot.httputil.get_cached(URI.parse("http://digg.com/rss/index.xml"))
+    xml = @bot.httputil.get('http://services.digg.com/2.0/story.getTopNews?type=rss')
     unless xml
-      m.reply "digg news parse failed"
+      m.reply "digg news unavailable"
       return
     end
     doc = Document.new xml
@@ -32,11 +32,11 @@ class DiggPlugin < Plugin
     max = 8 if max > 8
     matches = Array.new
     doc.elements.each("rss/channel/item") {|e|
-      matches << [ e.elements["title"].text, 
+      matches << [ e.elements["title"].text.strip,
                    Time.parse(e.elements["pubDate"].text).strftime('%a @ %I:%M%p') ]
       done += 1
       break if done >= max
-    } 
+    }
     if oneline
       m.reply matches.collect{|mat| mat[0]}.join(" | ")
     else