mod_spox 0.0.5 → 0.1.0

data/CHANGELOG

@@ -1,3 +1,23 @@
+0.1.0 Release (Beta status)
+    Core:
+    * Plugins use symlinks
+    * Updates for sequel library compatibility
+    * Fixed bug in configuration wizard causing failure
+    * Triggerless commands usable when directly privmsging the bot
+    * Triggers are escaped properly before applying regex match
+    * Fixed trigger matching error when only trigger is provided
+    * Fixed output error when multiple lines are sent for output
+    Plugins:
+    * Karma plugin updates
+        * Added aliasing
+        * Auto decrement on self karma whoring
+        * Added a karma fight trigger
+    * Authentication plugin fixed to allow adding new groups to existing masks
+    * AutoKick ignores case during regex matching
+    * Fixed Roulette to have 6 chambers (was previously using only 5)
+    * Added option to kick on colored messages to AutoKick plugin
+    * PhpCli plugin properly remembers what channels it is enabled on
+
 0.0.5 Release (Alpha status)
     * Added new RAW message type for outgoing messages
     * Ability to load/unload/reload individual plugins

data/bin/mod_spox

@@ -18,7 +18,7 @@ rescue Object => boom
     # ignore if not found #
 end
 
-$BOTVERSION='0.0.5'
+$BOTVERSION='0.1.0'
 $VERBOSITY = 0
 $MOD_SPOX_PATH = nil
 

data/data/mod_spox/extras/AutoKick.rb

@@ -14,13 +14,38 @@ class AutoKick < ModSpox::Plugin
             :group_id => group.pk, :description => 'Add a new autokick rule').params = [:time, :regex, :message]
         Signature.find_or_create(:signature => 'autokick remove (\d+)', :plugin => name, :method => 'remove',
             :group_id => group.pk, :description => 'Remove an autokick rule').params = [:id]
+        Signature.find_or_create(:signature => 'autokick colors ?(on|off)?', :plugin => name, :method => 'colors',
+            :group_id => group.pk, :description => 'Kick user for using colors', :requirement => 'public').params = [:action]
         @pipeline.hook(self, :banner_watch, :Internal_PluginResponse)
         @banner = nil
         @map = nil
+        @colors = Setting[:colorkick]
+        @colors = Array.new if @colors.nil?
         AutoKickRecord.create_table unless AutoKickRecord.table_exists?
         do_listen
     end
     
+    def colors(message, params)
+        if(params[:action])
+            if(params[:action] == 'on')
+                if(@colors.include?(message.target.pk))
+                    reply message.replyto, 'Colored autokick is already enabled'
+                else
+                    @colors << message.target.pk
+                    Setting[:colorkick] = @colors
+                    reply message.replyto, 'Colored autokick has been enabled'
+                end
+            else
+                @colors.delete(message.target.pk)
+                Setting[:colorkick] = @colors
+                reply message.replyto, 'Colored autokick has been disabled'
+            end
+        else
+            status = @colors.include?(message.target.pk) ? 'on' : 'off'
+            reply message.replyto, "Colored autokick is currently \2#{status}\2"
+        end
+    end
+    
     def list(message, params)
         records = AutoKickRecord.all
         unless(records.empty?)
@@ -61,13 +86,18 @@ class AutoKick < ModSpox::Plugin
     def listener(message)
         if(@map.keys.include?(message.target.pk))
             @map[message.target.pk].each do |pattern|
-                reg = Regexp.new(pattern)
+                reg = Regexp.new(pattern, Regexp::IGNORECASE)
                 unless(reg.match(message.message).nil?)
                     record = AutoKickRecord.filter(:pattern => pattern).first
-                    @banner.plugin.ban(message.source, message.target, record.bantime, record.message, invite=false, show_time=true)
+                    @banner.plugin.ban(message.source, message.target, record.bantime, record.message, false, true)
                 end
             end 
         end
+        if(@colors.include?(message.target.pk))
+            if(message.is_colored?)
+                @banner.plugin.ban(message.source, message.target, 60, 'No color codes allowed', false, true)
+            end
+        end
     end
     
     def banner_watch(message)

data/data/mod_spox/extras/Bouncer.rb

@@ -0,0 +1,192 @@
+class Bouncer < ModSpox::Plugin
+    
+    include Models
+    
+    def initialize(pipeline)
+        super
+        admin = Group.find_or_create(:name => 'bouncer')
+        Signature.find_or_create(:signature => 'bouncer port ?(\d+)?', :plugin => name, :method => 'port',
+            :group_id => admin.pk, :description => 'Show or set bouncer port').params = [:port]
+        Signature.find_or_create(:signature => 'bouncer (start|stop|restart)', :plugin => name, :method => 'do_service',
+            :group_id => admin.pk, :description => 'Start or stop the bouncer').params = [:action]
+        Signature.find_or_create(:signature => 'bouncer status', :plugin => name, :method => 'status',
+            :group_id => admin.pk, :description => 'Show current bouncer status')
+        Signature.find_or_create(:signature => 'bouncer disconnect', :plugin => name, :method => 'disconnect',
+            :group_id => admin.pk, :description => 'Disconnect all users connected to bouncer')
+        Signature.find_or_create(:signature => 'bouncer clients', :plugin => name, :method => 'clients',
+            :group_id => admin.pk, :description => 'List clients connected to bouncer')
+        @pipeline.hook(self, :get_msgs, :Incoming)
+        @listener = nil
+        @clients = []
+        @socket = nil
+        @processor = nil
+        @to_server = Queue.new
+        if(Config[:bouncer_port])
+            start_listener
+        end
+    end
+    
+    def get_msgs(message)
+        unless(@clients.empty?)
+        Logger.log("BOUNCER: Sending to #{@clients.size} clients")
+            @clients.each do |client|
+                begin
+                    if(message.raw_content.is_a?(Array))
+                        message.raw_content.each do |m|
+                            client[:connection].puts(m + "\n")
+                        end
+                    else
+                        client[:connection].puts(message.raw_content + "\n")
+                    end
+                rescue Object => boom
+                    client[:thread].kill if client[:thread].alive?
+                    @clients.delete(client)
+                end
+            end
+        end
+    end
+    
+    def port(message, params)
+        unless(params[:port])
+            if(Config[:bouncer_port])
+                reply message.replyto, "Bouncer is currently listening on port: #{Config[:bouncer_port]}"
+            else
+                reply message.replyto, "\2Warning:\2 Listening port is not currently set for bouncer"
+            end
+        else
+            Config[:bouncer_port] = params[:port].to_i
+            reply message.replyto, "Bouncer will now listen on port: #{params[:port].to_i}"
+            restart_listener
+        end
+    end
+    
+    def do_service(message, params)
+        if(params[:action] == 'start')
+            if(listening?)
+                reply message.replyto, "\2Error:\2 Bouncer is already running"
+            else
+                start_listener
+                reply message.replyto, "Bouncer has been started"
+            end
+        elsif(params[:action] == 'stop')
+            if(listening?)
+                stop_listener
+                reply message.replyto, "Bouncer has been stopped"
+            else
+                reply message.replyto, "\2Error:\2 Bouncer is not currently running"
+            end
+        elsif(params[:action] == 'restart')
+            stop_listener
+            start_listener
+            reply message.replyto, "Bouncer has been restarted"
+        end
+    end
+    
+    def disconnect(message, params)
+        unless(@clients.empty?)
+            @clients.each do |socket|
+                socket[:connection].close
+                @clients.delete(socket)
+            end
+            reply message.replyto, "Bouncer has disconnected all clients"
+        else
+            reply message.replyto, "\2Error:\2 No clients connected to bouncer"
+        end
+    end
+    
+    def status(message, params)
+    end
+    
+    private
+    
+    def start_listener
+        port = Config[:bouncer_port]
+        if(port)
+            @socket = TCPServer.new(port)
+            @listener = Thread.new do
+                until(@socket.closed?)
+                    begin
+                        new_con = @socket.accept_nonblock
+                        Logger.log("BOUNCER: New connection established on bouncer")
+                        @clients << {
+                                    :connection => new_con, 
+                                    :thread => Thread.new(new_con) do | con |
+                                        begin
+                                        Logger.log("CONNECTION: #{con}")
+                                        until(con.closed?)
+                                            Logger.log("WAITING FOR STUFF ON :#{con}")
+                                            Kernel.select([con], nil, nil, nil)
+                                            Logger.log("Woken up and ready to read")
+                                            string = con.gets
+                                            Logger.log("BOUNCER GOT MESSAGE: #{string}")
+                                            if(string.empty?)
+                                                raise Exception.new("EMPTY STRING")
+                                            else
+                                                @to_server << {:message => string, :socket => con}
+                                            end
+                                        end
+                                        rescue Object => boom
+                                        Logger.log("THREAD BOUNCER ERROR: #{boom}")
+                                        end
+                                        end
+                                    }
+                    rescue Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
+                        IO.select([@socket])
+                        retry
+                    end
+                end
+                @listener = nil
+            end
+            start_processor
+        else
+            Logger.log("Error: Bouncer was not started. Failed to find set port number")
+        end
+    end
+    
+    def stop_listener
+        @socket.close
+        @listener.kill unless @listener.nil?
+        @listener = nil
+        @to_server.clear
+        @processor.kill if !@processor.nil? && @processor.alive?
+        @processor = nil
+    end
+    
+    def start_processor
+        @processor.kill if !@processor.nil? && @processor.alive?
+        @processor = Thread.new do
+        begin
+            while(@listener) do
+                info = @to_server.pop
+                Logger.log("Processing message: #{info[:message]}")
+                if(info[:message] =~ /^USER\s/i)
+                    initialize_connection(info[:socket])
+                else
+                    @pipeline << Messages::Outgoing::Raw.new(info[:message])
+                end
+            end
+        rescue Object => boom
+            Logger.log("BOUNCER ERROR: #{boom}")
+            unless(@clients.empty?)
+                @clients.each do |socket|
+                    socket[:connection].close
+                    @clients.delete(socket)
+                end
+            end
+        end
+        end
+    end
+    
+    def listening?
+        return !@listener.nil?
+    end
+    
+    def initialize_connection(connection)
+        # send channel info and such to client
+        connection.puts(":localhost 001 #{me.nick} :Welcome to the network #{me.source}\n")
+        Models::Channel.filter(:parked => true).each do |channel|
+            connection.puts(":#{me.source} JOIN :#{channel.name}\n")
+        end
+    end
+    
+end

data/data/mod_spox/extras/Karma.rb

@@ -5,9 +5,19 @@ class Karma < ModSpox::Plugin
     def initialize(pipeline)
         super(pipeline)
         Datatype::Karma.create_table unless Datatype::Karma.table_exists?
+        Datatype::Alias.create_table unless Datatype::Alias.table_exists?
+        alias_group = Models::Group.find_or_create(:name => 'alias')
         Models::Signature.find_or_create(:signature => 'karma (\S+)', :plugin => name, :method => 'score', :description => 'Returns karma for given thing').params = [:thing]
         Models::Signature.find_or_create(:signature => 'karma reset (\S+)', :plugin => name, :method => 'reset',
             :group_id => Models::Group.filter(:name => 'admin').first.pk, :description => 'Reset a karma score').params = [:thing]
+        Models::Signature.find_or_create(:signature => 'karma alias (\S+) (\S+)', :plugin => name, :method => 'aka',
+            :group_id => alias_group.pk, :description => 'Alias a karma object to another karma object').params = [:thing, :thang]
+        Models::Signature.find_or_create(:signature => 'karma dealias (\S+) (\S+)', :plugin => name, :method => 'dealias',
+            :group_id => alias_group.pk, :description => 'Remove a karma alias').params = [:thing, :otherthing]
+        Models::Signature.find_or_create(:signature => 'karma aliases (\S+)', :plugin => name, :method => 'show_aliases',
+            :description => 'Show all aliases for given thing').params = [:thing]
+        Models::Signature.find_or_create(:signature => 'karma fight (\S+) (\S+)', :plugin => name, :method => 'fight',
+            :description => 'Make two karma objects fight').params = [:thing, :thang]
         @pipeline.hook(self, :check, :Incoming_Privmsg)
         @thing_maxlen = 32
         @karma_regex = /(\(.{1,#@thing_maxlen}?\)|\S{1,#@thing_maxlen})([+-]{2})(?:\s|$)/
@@ -20,18 +30,26 @@ class Karma < ModSpox::Plugin
                 thing.downcase!
                 thing = thing[1..-2] if thing[0..0] == '(' && thing[-1..1] == ')'
                 adj = adj == '++' ? +1 : -1
+                things = [thing]
                 karma = Datatype::Karma.find_or_create(:thing => thing, :channel_id => message.target.pk)
-                karma.update_with_params(:score => karma.score + adj)
+                Datatype::Alias.get_aliases(karma.pk).each do |id|
+                    things << Datatype::Karma[id].thing.downcase
+                end
+                if(things.include?(message.source.nick.downcase))
+                    adj = -1
+                end
+                karma = Datatype::Karma.find_or_create(:thing => thing, :channel_id => message.target.pk)
+                karma.score = karma.score + adj
+                karma.save
             end
         end
     end
     
     def score(message, params)
-        params[:thing].downcase!
         return unless message.is_public?
-        karma = Datatype::Karma.filter(:thing => params[:thing], :channel_id => message.target.pk).first
+        karma = Datatype::Karma.filter(:thing => params[:thing].downcase, :channel_id => message.target.pk).first
         if(karma)
-            @pipeline << Privmsg.new(message.replyto, "Karma for \2#{karma.thing}\2 is #{karma.score}")
+            @pipeline << Privmsg.new(message.replyto, "Karma for \2#{params[:thing]}\2 is #{Datatype::Alias.score_object(karma.pk)}")
         else
             @pipeline << Privmsg.new(message.replyto, "\2Error:\2 #{params[:thing]} has no karma")
         end
@@ -48,19 +66,128 @@ class Karma < ModSpox::Plugin
             @pipeline << Privmsg.new(message.replyto, "\2Error:\2 #{params[:thing]} has no karma")
         end        
     end
+    
+    def fight(message, params)
+        thing = Datatype::Karma.find_or_create(:thing => params[:thing].downcase)
+        thang = Datatype::Karma.find_or_create(:thing => params[:thang].downcase)
+        thing_score = Datatype::Alias.score_object(thing.pk)
+        thang_score = Datatype::Alias.score_object(thang.pk)
+        winner = thing_score > thang_score ? params[:thing] : params[:thang]
+        loser = thing_score > thang_score ? params[:thang] : params[:thing]
+        distance = (thing_score - thang_score).abs
+        reply message.replyto, "\2KARMA FIGHT RESULTS:\2 \2#{winner}\2 has beaten \2#{loser}\2 by a #{distance} point lead"
+    end
+    
+    def aka(message, params)
+        thing = Datatype::Karma.find_or_create(:thing => params[:thing].downcase, :channel_id => message.target.pk)
+        thang = Datatype::Karma.find_or_create(:thing => params[:thang].downcase, :channel_id => message.target.pk)
+        if(Datatype::Alias.filter('(thing_id = ? AND aka_id = ?) OR (thing_id = ? AND aka_id = ?)', thing.pk, thang.pk, thang.pk, thing.pk).first)
+            reply message.replyto, "\2Error:\2 #{params[:thing]} is already aliased to #{params[:thang]}"
+        else
+            Datatype::Alias.find_or_create(:thing_id => thing.pk, :aka_id => thang.pk)
+            reply message.replyto, "\2Karma Alias:\2 #{params[:thing]} is now aliased to #{params[:thang]}"
+        end
+    end
+     
+    def dealias(message, params)
+        thing = Datatype::Karma.filter(:thing => params[:thing].downcase, :channel_id => message.target.pk).first
+        otherthing = Datatype::Karma.filter(:thing => params[:otherthing].downcase, :channel_id => message.target.pk).first
+        if(thing && otherthing)
+            set = Datatype::Alias.filter('(thing_id = ? AND aka_id = ?) OR (thing_id = ? AND aka_id = ?)', thing.pk, otherthing.pk, otherthing.pk, thing.pk)
+            if(set.size < 1)
+                reply message.replyto, "\2Error:\2 No alias found between #{params[:thing]} and #{params[:otherthing]}"
+            else
+                set.destroy
+                reply message.replyto, "#{params[:thing]} has been successfully dealiased from #{params[:otherthing]}"
+            end
+        else
+            reply message.replyto, "\2Error:\2 No alias found between #{params[:thing]} and #{params[:otherthing]}"
+        end
+    end
+    
+    def show_aliases(message, params)
+        thing = Datatype::Karma.filter(:thing => params[:thing].downcase, :channel_id => message.target.pk).first
+        if(thing)
+            things = []
+            Datatype::Alias.get_aliases(thing.pk).each do |id|
+                things << Datatype::Karma[id].thing
+            end
+            if(things.empty?)
+                reply message.replyto, "#{params[:thing]} is not currently aliased"
+            else
+                reply message.replyto, "#{params[:thing]} is currently aliased to: #{things.join(', ')}"
+            end
+        else
+            reply message.replyto, "\2Error:\2 #{params[:thing]} has never been used and has no aliases"
+        end
+    end
 
     module Datatype
         class Karma < Sequel::Model
             set_schema do
                 primary_key :id
-                text :thing, :null => false, :unique => true
+                text :thing, :null => false
                 integer :score, :null => false, :default => 0
                 foreign_key :channel_id, :table => :channels
+                index [:thing, :channel_id], :unique => true
             end
             
             def channel
                 ModSpox::Models::Channel[channel_id]
             end
         end
+        class Alias < Sequel::Model
+            set_schema do
+                primary_key :id
+                foreign_key :thing_id, :null => false
+                foreign_key :aka_id, :null => false
+            end
+            
+            def thing
+                Karma[thing_id]
+            end
+            
+            def aka
+                Karma[aka_id]
+            end
+            
+            def Alias.score_object(object_id)
+                Alias.create_lock unless class_variable_defined?(:@@lock)
+                @@objects = []
+                score = 0
+                @@lock.synchronize do
+                    score += Alias.sum_objects(object_id)
+                end
+                return score
+            end
+            
+            def Alias.get_aliases(object_id)
+                Alias.score_object(object_id)
+                objs = @@objects.dup
+                objs.delete(object_id)
+                return objs
+            end
+            
+            private
+            
+            def Alias.sum_objects(object_id)
+                return 0 if @@objects.include?(object_id)
+                @@objects << object_id
+                object = Karma[object_id]
+                score = object ? object.score : 0
+                Alias.filter(:thing_id => object_id).each do |ali|
+                    score += Alias.sum_objects(ali.aka.pk)
+                end
+                Alias.filter(:aka_id => object_id).each do |ali|
+                    score += Alias.sum_objects(ali.thing.pk)
+                end
+                return score
+            end
+            
+            def Alias.create_lock
+                @@lock = Mutex.new
+            end
+            
+        end
     end
 end

data/data/mod_spox/extras/PhpCli.rb

@@ -24,8 +24,13 @@ class PhpCli < ModSpox::Plugin
             :description => 'Add or remove channel from allowing PHP command').params = [:action]
         Signature.find_or_create(:signature => 'php (?!on|off)(.+)', :plugin => name, :method => 'execute_php', :group_id => php.pk,
             :description => 'Execute PHP code').params = [:code]
-        Setting[:phpcli] = '' if Setting[:phpcli].nil?
-        @channels = Setting[:phpcli].split('|')
+        @channels = Setting.find(:name => 'phpcli')
+        if(@channels.nil?)
+            Logger.log("WE ARE NIL PEOPLE")
+            @channels = []
+        else
+            @channels = @channels.value
+        end
     end
     
     def set_channel(message, params)
@@ -33,7 +38,9 @@ class PhpCli < ModSpox::Plugin
         if(params[:action] == 'on')
             unless(@channels.include?(message.target.pk))
                 @channels << message.target.pk
-                Setting[:phpcli] = @channels.join('|')
+                tmp = Setting.find_or_create(:name => 'phpcli')
+                tmp.value = @channels
+                tmp.save
             end
             reply message.replyto, 'PHP command now active'
         else
@@ -41,7 +48,9 @@ class PhpCli < ModSpox::Plugin
                 reply message.replyto, 'PHP command is not currently active in this channel'
             else
                 @channels.delete(message.target.pk)
-                Setting[:phpcli] = @channels.join('|')
+                tmp = Setting.find_or_create(:name => 'phpcli')
+                tmp.value = @channels
+                tmp.save
                 reply message.replyto, 'PHP command is now disabled'
             end
         end

data/data/mod_spox/extras/PhpFuncLookup.rb

@@ -219,8 +219,12 @@ class PhpFuncLookup < ModSpox::Plugin
             end
         end
         matches.sort!
-        output = ["Lots of matching functions. Truncating list to 20 results."]
-        output << matches.values_at(0..19).join(', ')
+        output = matches.size > 20 ? ["Lots of matching functions. Truncating list to 20 results."] : []
+        if(matches.empty?)
+            output = "\2Error:\2 No matches found"
+        else
+            output << matches.values_at(0..19).join(', ')
+        end
         reply m.replyto, output
     end
     

data/data/mod_spox/extras/Roulette.rb

@@ -187,6 +187,7 @@ class Roulette < ModSpox::Plugin
             rescue Banner::NotOperator => boom
                 reply(channel, "#{nick.nick}: *BANG*")
             rescue Object => boom
+                reply(channel, "#{nick.nick}: *BANG*")
                 Logger.log("Error: Roulette ban generated an unexpected error: #{boom}")
             end
         else
@@ -200,7 +201,7 @@ class Roulette < ModSpox::Plugin
         @pipeline << Messages::Internal::PluginRequest.new(self, 'Banner') if @banner.nil?
         game = Game.filter('shots > ?', 0).filter('channel_id = ?', channel.pk).first
         unless(game)
-            chamber = rand(5) + 1
+            chamber = rand(6) + 1
             game = Game.new(:chamber => chamber, :shots => chamber, :channel_id => channel.pk)
             game.save
         end

data/data/mod_spox/plugins/Authenticator.rb

@@ -9,7 +9,7 @@ class Authenticator < ModSpox::Plugin
         Models::Signature.find_or_create(:signature => 'auth mask add (\S+) (\S+)', :plugin => name, :method => 'add_mask',
             :group_id => group.pk, :description => 'Add authentication mask and set initial group').params = [:mask, :group]
         Models::Signature.find_or_create(:signature => 'auth mask set (\d+) (.+)', :plugin => name, :method => 'set_mask_groups',
-            :group_id => group.pk, :description => 'Set groups for the given mask').params = [:id, :group_ids]
+            :group_id => group.pk, :description => 'Set groups for the given mask').params = [:id, :groups]
         Models::Signature.find_or_create(:signature => 'auth mask unset (\d+) (.+)', :plugin => name, :method => 'del_mask_groups',
             :group_id => group.pk, :description => 'Remove groups for the given mask').params = [:id, :groups]
         Models::Signature.find_or_create(:signature => 'auth mask remove (\d+)', :plugin => name, :method => 'remove_mask',

data/data/mod_spox/plugins/Helper.rb

@@ -20,15 +20,17 @@ class Helper < ModSpox::Plugin
     def plugin_help(message, params)
         sigs = Signature.filter(:plugin => params[:plugin])
         if(sigs.count > 0)
-            reply message.source, "Available triggers for plugin: \2#{params[:plugin]}\2"
+            output = []
+            output << "Available triggers for plugin: \2#{params[:plugin]}\2"
             sigs.each do |sig|
-                output = []
-                output << "\2Pattern:\2 #{sig.signature}"
-                output << "\2Parameters:\2 [#{sig.params.join(' | ')}]" if sig.params
-                output << "\2Auth Group:\2 #{Group[sig.group_id].name}" if sig.group_id
-                output << "\2Description:\2 #{sig.description}" if sig.description
-                reply message.source, output.join(' ')
+                help = []
+                help << "\2Pattern:\2 #{sig.signature}"
+                help << "\2Parameters:\2 [#{sig.params.join(' | ')}]" if sig.params
+                help << "\2Auth Group:\2 #{Group[sig.group_id].name}" if sig.group_id
+                help << "\2Description:\2 #{sig.description}" if sig.description
+                output << help.join(' ')
             end
+            reply message.source, output
         else
             reply message.replyto, "\2Error:\2 No triggers found for plugin named: #{params[:plugin]}"
         end

data/lib/mod_spox/Bot.rb

@@ -286,13 +286,15 @@ module ModSpox
             target = message.target.nick if message.target.is_a?(Models::Nick)
             target = message.target unless target
             messages = message.message.is_a?(Array) ? message.message : [message.message]
-            messages.each do |content|
-                while(content.size > 450)
-                    output = content[0..449]
-                    content.slice!(0, 449) #(450, content.size)
-                    @socket << "PRIVMSG #{target} :#{message.is_action? ? "\cAACTION #{output}\cA" : output}"
+            messages.each do |part|
+                part.split("\n").each do |content|
+                    while(content.size > 450)
+                        output = content[0..450]
+                        content.slice!(0, 450) #(450, content.size)
+                        @socket << "PRIVMSG #{target} :#{message.is_action? ? "\cAACTION #{output}\cA" : output}"
+                    end
+                    @socket << "PRIVMSG #{target} :#{message.is_action? ? "\cAACTION #{content}\cA" : content}"
                 end
-                @socket << "PRIVMSG #{target} :#{message.is_action? ? "\cAACTION #{content}\cA" : content}"
             end
         end
 

data/lib/mod_spox/ConfigurationWizard.rb

@@ -1,9 +1,7 @@
 ['etc', 
  'mod_spox/Database',
  'mod_spox/BotConfig',
- 'mod_spox/BaseConfig'
- 'mod_spox/models/Models',
- 'mod_spox/Helpers'].each{|f|require f}
+ 'mod_spox/BaseConfig'].each{|f|require f}
 
 
 module ModSpox
@@ -75,6 +73,8 @@ module ModSpox
             }
             config.write_configuration
             initialize_bot
+            require  'mod_spox/models/Models'
+            require 'mod_spox/Helpers'
             create_databases
             #Migrators.constants.each{|m| Migrators.const_get(m).apply(Database.db, :up)}
             @config.each{|value|
@@ -87,7 +87,7 @@ module ModSpox
             a.password = find(:admin_password)
             a.save
             t = Models::Trigger.find_or_create(:trigger => find(:trigger))
-            t.active = true
+            t.update_with_params(:active => true)
             t.save
         end
         
@@ -164,7 +164,7 @@ module ModSpox
                     Database.db << "CREATE TABLE nick_modes (id serial not null primary key, mode varchar(255) not null, nick_id integer not null references nicks, channel_id integer references channels, unique (nick_id, channel_id))"
                     Database.db << "CREATE TABLE servers (id serial not null primary key, host varchar(255) not null, port integer not null default 6667, priority integer not null default 0, connected boolean not null default false, unique (host, port))"
                     Database.db << "CREATE TABLE signatures (id serial not null primary key, signature varchar(255) not null, params varchar(255), group_id integer default null references groups, method varchar(255) not null, plugin varchar(255) not null, description varchar(255), requirement varchar(255) default 'both' not null)"
-                    Database.db << "CREATE TABLE settings (id serial not null primary key, name varchar(255) unique not null, value varchar(255))"
+                    Database.db << "CREATE TABLE settings (id serial not null primary key, name varchar(255) unique not null, value text)"
                     Database.db << "CREATE TABLE triggers (id serial not null primary key, trigger varchar(255) unique not null, active boolean not null default false)"
                     Database.db << "CREATE TABLE auth_groups (auth_id integer not null references auths, group_id integer not null references groups, primary key (auth_id, group_id))"
                 when :sqlite

data/lib/mod_spox/Pipeline.rb

@@ -153,10 +153,11 @@ module ModSpox
         def parse(message)
             return unless message.kind_of?(Messages::Incoming::Privmsg) || message.kind_of?(Messages::Incoming::Notice)
             trigger = nil
-            @triggers.each{|t| trigger = t if message.message =~ /^#{t}/}
+            @triggers.each{|t| trigger = t if message.message =~ /^#{Regexp.escape(t)}/}
             if(!trigger.nil? || message.addressed?)
+                return if !trigger.nil? && message.message.length == trigger.length
                 Logger.log("Message has matched against a known trigger", 15)
-                c = message.addressed? ? message.message[0].chr.downcase : message.message[1].chr.downcase
+                c = (message.addressed? && trigger.nil?) ? message.message[0].chr.downcase : message.message[trigger.length].chr.downcase
                 if(c =~ /^[a-z]$/)
                     type = c.to_sym
                 elsif(c =~ /^[0-9]$/)
@@ -167,7 +168,8 @@ module ModSpox
                 return unless @signatures[type]
                 @signatures[type].each do |sig|
                     Logger.log("Matching against: #{trigger}#{sig.signature}")
-                    res = message.message.scan(/^#{trigger}#{sig.signature}$/)
+                    esc_trig = trigger.nil? ? '' : Regexp.escape(trigger)
+                    res = message.message.scan(/^#{esc_trig}#{sig.signature}$/)
                     if(res.size > 0)
                         next unless message.source.auth_groups.include?(sig.group) || message.source.auth_groups.include?(@admin) ||sig.group.nil?
                         next if sig.requirement == 'private' && message.is_public?

data/lib/mod_spox/PluginManager.rb

@@ -55,7 +55,11 @@ module ModSpox
         def load_plugin(message)
             begin
                 path = !message.name ? "#{BotConfig[:userpluginpath]}/#{message.path.gsub(/^.+\//, '')}" : "#{BotConfig[:userpluginpath]}/#{message.name}"
-                FileUtils.copy(message.path, path)
+                begin
+                    File.symlink(message.path, path)
+                rescue NotImplementedError => boom
+                    FileUtils.copy(message.path, path)
+                end
                 do_load(path)
                 @pipeline << Messages::Internal::PluginLoadResponse.new(message.requester, true)
                 Logger.log("Loaded new plugin: #{message.path}", 10)
@@ -71,10 +75,12 @@ module ModSpox
         def unload_plugin(message)
             begin
                 do_unload(message.path)
-                unless(message.name.nil?)
-                    FileUtils.copy(message.path, "#{BotConfig[:userpluginpath]}/#{message.name}")
+                unless(File.symlink?(message.path))
+                    unless(message.name.nil?)
+                        FileUtils.copy(message.path, "#{BotConfig[:userpluginpath]}/#{message.name}")
+                    end
                 end
-                FileUtils.remove_file(message.path)
+                File.delete(message.path)
                 @pipeline << Messages::Internal::PluginUnloadResponse.new(message.requester, true)
                 Logger.log("Unloaded plugin: #{message.path}", 10)
             rescue Object => boom
@@ -124,7 +130,7 @@ module ModSpox
         # Destroys plugins
         def unload_plugins
             @plugins.each_pair do |sym, holder|
-                holder.plugin.destroy
+                holder.plugin.destroy unless holder.plugin.nil?
                 @pipeline.unhook_plugin(holder.plugin)
             end
             Models::Signature.destroy_all

data/lib/mod_spox/handlers/Join.rb

@@ -10,25 +10,12 @@ module ModSpox
                     source = $1
                     chan = $2
                     if(source =~ /^(.+?)!(.+?)@(.+)$/)
-                        do_save = false
                         nick = find_model($1)
-                        unless(nick.username == $2)
-                            nick.username == $2
-                            do_save = true
-                        end
-                        unless(nick.address == $3)
-                            nick.address = $3
-                            do_save = true
-                        end
-                        unless(nick.source == source)
-                            nick.source = source
-                            do_save = true
-                        end
-                        unless(nick.visible == true)
-                            nick.visible = true
-                            do_save = true
-                        end
-                        nick.save if do_save
+                        nick.username == $2
+                        nick.address = $3
+                        nick.source = source
+                        nick.visible = true
+                        nick.save_changes
                         channel = find_model(chan)
                         channel.nick_add(nick)
                         return Messages::Incoming::Join.new(string, channel, nick)

data/lib/mod_spox/handlers/Names.rb

@@ -29,7 +29,7 @@ module ModSpox
                     nicks = Array.new
                     ops = Array.new
                     voice = Array.new
-                    raw = @raw[chan].join(' ')
+                    raw = @raw[chan]
                     @names[chan].each{|n|
                         nick = Models::Nick.find_or_create(:nick => n.gsub(/^[@+]/, ''))
                         nicks << nick

data/lib/mod_spox/handlers/Privmsg.rb

@@ -13,20 +13,10 @@ module ModSpox
                     base_source = $1
                     source = find_model(base_source.gsub(/!.+$/, ''))
                     if(base_source =~ /!(.+)@(.+)$/)
-                        do_save = false
-                        unless(source.username == $1)
-                            source.username == $1
-                            do_save = true
-                        end
-                        unless(source.address == $2)
-                            source.address = $2
-                            do_save = true
-                        end
-                        unless(source.source == base_source)
-                            source.source = base_source
-                            do_save = true
-                        end
-                        source.save if do_save
+                        source.username == $1
+                        source.address = $2
+                        source.source = base_source
+                        source.save_changes
                     end
                     Models::NickChannel.find_or_create(:channel_id => target.pk, :nick_id => source.pk) if target.is_a?(ModSpox::Models::Channel)
                     return Messages::Incoming::Privmsg.new(string, source, target, message)

data/lib/mod_spox/handlers/Who.rb

@@ -9,6 +9,8 @@ module ModSpox
                 @raw_cache = Hash.new
             end
             def process(string)
+            # :not.configured 352 mod_spox #foobar ~mod_spox 192.168.0.25 not.configured mod_spox H :0 mod_spox IRC bot
+            # :not.configured 352 mod_spox * ~mod_spox 192.168.0.25 not.configured mod_spox H :0 mod_spox IRC bot
                 if(string =~ /#{RPL_WHOREPLY}\s\S+\s(\S+|\*|\*\s\S+)\s(\S+)\s(\S+)\s(\S+)\s(\S+)\s(\S+)\s:(\d)\s(.+)$/)
                     # Items matched are as follows:
                     # 1: location
@@ -19,9 +21,7 @@ module ModSpox
                     # 6: info
                     # 7: hops
                     # 8: realname
-                    location = $1 unless $1.include?('*')
-                    location = $5 if $5 == '*'
-                    location = $1.gsub(/\*\s/, '') if location.include?('* ')
+                    location = $1 == '*' ? nil : $1
                     info = $6
                     nick = find_model($5)
                     nick.username = $2
@@ -30,11 +30,12 @@ module ModSpox
                     nick.connected_to = $4
                     nick.away = info =~ /G/ ? true : false
                     nick.save
-                    @cache[location] = Array.new unless @cache[location]
-                    @cache[location] << nick
-                    @raw_cache[location] = Array.new unless @raw_cache[location]
-                    @raw_cache[location] << string
-                    if(location[0].chr !~ /[A-Za-z]/)
+                    key = location.nil? ? nick.nick : location
+                    @cache[key] = Array.new unless @cache[location]
+                    @cache[key] << nick
+                    @raw_cache[key] = Array.new unless @raw_cache[location]
+                    @raw_cache[key] << string
+                    unless(location.nil?)
                         channel = find_model(location)
                         Models::NickChannel.find_or_create(:channel_id => channel.pk, :nick_id => nick.pk)
                         if(info.include?('+'))

data/lib/mod_spox/models/Auth.rb

@@ -8,12 +8,20 @@ module ModSpox
             # mask:: Mask to authenticate source against
             # authed:: Nick has authenticated
         class Auth < Sequel::Model(:auths)
+        
+            before_destroy :clear_auth_groups
+            
+            # Clear relations before destroying
+            def clear_auth_groups
+                AuthGroup.filter(:auth_id => pk).destroy
+            end
             
             # Nick associated with this Auth
             def nick
                 Nick[nick_id]
             end
             
+            # Is nick identified with services
             def services
                 s = values[:services]
                 if(s == 0 || s == '0' || !s)

data/lib/mod_spox/models/Config.rb

@@ -23,7 +23,7 @@ module ModSpox
             def self.[]=(key, val)
                 key = key.to_s if key.is_a?(Symbol)
                 model = Config.find_or_create(:name => key)
-                model.value = val
+                model.update_with_params(:value => val)
                 model.save
             end
         end

data/lib/mod_spox/models/Setting.rb

@@ -9,7 +9,7 @@ module ModSpox
         class Setting < Sequel::Model(:settings)
             
             def value=(val)
-                update_values(:value => [Marshal.dump(val)].pack('m'))
+                update_values(:value => [Marshal.dump(val.dup)].pack('m'))
             end
             
             def value
@@ -31,7 +31,7 @@ module ModSpox
             def self.[]=(key, val)
                 key = key.to_s if key.is_a?(Symbol)
                 model = Setting.find_or_create(:name => key)
-                model.update_with_params(:value => [Marshal.dump(val)].pack('m'))
+                model.update_with_params(:value => [Marshal.dump(val.dup)].pack('m'))
             end
         end
     end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: mod_spox
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
-date: 2008-06-12 00:00:00 -07:00
+  version: 0.1.0
+date: 2008-07-11 00:00:00 -07:00
 summary: The mod_spox IRC robot
 require_paths: 
 - lib
@@ -46,17 +46,6 @@ files:
 - lib/mod_spox/models/NickMode.rb
 - lib/mod_spox/models/Group.rb
 - lib/mod_spox/models/Models.rb
-- lib/mod_spox/migration/001_create_channel_modes.rb
-- lib/mod_spox/migration/001_create_nick_modes.rb
-- lib/mod_spox/migration/001_create_nick_channels.rb
-- lib/mod_spox/migration/001_create_settings.rb
-- lib/mod_spox/migration/001_create_auths.rb
-- lib/mod_spox/migration/001_create_signatures.rb
-- lib/mod_spox/migration/001_create_config.rb
-- lib/mod_spox/migration/001_create_triggers.rb
-- lib/mod_spox/migration/001_create_nicks.rb
-- lib/mod_spox/migration/001_create_channel.rb
-- lib/mod_spox/migration/001_create_servers.rb
 - lib/mod_spox/handlers/LuserClient.rb
 - lib/mod_spox/handlers/Handler.rb
 - lib/mod_spox/handlers/Topic.rb
@@ -249,6 +238,7 @@ files:
 - data/mod_spox/extras/Logger.rb
 - data/mod_spox/extras/Topten.rb
 - data/mod_spox/extras/AutoMode.rb
+- data/mod_spox/extras/Bouncer.rb
 test_files: []
 
 rdoc_options: []

data/lib/mod_spox/migration/001_create_auths.rb

@@ -1,13 +0,0 @@
-module ModSpox
-    module Migrators
-        class CreateAuths < Sequel::Migration
-            def up
-                Models::Auth.create_table unless Models::Auth.table_exists?
-            end
-            
-            def down
-                Models::Auth.drop_table
-            end
-        end
-    end
-end

data/lib/mod_spox/migration/001_create_channel.rb

@@ -1,13 +0,0 @@
-module ModSpox
-    module Migrators
-        class CreateChannels < Sequel::Migration
-            def up
-                Models::Channel.create_table unless Models::Channel.table_exists?
-            end
-            
-            def down
-                Models::Channel.drop_table
-            end
-        end
-    end
-end

data/lib/mod_spox/migration/001_create_channel_modes.rb

@@ -1,13 +0,0 @@
-module ModSpox
-    module Migrators
-        class CreateChannelModes < Sequel::Migration
-            def up
-                Models::ChannelMode.create_table unless Models::ChannelMode.table_exists?
-            end
-            
-            def down
-                Models::ChannelMode.drop_table
-            end
-        end
-    end
-end

data/lib/mod_spox/migration/001_create_config.rb

@@ -1,13 +0,0 @@
-module ModSpox
-    module Migrators
-        class CreateConfigs < Sequel::Migration
-            def up
-                Models::Config.create_table unless Models::Config.table_exists?
-            end
-            
-            def down
-                Models::Config.drop_table
-            end
-        end
-    end
-end

data/lib/mod_spox/migration/001_create_nick_channels.rb

@@ -1,13 +0,0 @@
-module ModSpox
-    module Migrators
-        class CreateNickChannels < Sequel::Migration
-            def up
-                Models::NickChannel.create_table unless Models::NickChannel.table_exists?
-            end
-            
-            def down
-                Models::NickChannel.drop_table
-            end
-        end
-    end
-end

data/lib/mod_spox/migration/001_create_nick_modes.rb

@@ -1,13 +0,0 @@
-module ModSpox
-    module Migrators
-        class CreateNickModes < Sequel::Migration
-            def up
-                Models::NickMode.create_table unless Models::NickMode.table_exists?
-            end
-            
-            def down
-                Models::NickMode.drop_table
-            end
-        end
-    end
-end

data/lib/mod_spox/migration/001_create_nicks.rb

@@ -1,13 +0,0 @@
-module ModSpox
-    module Migrators
-        class CreateNicks < Sequel::Migration
-            def up
-                Models::Nick.create_table unless Models::Nick.table_exists?
-            end
-            
-            def down
-                Models::Nick.drop_table
-            end
-        end
-    end
-end

data/lib/mod_spox/migration/001_create_servers.rb

@@ -1,13 +0,0 @@
-module ModSpox
-    module Migrators
-        class CreateServers < Sequel::Migration
-            def up
-                Models::Server.create_table unless Models::Server.table_exists?
-            end
-            
-            def down
-                Models::Server.drop_table
-            end
-        end
-    end
-end

data/lib/mod_spox/migration/001_create_settings.rb

@@ -1,13 +0,0 @@
-module ModSpox
-    module Migrators
-        class CreateSettings < Sequel::Migration
-            def up
-                Models::Setting.create_table unless Models::Setting.table_exists?
-            end
-            
-            def down
-                Models::Setting.drop_table
-            end
-        end
-    end
-end

data/lib/mod_spox/migration/001_create_signatures.rb

@@ -1,13 +0,0 @@
-module ModSpox
-    module Migrators
-        class CreateSignatures < Sequel::Migration
-            def up
-                Models::Signature.create_table unless Models::Signature.table_exists?
-            end
-            
-            def down
-                Models::Signature.drop_table
-            end
-        end
-    end
-end

data/lib/mod_spox/migration/001_create_triggers.rb

@@ -1,13 +0,0 @@
-module ModSpox
-    module Migrators
-        class CreateTriggers < Sequel::Migration
-            def up
-                Models::Trigger.create_table unless Models::Trigger.table_exists?
-            end
-            
-            def down
-                Models::Trigger.drop_table
-            end
-        end
-    end
-end