added 'alias rm' as alternative for 'alias remove'

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

diff --git a/data/rbot/plugins/rss.rb b/data/rbot/plugins/rss.rb
index 8e157b86b9fb05780a1a498270b38cedd9acf304..ed37965036ff4abfadd6fe60fba50bb4ab32f671 100644 (file)
--- a/data/rbot/plugins/rss.rb
+++ b/data/rbot/plugins/rss.rb
@@ -16,8 +16,6 @@
 \r
 require 'rss'\r
 \r
-# Add support for Slashdot namespace in RDF. The code is just an adaptation of\r
-# the DublinCore code.\r
 module ::RSS\r
 \r
   # Make an  'unique' ID for a given item, based on appropriate bot options\r
@@ -30,6 +28,8 @@ module ::RSS
     [item.title, item.link, desc].hash\r
   end\r
 \r
+  # Add support for Slashdot namespace in RDF. The code is just an adaptation\r
+  # of the DublinCore code.\r
   unless defined?(SLASH_PREFIX)\r
     SLASH_PREFIX = 'slash'\r
     SLASH_URI = "http://purl.org/rss/1.0/modules/slash/"\r
@@ -230,11 +230,11 @@ end
 \r
 class RSSFeedsPlugin < Plugin\r
   BotConfig.register BotConfigIntegerValue.new('rss.head_max',\r
-    :default => 30, :validate => Proc.new{|v| v > 0 && v < 200},\r
+    :default => 100, :validate => Proc.new{|v| v > 0 && v < 200},\r
     :desc => "How many characters to use of a RSS item header")\r
 \r
   BotConfig.register BotConfigIntegerValue.new('rss.text_max',\r
-    :default => 90, :validate => Proc.new{|v| v > 0 && v < 400},\r
+    :default => 200, :validate => Proc.new{|v| v > 0 && v < 400},\r
     :desc => "How many characters to use of a RSS item text")\r
 \r
   BotConfig.register BotConfigIntegerValue.new('rss.thread_sleep',\r
@@ -289,6 +289,7 @@ class RSSFeedsPlugin < Plugin
       }\r
 \r
       @feeds = @registry[:feeds]\r
+      raise unless @feeds\r
 \r
       @registry.recovery = nil\r
 \r
@@ -336,7 +337,7 @@ class RSSFeedsPlugin < Plugin
         debug "Stopping watch #{handle}"\r
         @bot.timer.remove(@watch[handle])\r
         @watch.delete(handle)\r
-      rescue => e\r
+      rescue Exception => e\r
         report_problem("Failed to stop watch for #{handle}", e, nil)\r
       end\r
     end\r
@@ -463,7 +464,7 @@ class RSSFeedsPlugin < Plugin
       reply = "no feeds found"\r
       reply << " matching #{wanted}" if wanted\r
     end\r
-    m.reply reply\r
+    m.reply reply, :max_lines => reply.length\r
   end\r
 \r
   def watched_rss(m, params)\r
@@ -668,7 +669,10 @@ class RSSFeedsPlugin < Plugin
         unless fetchRss(feed)\r
           failures += 1\r
         else\r
-          if first_run or (oldxml and oldxml == feed.xml)\r
+          if first_run\r
+            debug "first run for #{feed}, getting items"\r
+            parseRss(feed)\r
+          elsif oldxml and oldxml == feed.xml\r
             debug "xml for #{feed} didn't change"\r
             failures -= 1 if failures > 0\r
           else\r
@@ -685,6 +689,7 @@ class RSSFeedsPlugin < Plugin
               oids = Set.new feed.items.map { |item|\r
                 uid = RSS.item_uid_for_bot(item, uid_opts)\r
                 otxt << item.to_s\r
+                debug [uid, item].inspect\r
                 debug [uid, otxt.last].inspect\r
                 uid\r
               }\r
@@ -695,6 +700,10 @@ class RSSFeedsPlugin < Plugin
               else\r
                 debug "Checking if new items are available for #{feed}"\r
                 failures -= 1 if failures > 0\r
+                # debug "Old:"\r
+                # debug oldxml\r
+                # debug "New:"\r
+                # debug feed.xml\r
 \r
                 dispItems = feed.items.reject { |item|\r
                   uid = RSS.item_uid_for_bot(item, uid_opts)\r
@@ -752,13 +761,13 @@ class RSSFeedsPlugin < Plugin
       if opts.key?(:date) && opts[:date]\r
         if item.respond_to?(:pubDate) \r
           if item.pubDate.class <= Time\r
-            date = item.pubDate.strftime("%Y/%m/%d %H.%M.%S")\r
+            date = item.pubDate.strftime("%Y/%m/%d %H:%M")\r
           else\r
             date = item.pubDate.to_s\r
           end\r
         elsif  item.respond_to?(:date)\r
           if item.date.class <= Time\r
-            date = item.date.strftime("%Y/%m/%d %H.%M.%S")\r
+            date = item.date.strftime("%Y/%m/%d %H:%M")\r
           else\r
             date = item.date.to_s\r
           end\r
@@ -769,15 +778,17 @@ class RSSFeedsPlugin < Plugin
       end\r
     end\r
 \r
-    title = "#{Bold}#{item.title.ircify_html}#{Bold}" if item.title\r
+    title = "#{Bold}#{item.title.ircify_html :limit => @bot.config['rss.head_max']}#{Bold}" if item.title\r
 \r
-    desc = item.description.ircify_html(:a_href => :link_out) if item.description\r
+    desc = item.description.ircify_html(:limit => @bot.config['rss.text_max'], :a_href => :link_out) if item.description\r
 \r
     link = item.link.chomp if item.link\r
 \r
     debug item.inspect\r
-    category = item.dc_subject rescue item.category rescue nil\r
+    category = item.dc_subject rescue item.category.content rescue nil\r
+    category = nil if category and category.empty?\r
     author = item.dc_creator rescue item.author rescue nil\r
+    author = nil if author and author.empty?\r
 \r
     line1 = nil\r
     line2 = nil\r
@@ -785,8 +796,9 @@ class RSSFeedsPlugin < Plugin
     at = ((item.title && item.link) ? ' @ ' : '')\r
     case feed.type\r
     when 'blog'\r
+      author << " " if author\r
       abt = category ? "about #{category} " : ""\r
-      line1 = "#{handle}#{date}#{author} blogged #{abt}at #{link}"\r
+      line1 = "#{handle}#{date}#{author}blogged #{abt}at #{link}"\r
       line2 = "#{handle}#{title} - #{desc}"\r
     when 'forum'\r
       line1 = "#{handle}#{date}#{title}#{at}#{link}"\r
@@ -933,6 +945,9 @@ plugin.map 'rss replace :handle :url :type',
 plugin.map 'rss forcereplace :handle :url :type',\r
   :action => 'forcereplace_rss',\r
   :defaults => {:type => nil}\r
+plugin.map 'rss watch :handle [in :chan]',\r
+  :action => 'watch_rss',\r
+  :defaults => {:url => nil, :type => nil}\r
 plugin.map 'rss watch :handle :url :type [in :chan]',\r
   :action => 'watch_rss',\r
   :defaults => {:url => nil, :type => nil}\r