X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=data%2Frbot%2Fplugins%2Frss.rb;h=e276d0a44bc3343d208e1a19f8e34e6b37e28323;hb=c076cffc3616290badcc5e14aeb06cb291021a53;hp=d976c4126446252c7068dddf805264b318df8041;hpb=571bb66a39be594f7d5af00336e3123ba00ea25c;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/rss.rb b/data/rbot/plugins/rss.rb
index d976c412..e276d0a4 100644
--- a/data/rbot/plugins/rss.rb
+++ b/data/rbot/plugins/rss.rb
@@ -1,7 +1,12 @@
+#-- vim:sw=2:et
+#++
+#
 # RSS feed plugin for RubyBot
 # (c) 2004 Stanislav Karchebny <berkus@madfire.net>
 # (c) 2005 Ian Monroe <ian@monroe.nu>
 # (c) 2005 Mark Kretschmann <markey@web.de>
+# (c) 2006 Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
+#
 # Licensed under MIT License.
 
 require 'rss/parser'
@@ -54,19 +59,28 @@ class ::RssBlob
   end
 
   def watched_by?(who)
-    @watchers.include?(who)
+    # We need to check bot 'who' itself and the String form, because rss
+    # watches added before the new Irc framework represented watchers as
+    # Strings whereas they are now Channels.
+    #
+    @watchers.include?(who) || @watchers.include?(who.to_s) 
   end
 
   def add_watch(who)
     if watched_by?(who)
       return nil
     end
-    @watchers << who unless watched_by?(who)
+    # TODO FIXME? should we just store watchers as Strings instead?
+    # This should then be @watchers << who.downcase
+    @watchers << who
     return who
   end
 
   def rm_watch(who)
+    # See comment to watched_by?
+    #
     @watchers.delete(who)
+    @watchers.delete(who.to_s)
   end
 
   def to_a
@@ -94,7 +108,7 @@ class RSSFeedsPlugin < Plugin
 
   BotConfig.register BotConfigIntegerValue.new('rss.thread_sleep',
     :default => 300, :validate => Proc.new{|v| v > 30},
-    :desc => "How many characters to use of a RSS item text")
+    :desc => "How many seconds to sleep before checking RSS feeds again")
 
   @@watchThreads = Hash.new
   @@mutex = Mutex.new
@@ -363,7 +377,7 @@ class RSSFeedsPlugin < Plugin
     return feed
   end
 
-  def rewatch_rss(m=nil)
+  def rewatch_rss(m=nil, params=nil)
     kill_threads
 
     # Read watches from list.
@@ -406,7 +420,8 @@ class RSSFeedsPlugin < Plugin
               }
               if dispItems.length > 0
                 debug "Found #{dispItems.length} new items in #{feed}"
-                dispItems.each { |item|
+                # When displaying watched feeds, publish them from older to newer
+                dispItems.reverse.each { |item|
                   @@mutex.synchronize {
                     printFormattedRss(feed, item)
                   }
@@ -580,6 +595,6 @@ plugin.map 'rss unwatch :handle',
   :action => 'unwatch_rss'
 plugin.map 'rss rmwatch :handle',
   :action => 'unwatch_rss'
-plugin.map 'rss rewatch :handle',
+plugin.map 'rss rewatch',
   :action => 'rewatch_rss'