+#-- vim:sw=2:et\r
+#++\r
+#\r
# RSS feed plugin for RubyBot\r
# (c) 2004 Stanislav Karchebny <berkus@madfire.net>\r
# (c) 2005 Ian Monroe <ian@monroe.nu>\r
# (c) 2005 Mark Kretschmann <markey@web.de>\r
+# (c) 2006 Giuseppe Bilotta <giuseppe.bilotta@gmail.com>\r
+#\r
# Licensed under MIT License.\r
\r
require 'rss/parser'\r
end\r
\r
def watched_by?(who)\r
- @watchers.include?(who)\r
+ # We need to check bot 'who' itself and the String form, because rss\r
+ # watches added before the new Irc framework represented watchers as\r
+ # Strings whereas they are now Channels.\r
+ #\r
+ @watchers.include?(who) || @watchers.include?(who.to_s) \r
end\r
\r
def add_watch(who)\r
if watched_by?(who)\r
return nil\r
end\r
- @watchers << who unless watched_by?(who)\r
+ # TODO FIXME? should we just store watchers as Strings instead?\r
+ # This should then be @watchers << who.downcase\r
+ @watchers << who\r
return who\r
end\r
\r
def rm_watch(who)\r
+ # See comment to watched_by?\r
+ #\r
@watchers.delete(who)\r
+ @watchers.delete(who.to_s)\r
end\r
\r
def to_a\r
\r
BotConfig.register BotConfigIntegerValue.new('rss.thread_sleep',\r
:default => 300, :validate => Proc.new{|v| v > 30},\r
- :desc => "How many characters to use of a RSS item text")\r
+ :desc => "How many seconds to sleep before checking RSS feeds again")\r
\r
@@watchThreads = Hash.new\r
@@mutex = Mutex.new\r
def help(plugin,topic="")\r
case topic\r
when "show"\r
- "rss show #{Bold}handle#{Bold} [#{Bold}limit#{Bold}] : show #{Bold}limit#{Bold} (default: 5, max: 15) entries from rss #{Bold}handle#{Bold}"\r
+ "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"\r
when "list"\r
"rss list [#{Bold}handle#{Bold}] : list all rss feeds (matching #{Bold}handle#{Bold})"\r
when "watched"\r
\r
def show_rss(m, params)\r
handle = params[:handle]\r
- limit = params[:limit].to_i\r
- limit = 15 if limit > 15\r
- limit = 1 if limit <= 0\r
+ lims = params[:limit].to_s.match(/(\d+)(?:..(\d+))?/)\r
+ debug lims.to_a.inspect\r
+ if lims[2]\r
+ ll = [[lims[1].to_i-1,lims[2].to_i-1].min, 0].max\r
+ ul = [[lims[1].to_i-1,lims[2].to_i-1].max, 14].min\r
+ rev = lims[1].to_i > lims[2].to_i\r
+ else\r
+ ll = 0\r
+ ul = [[lims[1].to_i-1, 1].max, 14].min\r
+ rev = false\r
+ end\r
+\r
feed = @feeds.fetch(handle, nil)\r
unless feed\r
m.reply "I don't know any feeds named #{handle}"\r
return\r
end\r
- m.reply("Please wait, querying...")\r
+\r
+ m.reply "lemme fetch it..."\r
title = items = nil\r
@@mutex.synchronize {\r
title, items = fetchRss(feed, m)\r
}\r
return unless items\r
- m.reply("Channel : #{title}")\r
- # TODO: optional by-date sorting if dates present\r
- items[0...limit].reverse.each do |item|\r
+\r
+ # We sort the feeds in freshness order (newer ones first)\r
+ items = freshness_sort(items)\r
+ disp = items[ll..ul]\r
+ disp.reverse! if rev\r
+\r
+ m.reply "Channel : #{title}"\r
+ disp.each do |item|\r
printFormattedRss(feed, item, {:places=>[m.replyto],:handle=>nil,:date=>true})\r
end\r
end\r
\r
+ def itemDate(item,ex=nil)\r
+ return item.pubDate if item.respond_to?(:pubDate)\r
+ return item.date if item.respond_to?(:date)\r
+ return ex\r
+ end\r
+\r
+ def freshness_sort(items)\r
+ notime = Time.at(0)\r
+ items.sort { |a, b|\r
+ itemDate(b, notime) <=> itemDate(a, notime)\r
+ }\r
+ end\r
+\r
def list_rss(m, params)\r
wanted = params[:handle]\r
reply = String.new\r
return feed\r
end\r
\r
- def rewatch_rss(m=nil)\r
+ def rewatch_rss(m=nil, params=nil)\r
kill_threads\r
\r
# Read watches from list.\r
}\r
if dispItems.length > 0\r
debug "Found #{dispItems.length} new items in #{feed}"\r
- dispItems.each { |item|\r
+ # When displaying watched feeds, publish them from older to newer\r
+ dispItems.reverse.each { |item|\r
@@mutex.synchronize {\r
printFormattedRss(feed, item)\r
}\r
if opts\r
places = opts[:places] if opts.key?(:places)\r
handle = opts[:handle].to_s if opts.key?(:handle)\r
- date = item.pubDate.strftime("%Y/%m/%d %H.%M.%S") + " :: " if (opts.key?(:date) && opts[:date] && item.pubDate)\r
+ 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
+ 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
+ else\r
+ date = item.date.to_s\r
+ end\r
+ else\r
+ date = "(no date)"\r
+ end\r
+ date += " :: "\r
+ end\r
end\r
title = "#{Bold}#{item.title.chomp.riphtml}#{Bold}" if item.title\r
desc = item.description.gsub(/\s+/,' ').strip.riphtml.shorten(@bot.config['rss.text_max']) if item.description\r
when 'trac'\r
@bot.say loc, "#{handle}#{date}#{title} @ #{link}"\r
unless item.title =~ /^Changeset \[(\d+)\]/\r
- @bot.say loc, "#{handle}#{desc}"\r
+ @bot.say loc, "#{handle}#{date}#{desc}"\r
end\r
else\r
@bot.say loc, "#{handle}#{date}#{title}#{' @ ' if item.title && item.link}#{link}"\r
def fetchRss(feed, m=nil)\r
begin\r
# Use 60 sec timeout, cause the default is too low\r
- xml = @bot.httputil.get_cached(feed.url,60,60)\r
+ # Do not use get_cached for RSS until we have proper cache handling\r
+ # xml = @bot.httputil.get_cached(feed.url,60,60)\r
+ xml = @bot.httputil.get(feed.url,60,60)\r
rescue URI::InvalidURIError, URI::BadURIError => e\r
report_problem("invalid rss feed #{feed.url}", e, m)\r
return\r
\r
plugin.map 'rss show :handle :limit',\r
:action => 'show_rss',\r
- :requirements => {:limit => /^\d+$/},\r
+ :requirements => {:limit => /^\d+(?:\.\.\d+)?$/},\r
:defaults => {:limit => 5}\r
plugin.map 'rss list :handle',\r
:action => 'list_rss',\r
:action => 'unwatch_rss'\r
plugin.map 'rss rmwatch :handle',\r
:action => 'unwatch_rss'\r
-plugin.map 'rss rewatch :handle',\r
+plugin.map 'rss rewatch',\r
:action => 'rewatch_rss'\r
+\r
projects / user / henk / code / ruby / rbot.git / blobdiff