X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Frss.rb;h=882a15fbd7c3a5c80c426814044a23d5cfa0f30d;hb=1ea3decbbacd73bf93f52f3ce392914cc924df4f;hp=74f78e0d281a2c0694356a5b60423ffdd7fb3b39;hpb=287a469cb56ca185fe45a0073ee7c57f6bc75e01;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/rss.rb b/data/rbot/plugins/rss.rb
index 74f78e0d..882a15fb 100644
--- a/data/rbot/plugins/rss.rb
+++ b/data/rbot/plugins/rss.rb
@@ -1,18 +1,23 @@
+#-- 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'
 require 'rss/1.0'
 require 'rss/2.0'
 require 'rss/dublincore'
-begin
-  # require 'rss/dublincore/2.0'
-rescue
-  warning "Unable to load RSS libraries, RSS plugin functionality crippled"
-end
+# begin
+#   require 'rss/dublincore/2.0'
+# rescue
+#   warning "Unable to load RSS libraries, RSS plugin functionality crippled"
+# end
 
 class ::String
   def shorten(limit)
@@ -32,44 +37,99 @@ class ::String
   end
 end
 
+class ::RssBlob
+  attr :url
+  attr :handle
+  attr :type
+  attr :watchers
+
+  def initialize(url,handle=nil,type=nil,watchers=[])
+    @url = url
+    if handle
+      @handle = handle
+    else
+      @handle = url
+    end
+    @type = type
+    @watchers = watchers
+  end
+
+  def watched?
+    !@watchers.empty?
+  end
+
+  def watched_by?(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
+    # 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
+    [@handle,@url,@type,@watchers]
+  end
+
+  def to_s(watchers=false)
+    if watchers
+      a = self.to_a.flatten
+    else
+      a = self.to_a[0,3]
+    end
+    a.join(" | ")
+  end
+end
 
 class RSSFeedsPlugin < Plugin
-  @@watchThreads = Hash.new
+  BotConfig.register BotConfigIntegerValue.new('rss.head_max',
+    :default => 30, :validate => Proc.new{|v| v > 0 && v < 200},
+    :desc => "How many characters to use of a RSS item header")
 
-  # Keep a 1:1 relation between commands and handlers
-  @@handlers = {
-    "rss" => "handle_rss",
-    "addrss" => "handle_addrss",
-    "rmrss" => "handle_rmrss",
-    "listrss" => "handle_listrss",
-    "listwatches" => "handle_listrsswatch",
-    "rewatch" => "handle_rewatch",
-    "watchrss" => "handle_watchrss",
-    "rmwatch" => "handle_rmwatch"
-  }
+  BotConfig.register BotConfigIntegerValue.new('rss.text_max',
+    :default => 90, :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',
+    :default => 300, :validate => Proc.new{|v| v > 30},
+    :desc => "How many seconds to sleep before checking RSS feeds again")
+
+  @@watchThreads = Hash.new
+  @@mutex = Mutex.new
 
   def initialize
     super
-    @feeds = Hash.new
-    @watchList = Hash.new
-    begin
-      IO.foreach("#{@bot.botclass}/rss/feeds") { |line|
-        s = line.chomp.split("|", 2)
-        @feeds[s[0]] = s[1]
-      }
-    rescue
-      log "no feeds";
-    end
-    begin
-      IO.foreach("#{@bot.botclass}/rss/watchlist") { |line|
-        s = line.chomp.split("|", 3)
-        @watchList[s[0]] = [s[1], s[2]]
-        watchRss( s[2], s[0], s[1] )
-      }
-    rescue
-      log "no watchlist"
+    kill_threads
+    if @registry.has_key?(:feeds)
+      @feeds = @registry[:feeds]
+    else
+      @feeds = Hash.new
     end
+    rewatch_rss
+  end
 
+  def name
+    "rss"
+  end
+
+  def watchlist
+    @feeds.select { |h, f| f.watched? }
   end
 
   def cleanup
@@ -77,323 +137,420 @@ class RSSFeedsPlugin < Plugin
   end
 
   def save
-    Dir.mkdir("#{@bot.botclass}/rss") if not FileTest.directory?("#{@bot.botclass}/rss")
-    File.open("#{@bot.botclass}/rss/feeds", "w") { |file|
-      @feeds.each { |k,v|
-        file.puts(k + "|" + v)
-      }
-    }
-    File.open("#{@bot.botclass}/rss/watchlist", "w") { |file|
-      @watchList.each { |url, d|
-        feedFormat = d[0] || ''
-        whichChan = d[1] || 'markey'
-        file.puts(url + '|' + feedFormat + '|' + whichChan)
-      }
-    }
+    @registry[:feeds] = @feeds
   end
 
   def kill_threads
-    Thread.critical=true
-    # Abort all running threads.
-    @@watchThreads.each { |url, thread|
-      debug "Killing thread for #{url}"
-      thread.kill
+    @@mutex.synchronize {
+      # Abort all running threads.
+      @@watchThreads.each { |url, thread|
+        debug "Killing thread for #{url}"
+        thread.kill
+      }
+      @@watchThreads = Hash.new
     }
-    # @@watchThreads.each { |url, thread|
-    #   debug "Joining on killed thread for #{url}"
-    #   thread.join
-    # }
-    @@watchThreads = Hash.new
-    Thread.critical=false
   end
 
   def help(plugin,topic="")
-    "RSS Reader: rss name [limit] => read a named feed [limit maximum posts, default 5], addrss [force] name url => add a feed, listrss => list all available feeds, rmrss name => remove the named feed, watchrss url [type] => watch a rss feed for changes (type may be 'amarokblog', 'amarokforum', 'mediawiki', 'gmame' or empty - it defines special formatting of feed items), rewatch => restart all rss watches, rmwatch url => stop watching for changes in url, listwatches => see a list of watched feeds"
-  end
-
-  def privmsg(m)
-    meth = self.method(@@handlers[m.plugin])
-    meth.call(m)
+    case topic
+    when "show"
+      "rss show #{Bold}handle#{Bold} [#{Bold}limit#{Bold}] : show #{Bold}limit#{Bold} (default: 5, max: 15) entries from rss #{Bold}handle#{Bold}; #{Bold}limit#{Bold} can also be in the form a..b, to display a specific range of items"
+    when "list"
+      "rss list [#{Bold}handle#{Bold}] : list all rss feeds (matching #{Bold}handle#{Bold})"
+    when "watched"
+      "rss watched [#{Bold}handle#{Bold}] : list all watched rss feeds (matching #{Bold}handle#{Bold})"
+    when "add"
+      "rss add #{Bold}handle#{Bold} #{Bold}url#{Bold} [#{Bold}type#{Bold}] : add a new rss called #{Bold}handle#{Bold} from url #{Bold}url#{Bold} (of type #{Bold}type#{Bold})"
+    when /^(del(ete)?|rm)$/
+      "rss del(ete)|rm #{Bold}handle#{Bold} : delete rss feed #{Bold}handle#{Bold}"
+    when "replace"
+      "rss replace #{Bold}handle#{Bold} #{Bold}url#{Bold} [#{Bold}type#{Bold}] : try to replace the url of rss called #{Bold}handle#{Bold} with #{Bold}url#{Bold} (of type #{Bold}type#{Bold}); only works if nobody else is watching it"
+    when "forcereplace"
+      "rss forcereplace #{Bold}handle#{Bold} #{Bold}url#{Bold} [#{Bold}type#{Bold}] : replace the url of rss called #{Bold}handle#{Bold} with #{Bold}url#{Bold} (of type #{Bold}type#{Bold})"
+    when "watch"
+      "rss watch #{Bold}handle#{Bold} [#{Bold}url#{Bold} [#{Bold}type#{Bold}]] : watch rss #{Bold}handle#{Bold} for changes; when the other parameters are present, it will be created if it doesn't exist yet"
+    when /(un|rm)watch/
+      "rss unwatch|rmwatch #{Bold}handle#{Bold} : stop watching rss #{Bold}handle#{Bold} for changes"
+    when "rewatch"
+      "rss rewatch : restart threads that watch for changes in watched rss"
+    else
+      "manage RSS feeds: rss show|list|watched|add|del(ete)|rm|(force)replace|watch|unwatch|rmwatch|rewatch"
+    end
   end
 
-  def handle_rss(m)
-    unless m.params
-      m.reply("incorrect usage: " + help(m.plugin))
-      return
+  def report_problem(report, e=nil, m=nil)
+    if m && m.respond_to?(:reply)
+      m.reply report
+    else
+      warning report
     end
-    limit = 5
-    if m.params =~ /\s+(\d+)$/
-      limit = $1.to_i
-      if limit < 1 || limit > 15
-        m.reply("weird, limit not in [1..15], reverting to default")
-        limit = 5
-      end
-      m.params.gsub!(/\s+\d+$/, '')
+    if e
+      debug e.inspect
+      debug e.backtrace.join("\n") if e.respond_to?(:backtrace)
     end
+  end
 
-    url = ''
-    if m.params =~ /^http:\/\//
-      url = m.params
+  def show_rss(m, params)
+    handle = params[:handle]
+    lims = params[:limit].to_s.match(/(\d+)(?:..(\d+))?/)
+    debug lims.to_a.inspect
+    if lims[2]
+      ll = [[lims[1].to_i-1,lims[2].to_i-1].min,  0].max
+      ul = [[lims[1].to_i-1,lims[2].to_i-1].max, 14].min
+      rev = lims[1].to_i > lims[2].to_i
     else
-      unless @feeds.has_key?(m.params)
-        m.reply(m.params + "? what is that feed about?")
-        return
-      end
-      url = @feeds[m.params]
+      ll = 0
+      ul = [[lims[1].to_i-1, 1].max, 14].min
+      rev = false
     end
 
-    m.reply("Please wait, querying...")
-    title = ''
-    items = fetchRSS(m.replyto, url, title)
-    if(items == nil)
+    feed = @feeds.fetch(handle, nil)
+    unless feed
+      m.reply "I don't know any feeds named #{handle}"
       return
     end
-    m.reply("Channel : #{title}")
-    # FIXME: optional by-date sorting if dates present
-    items[0...limit].each do |item|
-      printRSSItem(m.replyto,item)
+
+    m.reply "lemme fetch it..."
+    title = items = nil
+    @@mutex.synchronize {
+      title, items = fetchRss(feed, m)
+    }
+    return unless items
+
+    # We sort the feeds in freshness order (newer ones first)
+    items = freshness_sort(items)
+    disp = items[ll..ul]
+    disp.reverse! if rev
+
+    m.reply "Channel : #{title}"
+    disp.each do |item|
+      printFormattedRss(feed, item, {:places=>[m.replyto],:handle=>nil,:date=>true})
     end
   end
 
-  def handle_addrss(m)
-    unless m.params
-      m.reply "incorrect usage: " + help(m.plugin)
-      return
+  def itemDate(item,ex=nil)
+    return item.pubDate if item.respond_to?(:pubDate)
+    return item.date if item.respond_to?(:date)
+    return ex
+  end
+
+  def freshness_sort(items)
+    notime = Time.at(0)
+    items.sort { |a, b|
+      itemDate(b, notime) || 0 <=> itemDate(a, notime) || 0
+    }
+  end
+
+  def list_rss(m, params)
+    wanted = params[:handle]
+    reply = String.new
+    @@mutex.synchronize {
+      @feeds.each { |handle, feed|
+        next if wanted and !handle.match(wanted)
+        reply << "#{feed.handle}: #{feed.url} (in format: #{feed.type ? feed.type : 'default'})"
+        (reply << " (watched)") if feed.watched_by?(m.replyto)
+        reply << "\n"
+      }
+    }
+    if reply.empty?
+      reply = "no feeds found"
+      reply << " matching #{wanted}" if wanted
     end
-    if m.params =~ /^force /
-      forced = true
-      m.params.gsub!(/^force /, '')
+    m.reply reply
+  end
+
+  def watched_rss(m, params)
+    wanted = params[:handle]
+    reply = String.new
+    @@mutex.synchronize {
+      watchlist.each { |handle, feed|
+        next if wanted and !handle.match(wanted)
+        next unless feed.watched_by?(m.replyto)
+        reply << "#{feed.handle}: #{feed.url} (in format: #{feed.type ? feed.type : 'default'})\n"
+      }
+    }
+    if reply.empty?
+      reply = "no watched feeds"
+      reply << " matching #{wanted}" if wanted
     end
-    feed = m.params.scan(/^(\S+)\s+(\S+)$/)
-    unless feed.length == 1 && feed[0].length == 2
-      m.reply("incorrect usage: " + help(m.plugin))
+    m.reply reply
+  end
+
+  def add_rss(m, params, force=false)
+    handle = params[:handle]
+    url = params[:url]
+    unless url.match(/https?/)
+      m.reply "I only deal with feeds from HTTP sources, so I can't use #{url} (maybe you forgot the handle?)"
       return
     end
-    if @feeds.has_key?(feed[0][0]) && !forced
-      m.reply("But there is already a feed named #{feed[0][0]} with url #{@feeds[feed[0][0]]}")
+    type = params[:type]
+    if @feeds.fetch(handle, nil) && !force
+      m.reply "There is already a feed named #{handle} (URL: #{@feeds[handle].url})"
       return
     end
-    feed[0][0].gsub!("|", '_')
-    @feeds[feed[0][0]] = feed[0][1]
-    m.reply("RSS: Added #{feed[0][1]} with name #{feed[0][0]}")
-  end
-
-  def handle_rmrss(m)
-    unless m.params
-      m.reply "incorrect usage: " + help(m.plugin)
+    unless url
+      m.reply "You must specify both a handle and an url to add an RSS feed"
       return
     end
-    unless @feeds.has_key?(m.params)
-      m.reply("dunno that feed")
-      return
+    @@mutex.synchronize {
+      @feeds[handle] = RssBlob.new(url,handle,type)
+    }
+    reply = "Added RSS #{url} named #{handle}"
+    if type
+      reply << " (format: #{type})"
     end
-    @feeds.delete(m.params)
-    @bot.okay(m.replyto)
+    m.reply reply
+    return handle
   end
 
-  def handle_rmwatch(m)
-    unless m.params
-      m.reply "incorrect usage: " + help(m.plugin)
-      return
-    end
-    unless @watchList.has_key?(m.params)
-      m.reply("no such watch")
+  def del_rss(m, params, pass=false)
+    feed = unwatch_rss(m, params, true)
+    if feed.watched?
+      m.reply "someone else is watching #{feed.handle}, I won't remove it from my list"
       return
     end
-    unless @watchList[m.params][1] == m.replyto
-      m.reply("no such watch for this channel/nick")
-      return
+    @@mutex.synchronize {
+      @feeds.delete(feed.handle)
+    }
+    m.okay unless pass
+    return
+  end
+
+  def replace_rss(m, params)
+    handle = params[:handle]
+    if @feeds.key?(handle)
+      del_rss(m, {:handle => handle}, true)
     end
-    @watchList.delete(m.params)
-    Thread.critical=true
-    if @@watchThreads[m.params].kind_of? Thread
-      @@watchThreads[m.params].kill
-      debug "rmwatch: Killed thread for #{m.params}"
-      # @@watchThreads[m.params].join
-      # debug "rmwatch: Joined killed thread for #{m.params}"
-      @@watchThreads.delete(m.params)
+    if @feeds.key?(handle)
+      m.reply "can't replace #{feed.handle}"
+    else
+      add_rss(m, params, true)
     end
-    Thread.critical=false
-    @bot.okay(m.replyto)
   end
 
-  def handle_listrss(m)
-    reply = ''
-    if @feeds.length == 0
-      reply = "No feeds yet."
-    else
-      @feeds.each { |k,v|
-        reply << k + ": " + v + "\n"
+  def forcereplace_rss(m, params)
+    add_rss(m, params, true)
+  end
+
+  def watch_rss(m, params)
+    handle = params[:handle]
+    url = params[:url]
+    type = params[:type]
+    if url
+      add_rss(m, params)
+    end
+    feed = nil
+    @@mutex.synchronize {
+      feed = @feeds.fetch(handle, nil)
+    }
+    if feed
+      @@mutex.synchronize {
+        if feed.add_watch(m.replyto)
+          watchRss(feed, m)
+          m.okay
+        else
+          m.reply "Already watching #{feed.handle}"
+        end
       }
+    else
+      m.reply "Couldn't watch feed #{handle} (no such feed found)"
     end
-    m.reply(reply)
   end
 
-  def handle_listrsswatch(m)
-    reply = ''
-    if @watchList.length == 0
-      reply = "No watched feeds yet."
+  def unwatch_rss(m, params, pass=false)
+    handle = params[:handle]
+    unless @feeds.has_key?(handle)
+      m.reply("dunno that feed")
+      return
+    end
+    feed = @feeds[handle]
+    if feed.rm_watch(m.replyto)
+      m.reply "#{m.replyto} has been removed from the watchlist for #{feed.handle}"
     else
-      @watchList.each { |url,v|
-        reply << url + " for " + v[1] + " (in format: " + (v[0]?v[0]:"default") + ")\n"
+      m.reply("#{m.replyto} wasn't watching #{feed.handle}") unless pass
+    end
+    if !feed.watched?
+      @@mutex.synchronize {
+        if @@watchThreads[handle].kind_of? Thread
+          @@watchThreads[handle].kill
+          debug "rmwatch: Killed thread for #{handle}"
+          @@watchThreads.delete(handle)
+        end
       }
     end
-    m.reply(reply)
+    return feed
   end
 
-  def handle_rewatch(m)
+  def rewatch_rss(m=nil, params=nil)
     kill_threads
 
     # Read watches from list.
-    @watchList.each{ |url, d|
-      feedFormat = d[0]
-      whichChan = d[1]
-      watchRss(whichChan, url,feedFormat)
+    watchlist.each{ |handle, feed|
+      watchRss(feed, m)
     }
-    @bot.okay(m.replyto)
-  end
-
-  def handle_watchrss(m)
-    unless m.params
-      m.reply "incorrect usage: " + help(m.plugin)
-      return
-    end
-    feed = m.params.scan(/^(\S+)\s+(\S+)$/)
-    url = feed[0][0]
-    feedFormat = feed[0][1]
-    if @watchList.has_key?(url)
-      m.reply("But there is already a watch for feed #{url} on chan #{@watchList[url][1]}")
-      return
-    end
-    @watchList[url] = [feedFormat, m.replyto]
-    watchRss(m.replyto, url,feedFormat)
-    @bot.okay(m.replyto)
+    m.okay if m
   end
 
   private
-  def watchRss(whichChan, url, feedFormat)
-    if @@watchThreads.has_key?(url)
-      @bot.say whichChan, "ERROR: watcher thread for #{url} is already running! #{@@watchThreads[url]}"
+  def watchRss(feed, m=nil)
+    if @@watchThreads.has_key?(feed.handle)
+      report_problem("watcher thread for #{feed.handle} is already running", nil, m)
       return
     end
-    @@watchThreads[url] = Thread.new do
-      debug 'watchRss thread started.'
+    @@watchThreads[feed.handle] = Thread.new do
+      debug "watcher for #{feed} started"
       oldItems = []
       firstRun = true
+      failures = 0
       loop do
         begin
-          title = ''
-          debug 'Fetching rss feed..'
-          newItems = fetchRSS(whichChan, url, title)
-          if( newItems.empty? )
-            @bot.say whichChan, "Oops - Item is empty"
-            break
-          end
-          debug "Checking if new items are available"
-          if (firstRun)
-            firstRun = false
+          debug "fetching #{feed}"
+          title = newItems = nil
+          @@mutex.synchronize {
+            title, newItems = fetchRss(feed)
+          }
+          unless newItems
+            debug "no items in feed #{feed}"
+            failures +=1
           else
-            newItems.each do |nItem|
-              showItem = true;
-              oldItems.each do |oItem|
-                if (nItem.to_s == oItem.to_s)
-                  showItem = false
-                end
-              end
-              if showItem
-                debug "showing #{nItem.title}"
-                printFormatedRSS(whichChan, nItem,feedFormat)
+            debug "Checking if new items are available for #{feed}"
+            if firstRun
+              debug "First run, we'll see next time"
+              firstRun = false
+            else
+              otxt = oldItems.map { |item| item.to_s }
+              dispItems = newItems.reject { |item|
+                otxt.include?(item.to_s)
+              }
+              if dispItems.length > 0
+                debug "Found #{dispItems.length} new items in #{feed}"
+                # When displaying watched feeds, publish them from older to newer
+                dispItems.reverse.each { |item|
+                  @@mutex.synchronize {
+                    printFormattedRss(feed, item)
+                  }
+                }
               else
-                debug "not showing  #{nItem.title}"
-                break
+                debug "No new items found in #{feed}"
               end
             end
+            oldItems = newItems.dup
           end
-          oldItems = newItems
         rescue Exception => e
-          error "IO failed: #{e.inspect}"
+          error "Error watching #{feed}: #{e.inspect}"
           debug e.backtrace.join("\n")
+          failures += 1
         end
 
-        seconds = 150 + rand(100)
-        debug "Thread going to sleep #{seconds} seconds.."
+        seconds = @bot.config['rss.thread_sleep'] * (failures + 1)
+        seconds += seconds * (rand(100)-50)/100
+        debug "watcher for #{feed} going to sleep #{seconds} seconds.."
         sleep seconds
       end
     end
   end
 
-  def printRSSItem(whichChan,item)
-    if item.kind_of?(RSS::RDF::Item)
-      @bot.say whichChan, item.title.chomp.riphtml.shorten(20) + " @ " + item.link
-    else
-      @bot.say whichChan, "#{item.pubDate.to_s.chomp+": " if item.pubDate}#{item.title.chomp.riphtml.shorten(20)+" :: " if item.title}#{" @ "+item.link.chomp if item.link}"
-    end
-  end
-
-  def printFormatedRSS(whichChan,item, type)
-    case type
-    when 'amarokblog'
-      @bot.say whichChan, "::#{item.category.content} just blogged at #{item.link}::"
-      @bot.say whichChan, "::#{item.title.chomp.riphtml} - #{item.description.chomp.riphtml.shorten(60)}::"
-    when 'amarokforum'
-      @bot.say whichChan, "::Forum:: #{item.pubDate.to_s.chomp+": " if item.pubDate}#{item.title.chomp.riphtml+" :: " if item.title}#{" @ "+item.link.chomp if item.link}"
-    when 'mediawiki'
-      @bot.say whichChan, "::Wiki:: #{item.title} has been edited by #{item.dc_creator}. #{item.description.split("\n")[0].chomp.riphtml.shorten(60)} #{item.link} ::"
-      debug "mediawiki #{item.title}"
-    when "gmame"
-      @bot.say whichChan, "::amarok-devel:: Message #{item.title} sent by #{item.dc_creator}. #{item.description.split("\n")[0].chomp.riphtml.shorten(60)}::"
-    else
-      printRSSItem(whichChan,item)
+  def printFormattedRss(feed, item, opts=nil)
+    places = feed.watchers
+    handle = "::#{feed.handle}:: "
+    date = String.new
+    if opts
+      places = opts[:places] if opts.key?(:places)
+      handle = opts[:handle].to_s if opts.key?(:handle)
+      if opts.key?(:date) && opts[:date]
+        if item.respond_to?(:pubDate) 
+          if item.pubDate.class <= Time
+            date = item.pubDate.strftime("%Y/%m/%d %H.%M.%S")
+          else
+            date = item.pubDate.to_s
+          end
+        elsif  item.respond_to?(:date)
+          if item.date.class <= Time
+            date = item.date.strftime("%Y/%m/%d %H.%M.%S")
+          else
+            date = item.date.to_s
+          end
+        else
+          date = "(no date)"
+        end
+        date += " :: "
+      end
     end
+    title = "#{Bold}#{item.title.chomp.riphtml}#{Bold}" if item.title
+    desc = item.description.gsub(/\s+/,' ').strip.riphtml.shorten(@bot.config['rss.text_max']) if item.description
+    link = item.link.chomp if item.link
+    places.each { |loc|
+      case feed.type
+      when 'blog'
+        @bot.say loc, "#{handle}#{date}#{item.category.content} blogged at #{link}"
+        @bot.say loc, "#{handle}#{title} - #{desc}"
+      when 'forum'
+        @bot.say loc, "#{handle}#{date}#{title}#{' @ ' if item.title && item.link}#{link}"
+      when 'wiki'
+        @bot.say loc, "#{handle}#{date}#{item.title} has been edited by #{item.dc_creator}. #{desc} #{link}"
+      when 'gmame'
+        @bot.say loc, "#{handle}#{date}Message #{title} sent by #{item.dc_creator}. #{desc}"
+      when 'trac'
+        @bot.say loc, "#{handle}#{date}#{title} @ #{link}"
+        unless item.title =~ /^Changeset \[(\d+)\]/
+          @bot.say loc, "#{handle}#{date}#{desc}"
+        end
+      else
+        @bot.say loc, "#{handle}#{date}#{title}#{' @ ' if item.title && item.link}#{link}"
+      end
+    }
   end
 
-  def fetchRSS(whichChan, url, title)
+  def fetchRss(feed, m=nil)
     begin
       # Use 60 sec timeout, cause the default is too low
-      xml = Utils.http_get(url,60,60)
+      # Do not use get_cached for RSS until we have proper cache handling
+      # xml = @bot.httputil.get_cached(feed.url,60,60)
+      xml = @bot.httputil.get(feed.url,60,60)
     rescue URI::InvalidURIError, URI::BadURIError => e
-      @bot.say whichChan, "invalid rss feed #{url}"
+      report_problem("invalid rss feed #{feed.url}", e, m)
+      return
+    rescue => e
+      report_problem("error getting #{feed.url}", e, m)
       return
     end
-    debug 'fetched'
+    debug "fetched #{feed}"
     unless xml
-      @bot.say whichChan, "reading feed #{url} failed"
+      report_problem("reading feed #{feed} failed", nil, m)
       return
     end
 
     begin
       ## do validate parse
       rss = RSS::Parser.parse(xml)
-      debug 'parsed'
+      debug "parsed #{feed}"
     rescue RSS::InvalidRSSError
       ## do non validate parse for invalid RSS 1.0
       begin
         rss = RSS::Parser.parse(xml, false)
-      rescue RSS::Error
-        @bot.say whichChan, "parsing rss stream failed, whoops =("
+      rescue RSS::Error => e
+        report_problem("parsing rss stream failed, whoops =(", e, m)
         return
       end
-    rescue RSS::Error
-      @bot.say whichChan, "parsing rss stream failed, oioi"
+    rescue RSS::Error => e
+      report_problem("parsing rss stream failed, oioi", e, m)
       return
     rescue => e
-      @bot.say whichChan, "processing error occured, sorry =("
-      debug e.inspect
-      debug e.backtrace.join("\n")
+      report_problem("processing error occured, sorry =(", e, m)
       return
     end
     items = []
     if rss.nil?
-      @bot.say whichChan, "#{m.params} does not include RSS 1.0 or 0.9x/2.0"
+      report_problem("#{feed} does not include RSS 1.0 or 0.9x/2.0", nil, m)
     else
       begin
-        rss.output_encoding = "euc-jp"
-      rescue RSS::UnknownConvertMethod
-        @bot.say whichChan, "bah! something went wrong =("
+        rss.output_encoding = 'UTF-8'
+      rescue RSS::UnknownConvertMethod => e
+        report_problem("bah! something went wrong =(", e, m)
         return
       end
       rss.channel.title ||= "Unknown"
-      title.replace(rss.channel.title)
+      title = rss.channel.title
       rss.items.each do |item|
         item.title ||= "Unknown"
         items << item
@@ -401,20 +558,47 @@ class RSSFeedsPlugin < Plugin
     end
 
     if items.empty?
-      @bot.say whichChan, "no items found in the feed, maybe try weed?"
+      report_problem("no items found in the feed, maybe try weed?", e, m)
       return
     end
-    return items
+    return [title, items]
   end
 end
 
 plugin = RSSFeedsPlugin.new
-plugin.register("rss")
-plugin.register("addrss")
-plugin.register("rmrss")
-plugin.register("listrss")
-plugin.register("rewatch")
-plugin.register("watchrss")
-plugin.register("listwatches")
-plugin.register("rmwatch")
+
+plugin.map 'rss show :handle :limit',
+  :action => 'show_rss',
+  :requirements => {:limit => /^\d+(?:\.\.\d+)?$/},
+  :defaults => {:limit => 5}
+plugin.map 'rss list :handle',
+  :action => 'list_rss',
+  :defaults =>  {:handle => nil}
+plugin.map 'rss watched :handle',
+  :action => 'watched_rss',
+  :defaults =>  {:handle => nil}
+plugin.map 'rss add :handle :url :type',
+  :action => 'add_rss',
+  :defaults => {:type => nil}
+plugin.map 'rss del :handle',
+  :action => 'del_rss'
+plugin.map 'rss delete :handle',
+  :action => 'del_rss'
+plugin.map 'rss rm :handle',
+  :action => 'del_rss'
+plugin.map 'rss replace :handle :url :type',
+  :action => 'replace_rss',
+  :defaults => {:type => nil}
+plugin.map 'rss forcereplace :handle :url :type',
+  :action => 'forcereplace_rss',
+  :defaults => {:type => nil}
+plugin.map 'rss watch :handle :url :type',
+  :action => 'watch_rss',
+  :defaults => {:url => nil, :type => nil}
+plugin.map 'rss unwatch :handle',
+  :action => 'unwatch_rss'
+plugin.map 'rss rmwatch :handle',
+  :action => 'unwatch_rss'
+plugin.map 'rss rewatch',
+  :action => 'rewatch_rss'