From 0203a872d0f167c5905fc445d173f19efdd73842 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Tue, 27 Jan 2009 02:14:33 +0100 Subject: url plugin: urls info should work regardless of config The 'urls info' command to manually query for link information should always work, regardless of the setting of the url.only_on_channels config setting. Fix by making the channels list for handle_urls() into an option (defaulting to url.only_on_channels) and passing an empty list from info(). --- data/rbot/plugins/url.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'data/rbot') diff --git a/data/rbot/plugins/url.rb b/data/rbot/plugins/url.rb index 02255318..8d12f303 100644 --- a/data/rbot/plugins/url.rb +++ b/data/rbot/plugins/url.rb @@ -124,11 +124,13 @@ class UrlPlugin < Plugin def handle_urls(m, params={}) opts = { - :display_info => @bot.config['url.display_link_info'] + :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] - unless (channels = @bot.config['url.only_on_channels']).empty? + channels = opts[:channels] + unless channels.empty? return unless channels.map { |c| c.downcase }.include?(m.channel.downcase) end @@ -189,7 +191,12 @@ class UrlPlugin < Plugin def info(m, params) escaped = URI.escape(params[:urls].to_s, OUR_UNSAFE) urls = URI.extract(escaped) - Thread.new { handle_urls(m, :urls => urls, :display_info => params[:urls].length) } + Thread.new do + handle_urls(m, + :urls => urls, + :display_info => params[:urls].length, + :channels => []) + end end def message(m) -- cgit v1.2.3