mod_spox 0.2.0 → 0.3.0

data/data/mod_spox/extras/Bullshit.rb

@@ -7,7 +7,7 @@ class Bullshit < ModSpox::Plugin
     include ModSpox::Models
     def initialize(pipeline)
         super(pipeline)
-        Signature.find_or_create(:signature => 'bullshit', :plugin => name, :method => 'bullshit', :description => 'Web economy bullshit generator')
+        add_sig(:sig => 'bullshit', :method => :bullshit, :desc => 'Web economy bullshit generator')
         @bs = [[ "aggregate","architect","benchmark","brand","cultivate","deliver","deploy","disintermediate","drive","e-enable","embrace","empower","enable","engage","engineer","enhance","envisioneer","evolve","expedite","exploit","extend","facilitate","generate","grow","harness","implement","incentivize","incubate","innovate","integrate","iterate","leverage","matrix","maximize","mesh","monetize","morph","optimize","orchestrate","productize","recontextualize","redefine","reintermediate","reinvent","repurpose","revolutionize","scale","seize","strategize","streamline","syndicate","synergize","synthesize","target","transform","transition","unleash","utilize","visualize","whiteboard" ],
             [ "24/365","24/7","B2B","B2C","back-end","best-of-breed","bleeding-edge","bricks-and-clicks","clicks-and-mortar","collaborative","compelling","cross-platform","cross-media","customized","cutting-edge","distributed","dot-com","dynamic","e-business","efficient","end-to-end","enterprise","extensible","frictionless","front-end","global","granular","holistic","impactful","innovative","integrated","interactive","intuitive","killer","leading-edge","magnetic","mission-critical","next-generation","one-to-one","open-source","out-of-the-box","plug-and-play","proactive","real-time","revolutionary","rich","robust","scalable","seamless","sexy","sticky","strategic","synergistic","transparent","turn-key","ubiquitous","user-centric","value-added","vertical","viral","virtual","visionary","web-enabled","wireless","world-class" ],
             [ "action-items","applications","architectures","bandwidth","channels","communities","content","convergence","deliverables","e-business","e-commerce","e-markets","e-services","e-tailers","experiences","eyeballs","functionalities","infomediaries","infrastructures","initiatives","interfaces","markets","methodologies","metrics","mindshare","models","networks","niches","paradigms","partnerships","platforms","portals","relationships","ROI","synergies","web-readiness","schemas","solutions","supply-chains","systems","technologies","users","vortals","web services" ]]

data/data/mod_spox/extras/Bytes.rb

@@ -2,8 +2,7 @@ class Bytes < ModSpox::Plugin
     include Models
     def initialize(args)
         super
-        Signature.find_or_create(:signature => 'bytes (\d+)', :plugin => name, :method => 'convert',
-            :description => 'Convert bytes to human readable string').params = [:bytes]
+        add_sig(:sig => 'bytes (\d+)', :method => :convert, :desc => 'Convert bytes to human readable string', :params => [:bytes])
     end
     
     def convert(message, params)

data/data/mod_spox/extras/Confess.rb

@@ -10,12 +10,6 @@ class Confess < ModSpox::Plugin
     
     def initialize(pipeline)
         super(pipeline)
-        begin
-            require 'htmlentities'
-        rescue Object => boom
-            Logger.warn('Error: This plugin requires the HTMLEntities gem. Please install and reload plugin.')
-            raise Exceptions::BotException.new("Missing required HTMLEntities library")
-        end
         begin
             Confession.db = Sequel.sqlite(BotConfig[:userpath] + '/confessions.db')
         rescue Object => boom
@@ -23,25 +17,19 @@ class Confess < ModSpox::Plugin
             raise Exceptions::BotException.new("Failed to create database: #{boom}")
         end
         Confession.build_confession && Confession.create_table unless Confession.table_exists?
-        Signature.find_or_create(:signature => 'confess', :plugin => name, :method => 'confess',
-            :description => 'Print a confession')
-        Signature.find_or_create(:signature => 'confess (?!score|count|fetcher|\+\+|\-\-)(.+)?', :plugin => name, :method => 'confess',
-            :description => 'Print a confession').params = [:term]
-        Signature.find_or_create(:signature => 'confess(\+\+|\-\-) ?(\d+)?', :plugin => name, :method => 'score',
-            :description => 'Score a confession').params = [:score, :id]
-        Signature.find_or_create(:signature => 'confess score (\d+)', :plugin => name, :method => 'show_score',
-            :description => 'Show a confession\'s score').params = [:id]
-        Signature.find_or_create(:signature => 'confess count', :plugin => name, :method => 'count',
-            :description => 'Current count of cached confessions')
-        Signature.find_or_create(:signature => 'confess fetcher (start|stop)', :plugin => name, :method => 'fetcher',
-            :description => 'Turn confession fetcher on or off', :group_id => Group.filter(:name => 'admin').first.pk).params = [:status]
-        Config[:confess] = 'nofetch' if Config[:confess].nil?
+        add_sig(:sig => 'confess', :method => :confess, :desc => 'Print a confession')
+        add_sig(:sig => 'confess (?!score|count|fetcher|\+\+|\-\-)(.+)?', :method => :confess, :desc => 'Print a confession', :params => [:term])
+        add_sig(:sig => 'confess(\+\+|\-\-) ?(\d+)?', :method => :score, :desc => 'Score a confession', :params => [:score, :id])
+        add_sig(:sig => 'confess score (\d+)', :method => :show_score, :desc => 'Show a confession\'s score', :params => [:id])
+        add_sig(:sig => 'confess count', :method => :count, :desc => 'Current count of cached confessions')
+        add_sig(:sig => 'confess fetcher (start|stop)', :method => :fetcher, :desc => 'Turn confession fetcher on or off', :group => Group.filter(:name => 'admin').first, :params => [:status])
+        add_sig(:sig => 'confess count (.+)', :method => :count_matches, :desc => 'Show number entries matching search', :params => [:query])
+        Config.set(:confess, 'nofetch') if Config.val(:confess).nil?
         @last_confession = {}
         @fetch = false
-        @coder = HTMLEntities.new
         @timer = {:action => nil, :id => nil}
         @lock = Mutex.new
-        start_fetcher if Config[:confess] == 'fetch'
+        start_fetcher if Config.val(:confess) == 'fetch'
     end
     
     def destroy
@@ -85,6 +73,16 @@ class Confess < ModSpox::Plugin
         end
     end
     
+    def count_matches(m, params)
+        begin
+            @lock.synchronize do
+                reply m.replyto, "Number of matches for \2#{params[:query]}\2: #{Confession.search(params[:query]).size}"
+            end
+        rescue Object => boom
+            error m.replyto, "Failed to count matches. Reason: #{boom}"
+        end
+    end
+    
     def show_score(message, params)
         pk = nil
         score = nil
@@ -115,11 +113,11 @@ class Confess < ModSpox::Plugin
         if(c)
             @lock.synchronize do
                 if(params[:score] == '++')
-                    c.update_with_params(:positive => c.positive.to_i + 1)
+                    c.update(:positive => c.positive.to_i + 1)
                 else
-                    c.update_with_params(:negative => c.negative.to_i + 1)
+                    c.update(:negative => c.negative.to_i + 1)
                 end
-                c.update_with_params(:score => ((c.positive.to_f) / (c.positive.to_f + c.negative.to_f)) * 100.0)
+                c.update(:score => ((c.positive.to_f) / (c.positive.to_f + c.negative.to_f)) * 100.0)
             end
         else
             reply message.replyto, "\2Error:\2 Failed to find confession to score"
@@ -136,16 +134,16 @@ class Confess < ModSpox::Plugin
     
     def fetcher(message, params)
         if(params[:status] == 'start')
-            if(Config[:confess] == 'fetch')
+            if(Config.val(:confess) == 'fetch')
                 reply message.replyto, 'Confession fetcher is already running'
             else
-                Config[:confess] = 'fetch'
+                Config.set(:confess, 'fetch')
                 reply message.replyto, 'Confession fetcher is now running'
                 start_fetcher
             end
         else
-            if(Config[:confess] == 'fetch')
-                Config[:confess] = 'nofetch'
+            if(Config.val(:confess) == 'fetch')
+                Config.set(:confess, 'nofetch')
                 stop_fetcher
                 reply message.replyto, 'Confession fetcher has been stopped'
             else
@@ -165,7 +163,7 @@ class Confess < ModSpox::Plugin
                 Logger.info("Match found: #{match[0]}")
                 conf = CGI::unescapeHTML(match[0])
                 conf = conf.gsub(/<.+?>/, ' ').gsub(/[\r\n]/, '').gsub(/\s+/, ' ')
-                conf = @coder.decode(conf)
+                conf = Helpers.convert_entities(conf)
                 Logger.info("Match turned into: #{conf}")
                 if conf.length < 300
                     begin

data/data/mod_spox/extras/DCC.rb

@@ -8,30 +8,21 @@ class DCC < ModSpox::Plugin
         super
         group = Group.find_or_create(:name => 'dcc')
         admin = Group.find_or_create(:name => 'admin')
-        Signature.find_or_create(:signature => 'file list(\s(.+))?', :plugin => name, :method => 'file_list',
-            :description => 'List available DCC files', :group_id => group.pk).params = [:pattern]
-        Signature.find_or_create(:signature => 'file get (.+)', :plugin => name, :method => 'file_get',
-            :description => 'Download file', :group_id => group.pk).params = [:filename]
-        Signature.find_or_create(:signature => 'file ports (\d+)-(\d+)', :plugin => name, :method => 'set_ports',
-            :description => 'Set allowed DCC ports', :group_id => admin.pk).params = [:start, :end]
-        Signature.find_or_create(:signature => 'file adddir (.+)', :plugin => name, :method => 'add_dir',
-            :description => 'Add directory to file list', :group_id => admin.pk).params = [:dir]
-        Signature.find_or_create(:signature => 'file rmdir (\d+)', :plugin => name, :method => 'rm_dir',
-            :description => 'Remove directory from file list', :group_id => admin.pk).params = [:dir]
-        Signature.find_or_create(:signature => 'file show dir', :plugin => name, :method => 'show_dirs',
-            :description => 'Show directories available to file list', :group_id => admin.pk)
-        Signature.find_or_create(:signature => 'file show ports', :plugin => name, :method => 'show_ports',
-            :description => 'Show allowed ports', :group_id => admin.pk)
-        Signature.find_or_create(:signature => 'file max wait(\s(\d+))?', :plugin => name, :method => 'max_wait',
-            :description => 'Show/set timeout for accepting files', :group_id => admin.pk).params = [:wait]
-        Signature.find_or_create(:signature => 'dcc chat', :plugin => name, :method => 'dcc_chat',
-            :description => 'Start a DCC chat with the bot (useful if behind firewall', :group_id => group.pk)
+        add_sig(:sig => 'file list(\s(.+))?', :method => :file_list, :desc => 'List available DCC files', :group => group, :params => [:pattern])
+        add_sig(:sig => 'file get (.+)', :method => :file_get, :desc => 'Download file', :group => group, :params => [:filename])
+        add_sig(:sig => 'file ports (\d+)-(\d+)', :method => :set_ports, :desc => 'Set allowed DCC ports', :group => admin, :params => [:start, :end])
+        add_sig(:sig => 'file adddir (.+)', :method => :add_dir, :desc => 'Add directory to file list', :group => admin, :params => [:dir])
+        add_sig(:sig => 'file rmdir (\d+)', :method => :rm_dir, :desc => 'Remove directory from file list', :group => admin, :params => [:dir])
+        add_sig(:sig => 'file show dir', :method => :show_dirs, :desc => 'Show directories available to file list', :group => admin)
+        add_sig(:sig => 'file show ports', :method => :show_ports, :desc => 'Show allowed ports', :group => admin)
+        add_sig(:sig => 'file max wait(\s(\d+))?', :method => :max_wait, :desc => 'Show/set timeout for accepting files', :group => admin, :params => [:wait])
+        add_sig(:sig => 'dcc chat', :method => :dcc_chat, :desc => 'Start a DCC chat with the bot (useful if behind firewall', :group => group)
         @servers = {}
-        @ports = Setting[:dcc_ports]
+        @ports = Setting.val(:dcc_ports)
         @ports = {:start => 49152, :end => 65535} if @ports.nil?
         @dirs = Setting.find_or_create(:name => 'dcc_dirs').value
         @dirs = [] unless @dirs.is_a?(Array)
-        @max_wait = Setting[:dcc_max_wait]
+        @max_wait = Setting.val(:dcc_max_wait)
         @max_wait = @max_wait.nil? ? 60 : @max_wait.to_i
     end
 

data/data/mod_spox/extras/DevWatch.rb

@@ -8,27 +8,24 @@ class DevWatch < ModSpox::Plugin
     def initialize(pipeline)
         super(pipeline)
         admin = Group.filter(:name => 'admin').first
-        Signature.find_or_create(:signature => 'devwatch (on|off) (\S+)', :plugin => name, :method => 'enable_watch', :group_id => admin.pk,
-            :description => 'Turn development watcher on/off in given channel').params = [:status, :channel]
-        Signature.find_or_create(:signature => 'devwatch list', :plugin => name, :method => 'watch_list', :group_id => admin.pk,
-            :description => 'List all channels on the development watch list')
-        Signature.find_or_create(:signature => 'devwatch url ?(\S+)?', :plugin => name, :method => 'set_url', :group_id => admin.pk,
-            :description => 'Set URL for development RSS feed').params = [:url]
-        Signature.find_or_create(:signature => 'devwatch interval ?(\d+)?', :plugin => name, :method => 'set_interval', :group_id => admin.pk,
-            :description => 'Set time interval for notifications').params = [:time]
-        if(Setting[:devwatch].nil?)
+        add_sig(:sig => 'devwatch (on|off) (\S+)', :method => :enable_watch, :group => admin, :desc => 'Turn development watcher on/off in given channel', :params => [:status, :channel])
+        add_sig(:sig => 'devwatch list', :method => :watch_list, :group => admin, :desc => 'List all channels on the development watch list')
+        add_sig(:sig => 'devwatch url ?(\S+)?', :method => :set_url, :group => admin, :desc => 'Set URL for development RSS feed', :params => [:url])
+        add_sig(:sig => 'devwatch interval ?(\d+)?', :method => :set_interval, :group => admin, :desc => 'Set time interval for notifications', :params => [:time])
+        if(Setting.val(:devwatch).nil?)
             Setting.find_or_create(:name => 'devwatch').value = {:channels => [], :interval => 300}
         end
         @original = nil
         @new = nil
         @timer = {:action => nil, :id => nil}
         start_auto
+        check_updates
     end
     
     def enable_watch(message, params)
         channel = Channel.filter(:name => params[:channel]).first
         if(channel)
-            vals = Setting[:devwatch]
+            vals = Setting.val(:devwatch)
             if(params[:status] == 'on')
                 vals[:channels] << channel.pk unless vals[:channels].include?(channel.pk)
                 reply(message.replyto, "#{channel.name} is now on the development watch list")
@@ -44,25 +41,25 @@ class DevWatch < ModSpox::Plugin
     end
     
     def watch_list(message, params)
-        if(Setting[:devwatch][:channels].empty?)
+        if(Setting.val(:devwatch)[:channels].empty?)
             reply(message.replyto, "No channels currently on the development watch list")
         else
             chans = []
-            Setting[:devwatch][:channels].each{|id| chans << Channel[id].name}
+            Setting.val(:devwatch)[:channels].each{|id| chans << Channel[id].name}
             reply(message.replyto, "Channels on development watch list: #{chans.join(', ')}")
         end
     end
     
     def set_url(message, params)
         if(params[:url])
-            vals = Setting[:devwatch]
+            vals = Setting.val(:devwatch)
             vals[:url] = params[:url]
             reply(message.replyto, "OK")
             Setting.filter(:name => 'devwatch').first.value = vals
             update_auto
         else
-            if(Setting[:devwatch].has_key?(:url))
-                reply(message.replyto, "\2Devwatch URL:\2 #{Setting[:devwatch][:url]}")
+            if(Setting.val(:devwatch).has_key?(:url))
+                reply(message.replyto, "\2Devwatch URL:\2 #{Setting.val(:devwatch)[:url]}")
             else
                 reply(message.replyto, "\2Error:\2 No URL set for devwatch")
             end
@@ -71,7 +68,7 @@ class DevWatch < ModSpox::Plugin
     
     def set_interval(message, params)
         if(params[:time])
-            vals = Setting[:devwatch]
+            vals = Setting.val(:devwatch)
             vals[:interval] = params[:time].to_i
             Setting.filter(:name => 'devwatch').first.value = vals
             if(@timer[:action].nil?)
@@ -81,13 +78,13 @@ class DevWatch < ModSpox::Plugin
             end
             reply(message.replyto, "Devwatch announcement interval reset to: #{Helpers.format_seconds(params[:time].to_i)}")
         else
-            reply(message.replyto, "Devwatch announcement interval set to: #{Helpers.format_seconds(Setting[:devwatch][:interval].to_i)}")
+            reply(message.replyto, "Devwatch announcement interval set to: #{Helpers.format_seconds(Setting.val(:devwatch)[:interval].to_i)}")
         end
     end
     
     def check_updates
-        if(Setting[:devwatch].has_key?(:url) && Setting[:devwatch][:channels].size > 0)
-            src = open(Setting[:devwatch][:url])
+        if(Setting.val(:devwatch).has_key?(:url) && Setting.val(:devwatch)[:channels].size > 0)
+            src = open(Setting.val(:devwatch)[:url])
             doc = REXML::Document.new(src.read)
             if @original.nil?
                 doc.elements.each('rss/channel/item') do |item|
@@ -102,7 +99,7 @@ class DevWatch < ModSpox::Plugin
         end
     end
 
-    def print_new
+    def print_new(max=5)
         new_items = Array.new
         # run through the list until we hit a duplicate #
         i = 1
@@ -115,11 +112,12 @@ class DevWatch < ModSpox::Plugin
                 new_items << "#{item.elements['title'].text}: #{item.elements['link'].text}"
             end
             i += 1
+            break if i > max
         end
         @original = new_orig.nil? ? @original : new_orig
         if new_items.size > 0
             new_items.reverse!
-            Setting[:devwatch][:channels].each do |id|
+            Setting.val(:devwatch)[:channels].each do |id|
                 channel = Channel[id]
                 new_items.each do |item|
                     reply(channel, item)
@@ -143,8 +141,8 @@ class DevWatch < ModSpox::Plugin
     end
     
     def start_auto
-        if(@timer[:action].nil? && Setting[:devwatch].has_key?(:url) && Setting[:devwatch][:channels].size > 0)
-            m = Messages::Internal::TimerAdd.new(self, Setting[:devwatch][:interval].to_i){ check_updates }
+        if(@timer[:action].nil? && Setting.val(:devwatch).has_key?(:url) && Setting.val(:devwatch)[:channels].size > 0)
+            m = Messages::Internal::TimerAdd.new(self, Setting.val(:devwatch)[:interval].to_i){ check_updates }
             @timer[:id] = m.id
             @pipeline << m
         end

data/data/mod_spox/extras/DownForEveryoneOrJustMe.rb

@@ -0,0 +1,47 @@
+# ex: set ts=4 et:
+require "net/http"
+
+# downforeveryoneorjustme.com website-upness-checker plugin
+# by pizza
+
+class DownForEveryoneOrJustMe < ModSpox::Plugin
+
+    def initialize(pipeline)
+        super
+        add_sig(:sig    => 'down ((?:(?:[a-z0-9][a-z0-9-]*)\.)+[a-z]+)',
+                :method => :down,
+                :desc   => 'Check website status',
+                :params => [:domain])
+        @site = 'http://downforeveryoneorjustme.com/'
+    end
+    
+    def down(m, params)
+        begin
+            # check for valid domain
+            domain = params[:domain].downcase
+            url = @site + domain
+            reply m.replyto, get_text(domain, url)
+        rescue Object => boom
+            error m.replyto, "Failed to fetch. #{boom}"
+        end
+    end
+    
+    private
+    
+    def get_text(domain, url)
+        begin
+            t = "#{domain} appears "
+            data = Net::HTTP.get_response(URI.parse(url)).body
+            if /is up/.match(data)
+                t = t + "up"
+            else
+                t = t + "down"
+            end
+            return t
+        rescue Object => boom
+            Logger.error(boom)
+            raise boom
+        end
+    end
+end
+

data/data/mod_spox/extras/EightBall.rb

@@ -4,7 +4,7 @@ class EightBall < ModSpox::Plugin
 
     def initialize(pipeline)
         super
-        Signature.find_or_create(:signature => '8ball .+\?$', :plugin => name, :method => 'eightball', :description => 'Ask the magic eightball a question')
+        add_sig(:sig => '8ball .+\?$', :method => :eightball, :desc => 'Ask the magic eightball a question')
         @responses = ['Ask Again Later',
                       'Better Not Tell You Now',
                       'Concentrate and Ask Again',

data/data/mod_spox/extras/FML.rb

@@ -0,0 +1,35 @@
+require 'net/http'
+require 'rexml/document'
+
+class FML < ModSpox::Plugin
+
+    def initialize(pipeline)
+        super
+        add_sig(:sig => 'fml( (love|money|kids|work|health|sex|miscellaneous))?', :method => :random, :desc => 'Fuck my life', :params => [:wspace, :category])
+        @site = 'http://api.betacie.com/view/'
+        @vars = ['key=readonly', 'language=en']
+    end
+    
+    def random(m, params)
+        begin
+            t = params[:category] ? "#{params[:category].strip}/" : ''
+            reply m.replyto, get_text("#{t}random")
+        rescue Object => boom
+            error m.replyto, 'Failed to fetch.' + boom.to_s
+        end
+    end
+    
+    private
+    
+    def get_text(thing)
+        data = Net::HTTP.get_response(URI.parse(@site+thing+'?'+@vars.join('&'))).body
+        doc = REXML::Document.new(data)
+        output = []
+        doc.elements.each('root/items/item/text') do |t|
+            output << Helpers.convert_entities(t.text)
+        end
+        raise 'Failed to fetch item from FML' if output.empty?
+        return output[rand(output.size)]
+    end
+
+end

data/data/mod_spox/extras/Headers.rb

@@ -1,26 +1,22 @@
 require 'net/http'
 require 'net/https'
+require 'uri'
 
 class Headers < ModSpox::Plugin
 
     def initialize(pipeline)
         super(pipeline)
         admin = Models::Group.find_or_create(:name => 'headers')
-        Models::Signature.find_or_create(:signature => 'headers (https?:\/\/\S+)', :plugin => name, :method => 'fetch_headers',
-            :description => 'Fetch HTTP headers').params = [:url]
-        Models::Signature.find_or_create(:signature => 'headers max (\d+)', :plugin => name, :method => 'set_max',
-            :group_id => admin.pk, :description => 'Set maximum number of headers to return').params = [:max]
-        Models::Signature.find_or_create(:signature => 'headers max', :plugin => name, :method => 'show_max',
-            :group_id => admin.pk, :description => 'Show maximum number of headers to return ')
+        add_sig(:sig => 'headers ((https?:\/\/)?\S+)', :method => :fetch_headers, :desc => 'Fetch HTTP headers', :params => [:url])
+        add_sig(:sig => 'headers max (\d+)', :method => :set_max, :group => admin, :desc => 'Set maximum number of headers to return', :params => [:max])
+        add_sig(:sig => 'headers max', :method => :show_max, :group => admin, :desc => 'Show maximum number of headers to return ')
         @lock = Mutex.new
-        @max = Models::Config[:headers_max]
+        @max = Models::Config.val(:headers_max)
         @max = @max.nil? ? 0 : @max.to_i
     end
     
     def set_max(message, params)
-        record = Models::Config.find_or_create(:name => 'headers_max')
-        record.value = params[:max].to_i
-        record.save
+        record = Models::Config.set(:headers_max, params[:max].to_i)
         @max = params[:max].to_i
         reply message.replyto, "Max headers returned set to: #{params[:max].to_i}"
     end
@@ -30,48 +26,33 @@ class Headers < ModSpox::Plugin
     end
 
     def fetch_headers(message, params)
-        @lock.synchronize do
-            secure = false
-            if(params[:url] =~ /^http:/)
-                port = 80
+        params[:url] = "http://#{params[:url]}" unless params[:url].slice(0..3).downcase == 'http'
+        uri = URI.parse(params[:url])
+        begin
+            path = uri.path.nil? || uri.path.empty? ? '/' : uri.path
+            path += "?#{uri.query}" unless uri.query.nil?
+            reply message.replyto, "Connecting to: #{uri.host} on port: #{uri.port} retrieving: #{path}"
+            con = Net::HTTP.new(uri.host, uri.port)
+            #con.secure = uri.scheme == 'https'
+            con.open_timeout = 5
+            con.read_timeout = 5
+            response = con.head(path)
+            output = ["Response code: #{response.code}"]
+            count = 0
+            response.each_capitalized{|key,val|
+                output << "#{key.slice(0..50)}: #{val.slice(0..200)}"
+                count += 1
+                break if @max != 0 && count >= @max
+            }
+            if(count >= @max && @max != 0)
+                output << 'Maximum header limit reached.'
             else
-                port = 443
-                secure = true
-            end
-            params[:url].gsub!(/^https?:\/\//, '')
-            if(params[:url] =~ /:(\d+)/)
-                port = $1.to_i
-                params[:url].gsub!(/:(\d+)/, '')
-            end
-            if(params[:url] =~ /(.+?[a-zA-Z]{2,4})(\/.+)$/)
-                location = $1
-                page = $2
-            else
-                location = params[:url].gsub(/\/$/, '')
-                page = '/'
-            end
-            begin
-                reply message.replyto, "Connecting to: #{location} on port: #{port} retrieving: #{page}"
-                con = Net::HTTP.new(location, port)
-                con.use_ssl = secure
-                response = con.get(page)
-                output = ["Response code: #{response.code}"]
-                count = 0
-                response.each{|key,val|
-                    output << "#{key.slice(0..50)}: #{val.slice(0..200)}"
-                    count += 1
-                    break if @max != 0 && count >= @max
-                }
-                if(count >= @max && @max != 0)
-                    output << 'Maximum header limit reached.'
-                else
-                    output << 'Header listing complete'
-                end
-                reply message.replyto, output
-            rescue Object => boom
-                reply message.replyto, "Error retrieving headers: #{boom}"
-                Logger.warn("#{boom}\n#{boom.backtrace.join("\n")}")
+                output << 'Header listing complete'
             end
+            reply message.replyto, output
+        rescue Object => boom
+            reply message.replyto, "Error retrieving headers (#{uri.host}): #{boom}"
+            Logger.warn("Headers plugin error: #{boom}")
         end
     end