X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Frss.rb;h=e5c2da118b35369c70ad8fca072d831c08c467d3;hb=070488d789dcfdf4938d56b0b3f7bcd36dcc54b3;hp=0cf8f1294fe3f69853a171f110bd69a68826c055;hpb=901d14ffa819d069730a64d99a90a1e282656119;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/data/rbot/plugins/rss.rb b/data/rbot/plugins/rss.rb index 0cf8f129..e5c2da11 100644 --- a/data/rbot/plugins/rss.rb +++ b/data/rbot/plugins/rss.rb @@ -25,21 +25,6 @@ end module ::RSS - # Make an 'unique' ID for a given item, based on appropriate bot options - # Currently only suppored is bot.config['rss.show_updated']: when true, the - # description is included in the uid hashing, otherwise it's not - # - def RSS.item_uid_for_bot(item, opts={}) - options = { :show_updated => true}.merge(opts) - desc = nil - if options[:show_updated] - desc = item.content.content rescue item.description rescue nil - end - [(item.title.content rescue item.title rescue nil), - (item.link.href rescue item.link), - desc].hash - end - # Add support for Slashdot namespace in RDF. The code is just an adaptation # of the DublinCore code. unless defined?(SLASH_PREFIX) @@ -269,6 +254,26 @@ class RSSFeedsPlugin < Plugin :default => true, :desc => "Whether to display links from the text of a feed item.") + # Make an 'unique' ID for a given item, based on appropriate bot options + # Currently only suppored is bot.config['rss.show_updated']: when false, + # only the guid/link is accounted for. + # + def make_uid(item) + uid = [ + (item.guid.content rescue \ + item.guid rescue \ + item.link.href rescue \ + item.link rescue '' + ) + ] + if @bot.config['rss.show_updated'] + uid.push((item.content.content rescue item.description rescue nil)) + uid.unshift((item.title.content rescue item.title rescue nil)) + end + uid.hash + end + + # We used to save the Mutex with the RssBlob, which was idiotic. And # since Mutexes dumped in one version might not be resotrable in another, # we need a few tricks to be able to restore data from other versions of Ruby @@ -288,7 +293,8 @@ class RSSFeedsPlugin < Plugin # running substitutions against DataStream _s_ optionally joined # with hash _h_ def make_stream(line1, line2, s, h={}) - DataStream.new([line1, line2].compact.join("\n") % s.merge(h)) + ss = s.merge(h) + DataStream.new([line1, line2].compact.join("\n") % ss, ss) end # Define default RSS filters @@ -354,6 +360,34 @@ class RSSFeedsPlugin < Plugin line1 << " (by %{author})" if s[:author] make_stream(line1, nil, s) } + + # Define an HTML info filter too + @bot.register_filter(:rss, :htmlinfo) { |s| htmlinfo_filter(s) } + + # This is the output format used by the input filter + @bot.register_filter(:htmlinfo, @outkey) { |s| + line1 = "%{title}%{at}%{link}" + make_stream(line1, nil, s) + } + end + + FEED_NS = %r{xmlns.*http://(purl\.org/rss|www.w3c.org/1999/02/22-rdf)} + def htmlinfo_filter(s) + return nil unless s[:headers] and s[:headers]['x-rbot-location'] + return nil unless s[:headers]['content-type'].first.match(/xml|rss|atom|rdf/i) or + (s[:text].include?(" blob.title, :content => output.join(" | ")} end # Display the known rss types @@ -774,7 +808,7 @@ class RSSFeedsPlugin < Plugin if params and handle = params[:handle] feed = @feeds.fetch(handle.downcase, nil) if feed - @bot.timer.reschedule(@watch[feed.handle], 0) + @bot.timer.reschedule(@watch[feed.handle], (params[:delay] || 0).to_f) m.okay if m else m.reply _("no such feed %{handle}") % { :handle => handle } if m @@ -830,9 +864,8 @@ class RSSFeedsPlugin < Plugin otxt = [] # These are used for checking new items vs old ones - uid_opts = { :show_updated => @bot.config['rss.show_updated'] } oids = Set.new feed.items.map { |item| - uid = RSS.item_uid_for_bot(item, uid_opts) + uid = make_uid item otxt << item.to_s debug [uid, item].inspect debug [uid, otxt.last].inspect @@ -851,7 +884,7 @@ class RSSFeedsPlugin < Plugin # debug feed.xml dispItems = feed.items.reject { |item| - uid = RSS.item_uid_for_bot(item, uid_opts) + uid = make_uid item txt = item.to_s if oids.include?(uid) debug "rejecting old #{uid} #{item.inspect}" @@ -908,15 +941,15 @@ class RSSFeedsPlugin < Plugin end def select_nonempty(*ar) - debug ar - ret = ar.map { |i| (i && i.empty?) ? nil : i }.compact.first - (ret && ret.empty?) ? nil : ret + # debug ar + ar.each { |i| return i unless i.nil_or_empty? } + return nil end def printFormattedRss(feed, item, opts=nil) - debug item + # debug item places = feed.watchers - handle = "::#{feed.handle}:: " + handle = feed.handle.empty? ? "" : "::#{feed.handle}:: " date = String.new if opts places = opts[:places] if opts.key?(:places) @@ -1007,6 +1040,8 @@ class RSSFeedsPlugin < Plugin :title => title, :desc => desc, :link => link, :category => category, :author => author, :at => at) + return output if places.empty? + places.each { |loc| output.to_s.each_line { |line| @bot.say loc, line, :overlong => :truncate @@ -1080,13 +1115,13 @@ class RSSFeedsPlugin < Plugin return nil end if rss.respond_to? :channel - rss.channel.title ||= "Unknown" + rss.channel.title ||= "(?)" title = rss.channel.title else title = rss.title.content end rss.items.each do |item| - item.title ||= "Unknown" + item.title ||= "(?)" items << item end end @@ -1159,7 +1194,7 @@ plugin.map 'rss unwatch :handle [in :chan]', :action => 'unwatch_rss' plugin.map 'rss rmwatch :handle [in :chan]', :action => 'unwatch_rss' -plugin.map 'rss rewatch [:handle]', +plugin.map 'rss rewatch [:handle] [:delay]', :action => 'rewatch_rss' plugin.map 'rss types', :action => 'rss_types'