checks.flatten!
unless checks.grep(@no_info_hosts).empty?
- return "Sorry, info retrieval for #{url.host} (#{checks.first}) is disabled"
+ return ( opts[:always_reply] ? "Sorry, info retrieval for #{url.host} (#{checks.first}) is disabled" : false )
end
logopts = opts.dup
return extra.join(", ") if title or not @bot.config['url.titles_only']
end
- def handle_urls(m, urls, display_info=@bot.config['url.display_link_info'])
- unless (channels = @bot.config['url.only_on_channels']).empty?
+ def handle_urls(m, params={})
+ opts = {
+ :display_info => @bot.config['url.display_link_info'],
+ :channels => @bot.config['url.only_on_channels']
+ }.merge params
+ urls = opts[:urls]
+ display_info= opts[:display_info]
+ channels = opts[:channels]
+ unless channels.empty?
return unless channels.map { |c| c.downcase }.include?(m.channel.downcase)
end
reply = nil
begin
title = get_title_for_url(urlstr,
+ :always_reply => m.address?,
:nick => m.source.nick,
:channel => m.channel,
:ircline => m.message)
def info(m, params)
escaped = URI.escape(params[:urls].to_s, OUR_UNSAFE)
urls = URI.extract(escaped)
- Thread.new { handle_urls(m, urls, params[:urls].length) }
+ Thread.new do
+ handle_urls(m,
+ :urls => urls,
+ :display_info => params[:urls].length,
+ :channels => [])
+ end
end
def message(m)
escaped = URI.escape(m.message, OUR_UNSAFE)
urls = URI.extract(escaped, ['http', 'https'])
return if urls.empty?
- Thread.new { handle_urls(m, urls) }
+ Thread.new { handle_urls(m, :urls => urls) }
end
def reply_urls(opts={})