X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Frss.rb;h=22aa742ff6bc3c08f98a1020123f9c8e19ace2f2;hb=3f8710a19b6989cd1c67629a92fd992968579456;hp=e0d4df01747b4b6ccf77049133c62d9d22f20e0b;hpb=1107570cb696e4d9f870da00282233b60b8a00ca;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/rss.rb b/data/rbot/plugins/rss.rb
index e0d4df01..22aa742f 100644
--- a/data/rbot/plugins/rss.rb
+++ b/data/rbot/plugins/rss.rb
@@ -46,13 +46,20 @@ module ::RSS
           full_name = "#{SLASH_PREFIX}_#{name}"
           full_plural_name = "#{SLASH_PREFIX}_#{plural}"
           klass_name = "Slash#{Utils.to_class_name(name)}"
-          klass.install_must_call_validator(SLASH_PREFIX, SLASH_URI)
-          klass.install_have_children_element(name, SLASH_URI, "*",
-                                              full_name, full_plural_name)
+
+          # This will fail with older version of the Ruby RSS module
+          begin
+            klass.install_have_children_element(name, SLASH_URI, "*",
+                                                full_name, full_plural_name)
+            klass.install_must_call_validator(SLASH_PREFIX, SLASH_URI)
+          rescue ArgumentError
+            klass.module_eval("install_have_children_element(#{full_name.dump}, #{full_plural_name.dump})")
+          end
+
           klass.module_eval(<<-EOC, *get_file_and_line_from_caller(0))
-          remove_method :#{full_name}
-          remove_method :#{full_name}=
-          remove_method :set_#{full_name}
+          remove_method :#{full_name}     if method_defined? :#{full_name}
+          remove_method :#{full_name}=    if method_defined? :#{full_name}=
+          remove_method :set_#{full_name} if method_defined? :set_#{full_name}
 
           def #{full_name}
             @#{full_name}.first and @#{full_name}.first.value
@@ -105,9 +112,15 @@ module ::RSS
           alias_method(:value=, :content=)
 
           def initialize(*args)
-            if Utils.element_initialize_arguments?(args)
-              super
-            else
+            begin
+              if Utils.element_initialize_arguments?(args)
+                super
+              else
+                super()
+                self.content = args[0]
+              end
+            # Older Ruby RSS module
+            rescue NoMethodError
               super()
               self.content = args[0]
             end
@@ -229,19 +242,19 @@ class ::RssBlob
 end
 
 class RSSFeedsPlugin < Plugin
-  BotConfig.register BotConfigIntegerValue.new('rss.head_max',
-    :default => 30, :validate => Proc.new{|v| v > 0 && v < 200},
+  Config.register Config::IntegerValue.new('rss.head_max',
+    :default => 100, :validate => Proc.new{|v| v > 0 && v < 200},
     :desc => "How many characters to use of a RSS item header")
 
-  BotConfig.register BotConfigIntegerValue.new('rss.text_max',
-    :default => 90, :validate => Proc.new{|v| v > 0 && v < 400},
+  Config.register Config::IntegerValue.new('rss.text_max',
+    :default => 200, :validate => Proc.new{|v| v > 0 && v < 400},
     :desc => "How many characters to use of a RSS item text")
 
-  BotConfig.register BotConfigIntegerValue.new('rss.thread_sleep',
+  Config.register Config::IntegerValue.new('rss.thread_sleep',
     :default => 300, :validate => Proc.new{|v| v > 30},
     :desc => "How many seconds to sleep before checking RSS feeds again")
 
-  BotConfig.register BotConfigBooleanValue.new('rss.show_updated',
+  Config.register Config::BooleanValue.new('rss.show_updated',
     :default => true,
     :desc => "Whether feed items for which the description was changed should be shown as new")
 
@@ -270,15 +283,15 @@ class RSSFeedsPlugin < Plugin
       # the restore to work.
       #
       # This is actually pretty safe for a number of reasons:
-      #  * the code is only called if standard marshalling fails
-      #  * the string we look for is quite unlikely to appear randomly
-      #  * if the string appears somewhere and the patched string isn't recoverable
-      #    either, we'll get another (unrecoverable) error, which makes the rss
-      #    plugin unsable, just like it was if no recovery was attempted
-      #  * if the string appears somewhere and the patched string is recoverable,
-      #    we may get a b0rked feed, which is eventually overwritten by a clean
-      #    one, so the worst thing that can happen is that a feed update spams
-      #    the watchers once
+      # * the code is only called if standard marshalling fails
+      # * the string we look for is quite unlikely to appear randomly
+      # * if the string appears somewhere and the patched string isn't recoverable
+      #   either, we'll get another (unrecoverable) error, which makes the rss
+      #   plugin unsable, just like it was if no recovery was attempted
+      # * if the string appears somewhere and the patched string is recoverable,
+      #   we may get a b0rked feed, which is eventually overwritten by a clean
+      #   one, so the worst thing that can happen is that a feed update spams
+      #   the watchers once
       @registry.recovery = Proc.new { |val|
         patched = val.sub(":\v@mutexo:\nMutex", ":\v@mutexo:\vObject")
         ret = Marshal.restore(patched)
@@ -298,7 +311,7 @@ class RSSFeedsPlugin < Plugin
         @feeds.delete(k)
       }
       @feeds.each { |k, f|
-        f.mutex = Mutex.new unless f.mutex
+        f.mutex = Mutex.new
         f.sanitize_watchers
         parseRss(f) if f.xml
       }
@@ -319,6 +332,7 @@ class RSSFeedsPlugin < Plugin
 
   def cleanup
     stop_watches
+    super
   end
 
   def save
@@ -414,7 +428,25 @@ class RSSFeedsPlugin < Plugin
 
     m.reply "lemme fetch it..."
     title = items = nil
-    fetched = fetchRss(feed, m, false)
+    we_were_watching = false
+
+    if @watch.key?(feed.handle)
+      # If a feed is being watched, we run the watcher thread
+      # so that all watchers can be informed of changes to
+      # the feed. Before we do that, though, we remove the
+      # show requester from the watchlist, if present, lest
+      # he gets the update twice.
+      if feed.watched_by?(m.replyto)
+        we_were_watching = true
+        feed.rm_watch(m.replyto)
+      end
+      @bot.timer.reschedule(@watch[feed.handle], 0)
+      if we_were_watching
+        feed.add_watch(m.replyto)
+      end
+    else
+      fetched = fetchRss(feed, m, false)
+    end
     return unless fetched or feed.xml
     if not fetched and feed.items
       m.reply "using old data"
@@ -575,6 +607,7 @@ class RSSFeedsPlugin < Plugin
 
   def del_rss(m, params, pass=false)
     feed = unwatch_rss(m, params, true)
+    return unless feed
     if feed.watched?
       m.reply "someone else is watching #{feed.handle}, I won't remove it from my list"
       return
@@ -659,7 +692,7 @@ class RSSFeedsPlugin < Plugin
     status = Hash.new
     status[:failures] = 0
     status[:first_run] = true
-    @watch[feed.handle] = @bot.timer.add(0, status) {
+    @watch[feed.handle] = @bot.timer.add(0) {
       debug "watcher for #{feed} started"
       failures = status[:failures]
       first_run = status.delete(:first_run)
@@ -715,7 +748,7 @@ class RSSFeedsPlugin < Plugin
                   else
                     debug "accepting new #{uid} #{item.inspect}"
                     debug [uid, txt].inspect
-                    warn "same text! #{txt}" if otxt.include?(txt)
+                    warning "same text! #{txt}" if otxt.include?(txt)
                     false
                   end
                 }
@@ -741,12 +774,16 @@ class RSSFeedsPlugin < Plugin
 
       status[:failures] = failures
 
+      timer = nil
+      seconds = @bot.config['rss.thread_sleep']
       feed.mutex.synchronize do
-        seconds = (feed.refresh_rate || @bot.config['rss.thread_sleep']) * (failures + 1)
-        seconds += seconds * (rand(100)-50)/100
-        debug "watcher for #{feed} going to sleep #{seconds} seconds.."
-        @bot.timer.reschedule(@watch[feed.handle], seconds)
+        timer = @watch[feed.handle]
+        seconds = feed.refresh_rate if feed.refresh_rate
       end
+      seconds *= failures + 1
+      seconds += seconds * (rand(100)-50)/100
+      debug "watcher for #{feed} going to sleep #{seconds} seconds.."
+      @bot.timer.reschedule(timer, seconds) rescue warning "watcher for #{feed} failed to reschedule: #{$!.inspect}"
     }
     debug "watcher for #{feed} added"
   end
@@ -778,9 +815,18 @@ class RSSFeedsPlugin < Plugin
       end
     end
 
-    title = "#{Bold}#{item.title.ircify_html}#{Bold}" if item.title
+    tit_opt = {}
+    # Twitters don't need a cap on the title length since they have a hard
+    # limit to 160 characters, and most of them are under 140 characters
+    tit_opt[:limit] = @bot.config['rss.head_max'] unless feed.type == 'twitter'
 
-    desc = item.description.ircify_html(:a_href => :link_out) if item.description
+    title = "#{Bold}#{item.title.ircify_html(tit_opt)}#{Bold}" if item.title
+
+    desc_opt = {
+      :limit => @bot.config['rss.text_max'],
+      :a_href => :link_out
+    }
+    desc = item.description.ircify_html(desc_opt) if item.description
 
     link = item.link.chomp if item.link
 
@@ -945,6 +991,9 @@ plugin.map 'rss replace :handle :url :type',
 plugin.map 'rss forcereplace :handle :url :type',
   :action => 'forcereplace_rss',
   :defaults => {:type => nil}
+plugin.map 'rss watch :handle [in :chan]',
+  :action => 'watch_rss',
+  :defaults => {:url => nil, :type => nil}
 plugin.map 'rss watch :handle :url :type [in :chan]',
   :action => 'watch_rss',
   :defaults => {:url => nil, :type => nil}