mod_spox 0.2.0 → 0.3.0

data/data/mod_spox/extras/Talk.rb

@@ -5,10 +5,8 @@ class Talk < ModSpox::Plugin
     def initialize(pipeline)
         super
         group = Group.find_or_create(:name => 'talk')
-        Signature.find_or_create(:signature => 'say (\S+) (.+)', :plugin => name, :method => 'talk', :group_id => group.pk,
-            :description => 'Make bot speak given text to target', :requirement => 'private').params = [:target, :text]
-        Signature.find_or_create(:signature => 'action (\S+) (.+)', :plugin => name, :method => 'action', :group_id => group.pk,
-            :description => 'Make bot perform action for target', :requirement => 'private').params = [:target, :text]
+        add_sig(:sig => 'say (\S+) (.+)', :method => :talk, :group => group, :desc => 'Make bot speak given text to target', :req => 'private', :params => [:target, :text])
+        add_sig(:sig => 'action (\S+) (.+)', :method => :action, :group => group, :desc => 'Make bot perform action for target', :req => 'private', :params => [:target, :text])
     end
     
     def talk(message, params)

data/data/mod_spox/extras/Topten.rb

@@ -5,20 +5,16 @@ class Topten < ModSpox::Plugin
     def initialize(pipeline)
         super
         ChatStat.create_table unless ChatStat.table_exists?
-        Signature.find_or_create(:signature => 'topten', :plugin => name, :method => 'topten',
-            :requirement => 'public', :description => 'Show topten users since midnight')
-        Signature.find_or_create(:signature => 'topten ([0-9]{4}\/[0-9]{2}\/[0-9]{2})', :plugin => name, :method => 'archive',
-            :description => 'Show topten from given date', :requirement => 'public').params = [:date]
-        Signature.find_or_create(:signature => 'stats ?(\S+)?', :plugin => name, :method => 'stats', :description => 'Show stats on nick',
-            :requirement => 'public').params = [:nick]
-        Signature.find_or_create(:signature => 'stats lifetime (\S+)?', :plugin => name, :method => 'life_stats',
-            :description => 'Show stat totals for given nick', :requirement => 'public').params = [:nick]
+        add_sig(:sig => 'topten', :method => :topten, :req => 'public', :desc => 'Show topten users since midnight')
+        add_sig(:sig => 'topten ([0-9]{4}\/[0-9]{2}\/[0-9]{2})', :method => :archive, :desc => 'Show topten from given date', :req => 'public', :params => [:date])
+        add_sig(:sig => 'stats ?(\S+)?', :method => :stats, :desc => 'Show stats on nick', :req => 'public', :params => [:nick])
+        add_sig(:sig => 'stats lifetime (\S+)?', :method => :life_stats, :desc => 'Show stat totals for given nick', :req => 'public', :params => [:nick])
         @pipeline.hook(self, :log_stats, :Incoming_Privmsg)
     end
     
     def topten(m, p)
         stats = ChatStat.filter(:channel_id => m.target.pk, :daykey => construct_daykey).reverse_order(:bytes).limit(10)
-        if(stats.size > 0)
+        if(stats.count > 0)
             users = []
             stats.each do |stat|
                 bytes = (stat.bytes > 1023) ? "#{sprintf('%.2f', (stat.bytes / 1024.0))}kb" : "#{stat.bytes}b"
@@ -32,7 +28,7 @@ class Topten < ModSpox::Plugin
     
     def archive(m, p)
         stats = ChatStat.filter(:channel_id => m.target.pk, :daykey => p[:date]).reverse_order(:bytes).limit(10)
-        if(stats.size > 0)
+        if(stats.count > 0)
             users = []
             stats.each do |stat|
                 bytes = (stat.bytes > 1023) ? "#{sprintf('%.2f', (stat.bytes / 1024.0))}kb" : "#{stat.bytes}b"
@@ -62,8 +58,8 @@ class Topten < ModSpox::Plugin
     def life_stats(m, p)
         nick = p[:nick] ? Nick.locate(p[:nick], false) : m.source
         if(nick)
-            result = ChatStat.group(:nick_id).select(:SUM[:bytes].as(:tbytes), :SUM[:words].as(:twords), :SUM[:questions].as(:tquestions)).filter(:nick_id => nick.pk).first
-            bytes = (result[:tbytes] > 1023) ? "#{sprintf('%.2f', (result[:tbytes] / 1024.0))}kb" : "#{result[:tbytes]}b"
+            result = ChatStat.group(:nick_id).select('SUM(bytes) as tbytes'.lit, 'SUM(words) as twords'.lit, 'SUM(questions) as tquestions'.lit).filter(:nick_id => nick.pk).first
+            bytes = (result[:tbytes].to_i > 1023) ? "#{sprintf('%.2f', (result[:tbytes].to_i / 1024.0))}kb" : "#{result[:tbytes]}b"
             reply m.replyto, "#{nick.nick} (total): #{bytes} logged, #{result[:twords]} words spoken and #{result[:tquestions]} questions asked"
         else
             reply m.replyto, "\2Error:\2 Failed to find #{p[:nick]}"
@@ -100,6 +96,8 @@ class Topten < ModSpox::Plugin
             foreign_key :channel_id, :table => :channels
             foreign_key :nick_id, :table => :nicks
         end
+        many_to_one :channel, :class => ModSpox::Models::Channel
+        many_to_one :nick, :class => ModSpox::Models::Nick
     end
 
 end

data/data/mod_spox/extras/TracTicket.rb

@@ -10,14 +10,12 @@ class TracTicket < ModSpox::Plugin
         add_sig(:sig => 'ticket trac( (\S+))?', :method => :trac_location, :group => admin,
                 :desc => 'Show/set trac site', :params => [:trash, :site])
         add_sig(:sig => 'ticket site', :method => :trac_location, :desc => 'Show trac site')
-        @site = Config[:trac]
+        @site = Config.val(:trac)
     end
     
     def trac_location(message, params)
         if(params[:site])
-            site = Config.find_or_create(:name => 'trac')
-            site.value = params[:site]
-            site.save
+            site = Config.set(:trac, params[:site])
             @site = params[:site]
             reply message.replyto, "\2Trac Update:\2 Location of trac system has been updated: #{params[:site]}"
         else
@@ -44,7 +42,7 @@ class TracTicket < ModSpox::Plugin
                     'Referer' => @site,
                     'Content-Type' => 'application/x-www-form-urlencoded'
                 }   
-                data = "reporter=#{URI.escape(message.source.nick)}&summary=#{URI.escape(params[:short])}&description=#{URI.escape(long)}&type=#{URI.escape(params[:type])}&action=create&status=new&priority=minor&__FORM_TOKEN=#{URI.escape(fid)}"
+                data = "field_reporter=#{URI.escape(message.source.nick)}&field_summary=#{URI.escape(params[:short])}&field_description=#{URI.escape(long)}&field_type=#{URI.escape(params[:type])}&field_status=new&submit=Create%20ticket&field_priority=minor&__FORM_TOKEN=#{URI.escape(fid)}"
                 resp, data = con.post(path, data, headers)
                 reply message.replyto, 'Ticket was successfully added to tracker'
             rescue Object => boom

data/data/mod_spox/extras/Translate.rb

@@ -4,23 +4,13 @@ class Translate < 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
-        Signature.find_or_create(:signature => 'translate ([a-z]{2}\|[a-z]{2}) (.+)', :plugin => name, :method => 'translate',
-            :description => 'Translate text').params = [:lang, :text]
-        Signature.find_or_create(:signature => 'autotranslate add ([a-z]{2}) (\S+)', :plugin => name, :method => 'auto_add',
-            :description => 'Add a nick to the autotranslate service').params = [:lang, :nick]
-        Signature.find_or_create(:signature => 'autotranslate remove (\S+)', :plugin => name, :method => 'auto_remove',
-            :description => 'Remove a nick from the autotranslate service').params = [:nick]
-        add_sig(:sig => 'translate languages', :method => 'langs', :description => 'Show available languages')
+        add_sig(:sig => 'translate ([a-z]{2}\|[a-z]{2}) (.+)', :method => :translate, :desc => 'Translate text', :params => [:lang, :text])
+        add_sig(:sig => 'autotranslate add ([a-z]{2}) (\S+)', :method => :auto_add, :desc => 'Add a nick to the autotranslate service', :params => [:lang, :nick])
+        add_sig(:sig => 'autotranslate remove (\S+)', :method => :auto_remove, :desc => 'Remove a nick from the autotranslate service', :params => [:nick])
+        add_sig(:sig => 'translate languages', :method => :langs, :desc => 'Show available languages')
         @pipeline.hook(self, :listener, :Incoming_Privmsg)
         @watchers = {}
         @cache = {}
-        @coder = HTMLEntities.new
         @allowed = {'zh'=>'Chinese-simplified','zt'=>'Chinese-traditional','en'=>'English','nl'=>'Dutch',
                     'fr'=>'French','de'=>'German','el'=>'Greek','it'=>'Italian','ja'=>'Japanese',
                     'ko'=>'Korean','pt'=>'Portuguese','ru'=>'Russian','es'=>'Spanish'}
@@ -82,12 +72,13 @@ class Translate < ModSpox::Plugin
     def listener(message)
         if(message.is_public? && @watchers.has_key?(message.target.pk))
             if(@watchers[message.target.pk].has_key?(message.source.pk))
-                trans_message = do_translation("#{@watchers[message.target.pk][message.source.pk]}en", message.message)
+                trans_message = do_translation("#{@watchers[message.target.pk][message.source.pk]}|en", message.message)
                 reply message.replyto, "\2Translation (#{message.source.nick}):\2 #{trans_message}" unless trans_message == message.message
-            elsif(message.message =~ /^(\S+)[:,]/)
+            elsif(message.message =~ /^(\S+[:, ])/)
+                message.message.slice!(0..$1.size)
                 Logger.info("Translate matched a followed nick: #{$1}")
                 nick = Helpers.find_model($1, false)
-                return unless nick
+                return unless nick.is_a?(Models::Nick)
                 if(@watchers[message.target.pk].has_key?(nick.pk))
                     reply message.replyto, "\2(#{do_translation("en|#{@watchers[message.target.pk][nick.pk]}", 'translation')})\2 #{do_translation("en|#{@watchers[message.target.pk][nick.pk]}", message.message)}"
                 end
@@ -102,17 +93,24 @@ class Translate < ModSpox::Plugin
         if(@cache.has_key?(langs) && @cache[langs].has_key?(text))
             return @cache[langs][text]
         end
-        content = Net::HTTP.post_form(URI.parse('http://babelfish.yahoo.com/translate_txt'), {
+        headers = {'Accept-Charset' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7'}
+        url = URI.parse('http://babelfish.yahoo.com/translate_txt')
+        post = Net::HTTP::Post.new(url.path, headers)
+        post.set_form_data({
             'ei' => 'UTF-8',
             'doit' => 'done',
-            'fr' => 'bf-home',
+            'fr' => 'bf-res',
             'intl' => '1',
             'tt' => 'urltext',
             'trtext' => text,
             'lp' => langs.gsub(/\|/, '_'),
             'btnTrTxt' => 'Translate'
-        }).body
-        if(content)
+        })
+        result = Net::HTTP.new(url.host, url.port).start do |http|
+            http.request(post)
+        end
+        if(result.is_a?(Net::HTTPSuccess))
+            content = result.body
             if(content =~ /<div id="result">(.+?)<input/im)
                 tr = $1
                 tr.gsub!(/<.+?>/, '')
@@ -122,7 +120,7 @@ class Translate < ModSpox::Plugin
                     @cache[langs] = {} unless @cache.has_key?(langs)
                     @cache[langs][text] = tr
                 end
-                return @coder.decode(tr).strip
+                return Helpers.convert_entities(tr).strip
             else
                 raise 'Failed to locate translation'
             end

data/data/mod_spox/extras/Twitter.rb

@@ -34,7 +34,7 @@ class Twitter < ModSpox::Plugin
             ModClient.configure do |conf|
                 conf.user_agent = 'mod_spox twitter for twits'
                 conf.application_name = 'mod_spox IRC bot'
-                conf.application_version = "#{$BOTVERSION} (#{$BOTCODENAME})"
+                conf.application_version = "#{ModSpox.botversion} (#{ModSpox.botcodename})"
                 conf.application_url = 'http://rubyforge.org/projects/mod_spox'
                 conf.source = 'modspoxircbot'
             end
@@ -64,11 +64,19 @@ class Twitter < ModSpox::Plugin
                 :group => admin, :req => 'public')
         add_sig(:sig => 'autotweets interval( \d+)?', :method => :auto_tweets_interval, :desc => 'Set/show interval for auto tweet checks',
                 :group => admin, :params => [:interval])
+        add_sig(:sig => 'autotweets burst( \d+)?', :method => :auto_tweets_burst, :desc => 'Set/show maximum number of tweets to display at once',
+                :group => admin, :params => [:burst])
+        add_sig(:sig => 'twitter alias (\S+) (\S+)', :method => :alias_user, :desc => 'Set alias for twitter account', :group => twitter, :params => [:twit, :irc])
+        add_sig(:sig => 'twitter aliases (\S+)', :method => :show_aliases, :desc => 'Show alias for twit', :params => [:twit])
+        add_sig(:sig => 'twitter dealias (\S+)', :method => :remove_alias, :desc => 'Remove alias for twit', :params => [:twit], :group => twitter)
         @pipeline.hook(self, :get_timer, :Internal_TimerResponse)
         @auth_info = Models::Setting.find_or_create(:name => 'twitter').value
         @twitter = ModClient.new
-        @coder = HTMLEntities.new
         @search_url = 'http://search.twitter.com/search.json'
+        @aliases = Models::Setting.find_or_create(:name => 'twitter_aliases').value
+        @aliases = {} if @aliases.nil?
+        @burst = Models::Setting.find_or_create(:name => 'twitter_burst').value
+        @burst = @burst.nil? ? 5 : @burst.to_i
         unless(@auth_info.is_a?(Hash))
             @auth_info = {:username => nil, :password => nil, :interval => 0, :channels => []}
         else
@@ -78,8 +86,64 @@ class Twitter < ModSpox::Plugin
         @lock = Mutex.new
         @running = false
         @timer = {:action => nil, :id => nil}
+        @friends = []
+        populate_friends
         start_auto
     end
+
+    def auto_tweets_burst(m, params)
+        if(params[:burst])
+            params[:burst] = params[:burst].to_i
+            if(params[:burst] == 0)
+                error m.replyto, 'Invalid value. Must supply a positive integer.'
+            else
+                @burst = params[:burst]
+                information m.replyto, "Updated maximum autotweet burst to: #{@burst}"
+            end
+        else
+            information m.replyto, "Maximum number of tweets to auto report: #{@burst}"
+        end
+    end
+    
+    def alias_user(m, params)
+        begin
+            raise "twit #{params[:twit]} is not in my friends list" unless @friends.include?(params[:twit])
+            raise "twit is already aliased to #{Models::Nick[@aliases[params[:twit].to_sym]].nick}" if @aliases.has_key?(params[:twit].to_sym)
+            nick = Helpers.find_model(params[:irc])
+            raise "failed to find nick #{params[:irc]}. is this a new user?" if nick.nil?
+            @aliases[params[:twit].to_sym] = nick.pk
+            save_aliases
+            information m.replyto, "Nick #{params[:irc]} is now aliased to twit #{params[:twit]}"
+        rescue Object => boom
+            error m.replyto, "Failed to alias user: #{boom}"
+        end
+    end
+    
+    def save_aliases
+        t = Models::Setting.find_or_create(:name => 'twitter_aliases')
+        t.value = @aliases
+        t.save
+    end
+    
+    def show_aliases(m, params)
+        begin
+            raise "twit #{params[:twit]} has no alias" unless @aliases.has_key?(params[:twit].to_sym)
+            information m.replyto, "Twit #{params[:twit]} is aliased to: #{Models::Nick[@aliases[params[:twit].to_sym]].nick}"
+        rescue Object => boom
+            error m.replyto, "Failed to find alias. Reason: #{boom}"
+        end
+    end
+    
+    def remove_alias(m, params)
+        begin
+            raise "twit #{params[:twit]} has no alias" unless @aliases.has_key?(params[:twit].to_sym)
+            @aliases.delete(params[:twit].to_sym)
+            save_aliases
+            information m.replyto, "Twit #{params[:twit]} is no longer aliased"
+        rescue Object => boom
+            error m.replyto, "Failed to remove alias: #{boom}"
+        end
+    end
     
     def search(m, params)
         url = URI.escape("#{@search_url}?rpp=1&q=#{params[:term]}")
@@ -109,7 +173,10 @@ class Twitter < ModSpox::Plugin
             output = ["Twitter match for: \2#{term}:\2"]
             result['results'].each do |item|
                 t = Time.parse(item['created_at'])
-                output << "[#{t.strftime("%Y/%m/%d-%H:%M:%S")}] <#{item['from_user']}> #{item['text']}"
+                output << "[#{t.strftime("%Y/%m/%d-%H:%M:%S")}] <#{item['from_user']}> #{Helpers.convert_entities(item['text'])}"
+            end
+            if(output.size < 2)
+                output = "\2Error:\2 No results found for term: #{term}"
             end
             return output
         rescue Object => boom
@@ -121,7 +188,7 @@ class Twitter < ModSpox::Plugin
         msgs = @twitter.messages(:received)
         reply m.replyto, "\2Twitter INBOX\2 Messages in inbox: #{msgs.size} (only last 5 displayed)"
         msgs.slice(0..5).each do | msg |
-            reply m.replyto, "\2#{msg.sender.screen_name}:\2 [#{msg.id}] #{@coder.decode(msg.text)}"
+            reply m.replyto, "\2#{msg.sender.screen_name}:\2 [#{msg.id}] #{Helpers.convert_entities(msg.text)}"
         end
     end
     
@@ -239,15 +306,10 @@ class Twitter < ModSpox::Plugin
     end
     
     def friends(m, params)
-        begin
-            fs = @twitter.my(:friends)
-            if(fs.size > 0)
-                reply m.replyto, "\2Friends:\2 #{fs.map{|u| u.screen_name}.join(', ')}"
-            else
-                warning m.replyto, 'no friends found'
-            end
-        rescue Object => boom
-            error m.replyto, "failed to locate friends list. (#{boom})"
+        if(@friends.size > 0)
+            reply m.replyto, "\2Friends:\2 #{@friends.join(', ')}"
+        else
+            warning m.replyto, 'no friends found'
         end
     end
     
@@ -257,6 +319,7 @@ class Twitter < ModSpox::Plugin
             unless(@twitter.my(:friends).include?(user))
                 @twitter.friend(:add, user)
                 information m.replyto, "added new friend: #{params[:twit]}"
+                @friends << params[:twit]
             else
                 warning m.replyto, "#{params[:twit]} is already in friend list"
             end
@@ -271,6 +334,7 @@ class Twitter < ModSpox::Plugin
             if(@twitter.my(:friends).map{|u|u.screen_name}.include?(user.screen_name))
                 @twitter.friend(:remove, user)
                 information m.replyto, "removed user from friend list: #{params[:twit]}"
+                @friends.delete(params[:twit])
             else
                 warning m.replyto, "#{params[:twit]} is not in friend list"
             end
@@ -283,7 +347,7 @@ class Twitter < ModSpox::Plugin
         begin
             msg = @twitter.status(:get, params[:m_id])
             if(msg)
-                reply m.replyto, "\2Tweet:\2 [#{msg.created_at.strftime("%Y/%m/%d-%H:%M:%S")}}] <#{msg.user.screen_name}> #{@coder.decode(msg.text)}"
+                reply m.replyto, "\2Tweet:\2 [#{msg.created_at.strftime("%Y/%m/%d-%H:%M:%S")}] <#{screen_name(msg.user.screen_name)}> #{Helpers.convert_entities(msg.text)}"
             else
                 warning m.replyto, "failed to find message with ID: #{params[:m_id].strip}"
             end
@@ -294,6 +358,34 @@ class Twitter < ModSpox::Plugin
     
     private
     
+    def populate_friends
+        return unless @lock.try_lock
+        begin
+            fs = @twitter.my(:friends)
+            @friends = []
+            if(fs.size > 0)
+                @friends = fs.map{|u| u.screen_name}
+            end
+        rescue Object => boom
+            Logger.info("Failed to populate friends: #{boom}")
+            @pipeline << Messages::Internal::TimerAdd.new(self, 200, nil, true){ populate_friends }
+        ensure
+            @lock.unlock
+        end
+    end
+    
+    def screen_name(n)
+        return @aliases.has_key?(n.to_sym) ? Models::Nick[@aliases[n.to_sym]].nick : n
+    end
+    
+    def replace_names(s)
+        s.scan(/@\S+/).each do |n|
+            n.slice!(0)
+            s.gsub!("@#{n}", "@#{screen_name(n)}")
+        end
+        return s
+    end
+    
     def check_timeline
         if(@auth_info[:channels].size < 1 || @auth_info[:interval].to_i < 1)
             Logger.warn('Twitter has no channels to send information to')
@@ -302,19 +394,24 @@ class Twitter < ModSpox::Plugin
                 things = []
                 @twitter.my(:friends).each do |f|
                     @twitter.timeline_for(:friend, :id => f.screen_name, :since => @last_check) do |status|
-                        if(@coder.decode(status.text) =~ /^@(\S+)/)
+                        next if status.created_at < @last_check
+                        if(Helpers.convert_entities(status.text) =~ /^@(\S+)/)
                             next unless @twitter.my(:friends).map{|f|f.screen_name}.include?($1) || $1 == @twitter.login
                         end
-                        things << "[#{status.created_at.strftime("%H:%M:%S")}] <#{status.user.screen_name}> #{@coder.decode(status.text)}"
+                        things << "[#{status.created_at.strftime("%H:%M:%S")}] <#{screen_name(status.user.screen_name)}> #{Helpers.convert_entities(replace_names(status.text))}"
                     end
                 end
                 @twitter.timeline_for(:me, :since => @last_check) do |status|
-                    things << "[#{status.created_at.strftime("%H:%M:%S")}] <#{status.user.screen_name}> #{@coder.decode(status.text)}"
+                    next if status.created_at < @last_check
+                    things << "[#{status.created_at.strftime("%H:%M:%S")}] <#{screen_name(status.user.screen_name)}> #{Helpers.convert_entities(replace_names(status.text))}"
                 end
-                things.uniq!
-                things.sort!
-                things.each do |status|
-                    @auth_info[:channels].each{|i| reply Models::Channel[i], "\2AutoTweet:\2 #{status}"}
+                unless(things.empty?)
+                    things.uniq!
+                    things.sort!
+                    things = things[-@burst,@burst] if things.size > @burst
+                    things.each do |status|
+                        @auth_info[:channels].each{|i| reply Models::Channel[i], "\2AutoTweet:\2 #{status}"}
+                    end
                 end
                 @last_check = Time.now
             rescue Object => boom
@@ -323,18 +420,6 @@ class Twitter < ModSpox::Plugin
         end
     end
     
-    def information(to, message)
-        reply to, "\2Twitter (info):\2 #{message}"
-    end
-    
-    def warning(to, message)
-        reply to, "\2Twitter (warn):\2 #{message}"
-    end
-    
-    def error(to, message)
-        reply to, "\2Twitter (error):\2 #{message}"
-    end
-    
     def save_info
         i = Models::Setting.find_or_create(:name => 'twitter')
         i.value = @auth_info

data/data/mod_spox/extras/UrbanDictionary.rb

@@ -7,21 +7,12 @@ class UrbanDictionary < 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
-        Signature.find_or_create(:signature => 'udefine (?!key)(\d+)? ?(.+)', :plugin => name, :method => 'define',
-            :description => 'Find the definition of a word or phrase').params = [:number, :term]
-        Signature.find_or_create(:signature => 'udefine key (.+)', :plugin => name, :method => 'key',
-            :group_id => Models::Group.filter(:name => 'admin').first.pk, :description => 'Set API key').params = [:key]
-        @coder = HTMLEntities.new
+        add_sig(:sig => 'udefine (?!key)((\d+ )?(.+))', :method => :define, :desc => 'Find the definition of a word or phrase', :params => [:fullmatch, :number, :term])
+        add_sig(:sig => 'udefine key (.+)', :method => :key, :group => Models::Group.filter(:name => 'admin').first, :desc => 'Set API key', :params => [:key])
     end
 
     def define(message, params)
-        key = Config[:urban_key]
+        key = Config.val(:urban_key)
         if(key)
             site = 'http://api.urbandictionary.com/soap?wsdl'
             result = params[:number] ? params[:number].to_i - 1 : 0
@@ -35,11 +26,11 @@ class UrbanDictionary < ModSpox::Plugin
                 if defs.size < result + 1
                     @pipeline << Privmsg.new(message.replyto, "Error: Definition number #{result+1} for term: #{params[:term]} not found.")
                 else
-                    defin = defs[result].definition.length > 500 ? defs[result].definition.slice(0..500) + " *[CUT]*" : defs[result].definition
-                    exp = defs[result].example.length > 500 ? defs[result].example.slice(0..500) + " *[CUT]*" : defs[result].example
+                    defin = defs[result].definition.length > 390 ? defs[result].definition.slice(0..390) + " *[CUT]*" : defs[result].definition
+                    exp = defs[result].example.length > 390 ? defs[result].example.slice(0..390) + " *[CUT]*" : defs[result].example
                     output << "Definition for \2#{defs[result].word}:\2"
-                    output << @coder.decode(defin.gsub(/[\r\n\s]+/, ' '))
-                    output << "\2Example usage:\2 #{@coder.decode(exp.gsub(/[\r\n\s]+/, ' '))}" if exp.length > 0
+                    output << Helpers.convert_entities(defin.gsub(/[\r\n\s]+/, ' '))
+                    output << "\2Example usage:\2 #{Helpers.convert_entities(exp.gsub(/[\r\n\s]+/, ' '))}" if exp.length > 0
                     reply message.replyto, output
                 end
             rescue Timeout::Error
@@ -56,7 +47,7 @@ class UrbanDictionary < ModSpox::Plugin
         if(message.is_public?)
             @pipeline << Privmsg.new(message.replyto, 'I don\'t set keys in public')
         else
-            Config[:urban_key] = params[:key]
+            Config.set(:urban_key, params[:key])
             @pipeline << Privmsg.new(message.replyto, 'Urban Dictionary API key has been set.')
         end
     end