mod_spox 0.2.0 → 0.3.0

data/lib/mod_spox/handlers/Part.rb

@@ -5,15 +5,32 @@ module ModSpox
             def initialize(handlers)
                 handlers[:PART] = self
             end
+
+            # :mod_spox!~mod_spox@host PART #m :
+            # :guy2net!~guy2net@92-239-14-145.cable.ubr15.haye.blueyonder.co.uk PART #php
+            
             def process(string)
-                if(string =~ /^:(\S+) PART (\S+) (.*)$/)
-                    channel = find_model($2)
-                    nick = find_model($1.gsub(/!.+$/, ''))
-                    channel.nick_remove(nick)
-                    return Messages::Incoming::Part.new(string, channel, nick, $3)
-                else
-                    Logger.warn('Failed to parse PART message')
-                    return nil
+                string = string.dup
+                orig = string.dup
+                begin
+                    string.slice!(0)
+                    nick = find_model(string.slice!(0..string.index('!')-1))
+                    2.times{ string.slice!(0..string.index(' ')) }
+                    unless(string.index(' ').nil?)
+                        channel = find_model(string.slice!(0..string.index(' ')-1))
+                        string.slice!(0..string.index(':'))
+                    else
+                        channel = find_model(string)
+                        string = ''
+                    end
+                    channel.remove_nick(nick)
+                    nick.visible = false if nick.channels.empty?
+                    nick.save_changes
+                    channel.save_changes
+                    return Messages::Incoming::Part.new(orig, channel, nick, string)
+                rescue Object => boom
+                    Logger.error("Failed to parse PART message: #{orig}")
+                    raise boom
                 end
             end
         end

data/lib/mod_spox/handlers/Ping.rb

@@ -6,11 +6,17 @@ module ModSpox
                 handlers[:PING] = self
             end
             def process(string)
-                if(string =~ /^PING\s:(.+)$/)
-                    return Messages::Incoming::Ping.new(string, $1, nil)
-                else
-                    Logger.warn('Failed to match PING message')
-                    return nil
+                orig = string.dup
+                string = string.dup
+                begin
+                    string.slice!(0) if string[0] == ':'
+                    server = string[0..string.index(' ')-1]
+                    message = string[string.index(':')+1..string.size]
+                    server = message.dup if server == 'PING'
+                    return Messages::Incoming::Ping.new(orig, server, message)
+                rescue Object => boom
+                    Logger.error("Failed to parse PING message: #{string}")
+                    raise boom
                 end
             end
         end

data/lib/mod_spox/handlers/Pong.rb

@@ -6,11 +6,15 @@ module ModSpox
                 handlers[:PONG] = self
             end
             def process(string)
-                if(string =~ /^:\S+\sPONG\s(\S+)\s:(.+)$/)
-                    return Messages::Incoming::Pong.new(string, $1, $2)
-                else
-                    Logger.warn('Failed to parse PONG message')
-                    return nil
+                orig = string.dup
+                string = string.dup
+                begin
+                    a = string.slice!(string.rindex(':')+1, string.size)
+                    string.slice!(-2..string.size)
+                    return Messages::Incoming::Pong.new(orig, string.slice(string.rindex(' ')+1..string.size), a)
+                rescue Object => boom
+                    Logger.error("Failed to parse PONG message: #{orig}")
+                    raise boom
                 end
             end
         end

data/lib/mod_spox/handlers/Privmsg.rb

@@ -5,24 +5,32 @@ module ModSpox
             def initialize(handlers)
                 handlers[:PRIVMSG] = self
             end
-            
+
+            # :spox!~spox@host PRIVMSG #m :foobar
             def process(string)
-                if(string =~ /^:(\S+)\sPRIVMSG\s(\S+)\s:(.+)$/)
-                    message = $3
-                    target = find_model($2)
-                    base_source = $1
-                    source = find_model(base_source.gsub(/!.+$/, ''))
-                    if(base_source =~ /!(.+)@(.+)$/)
-                        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)
-                else
-                    Logger.warn('Failed to match PRIVMSG message')
-                    return nil
+                orig = string.dup
+                string = string.dup
+                begin
+                    string.slice!(0)
+                    base_source = string.slice!(0..string.index(' ')-1)
+                    orig_source = base_source.dup
+                    string.slice!(0..string.index(' ',3))
+                    target = find_model(string.slice!(0..string.index(' ')-1))
+                    string.slice!(0..string.index(':'))
+                    string.strip!
+                    source = find_model(base_source.slice!(0..base_source.index('!')-1))
+                    base_source.slice!(0)
+                    source.username = base_source.slice!(0..base_source.index('@')-1)
+                    base_source.slice!(0)
+                    source.address = base_source.strip
+                    source.source = orig_source
+                    source.save_changes
+                    source.add_channel(target) if target.is_a?(Models::Channel)
+                    return Messages::Incoming::Privmsg.new(orig, source, target, string)
+                rescue Object => boom
+                    Logger.warn("Failed to parse PRIVMSG message: #{orig}")
+                    Logger.warn("Reason for PRIVMSG failure: #{boom}")
+                    raise boom
                 end
             end
         end

data/lib/mod_spox/handlers/Quit.rb

@@ -5,17 +5,22 @@ module ModSpox
             def initialize(handlers)
                 handlers[:QUIT] = self
             end
+
+            #:spox!~spox@host QUIT :Ping timeout
             def process(string)
-                if(string =~ /^:(\S+)\sQUIT\s:(.+)$/)
-                    reason = $2
-                    nick = find_model($1.gsub(/!.+$/, ''))
-                    nick.clear_channels
+                orig = string.dup
+                string = string.dup
+                begin
+                    string.slice!(0)
+                    nick = find_model(string.slice!(0..string.index('!')-1))
+                    string.slice!(0..string.index(':'))
+                    nick.remove_all_channels
                     nick.visible = false
                     nick.save
-                    return Messages::Incoming::Quit.new(string, nick, reason)
-                else
-                    Logger.warn('Failed to parse KICK message')
-                    return nil
+                    return Messages::Incoming::Quit.new(orig, nick, string)
+                rescue Object => boom
+                    Logger.error("Failed to parse QUIT message: #{orig}")
+                    raise boom
                 end
             end
         end

data/lib/mod_spox/handlers/Topic.rb

@@ -8,6 +8,10 @@ module ModSpox
                 handlers[RPL_TOPICINFO] = self
                 @topics = Hash.new
             end
+            
+#:irc.host 332 spox #mod_spox : the topic is here
+#:irc.host 333 spox #mod_spox spox 1232126516
+            
             def process(string)
                 if(string =~ /#{RPL_TOPIC}.+?(\S+)\s:(.+)$/)
                     channel = find_model($1)

data/lib/mod_spox/handlers/Welcome.rb

@@ -5,31 +5,23 @@ module ModSpox
             def initialize(handlers)
                 handlers[RPL_WELCOME] = self
             end
-            
+            # >> :holmes.freenode.net 001 spax :Welcome to the freenode IRC Network spax 
             def process(string)
-                if(string =~ /:(\S+)\s(\S+).+?(\S+)$/)
-                    server = $1
-                    message = $2
-                    userstring = $3
-                    if(userstring =~ /^(.+?)!(.+?)@(.+?)$/)
-                        Models::Nick.filter(:botnick => true).each{|n| n.botnick = false; n.save}
-                        nick = $1
-                        username = $2
-                        hostname = $3
-                        nick = Models::Nick.locate(nick)
-                        nick.botnick = true
-                        nick.username = username
-                        nick.address = hostname
-                        nick.source = userstring
-                        nick.save
-                        return Messages::Incoming::Welcome.new(string, server, message, nick, username, hostname)
-                    else
-                        Logger.warn('Failed to match user string in welcome message')
-                        return nil
-                    end
-                else
-                    Logger.warn('Failed to match welcome message')
-                    return nil
+                parse = string.dup
+                begin
+                    parse.slice!(0)
+                    server = parse.slice!(0..parse.index(' ')-1)
+                    2.times{parse.slice!(0..parse.index(' '))}
+                    nick = parse.slice!(0..parse.index(' ')-1)
+                    parse.slice!(0..parse.index(':'))
+                    nick = Models::Nick.find_or_create(:nick => nick)
+                    nick.botnick = true
+                    nick.visible = true
+                    nick.save
+                    return Messages::Incoming::Welcome.new(string, server, parse, nick, nil, nil)
+                rescue Object => boom
+                    Logger.warn("Failed to parse welcome message: #{string}")
+                    raise boom
                 end
             end
         end

data/lib/mod_spox/handlers/Who.rb

@@ -1,4 +1,4 @@
-['mod_spox/handlers/Handler', 'mod_spox/Monitors'].each{|f|require f}
+['mod_spox/handlers/Handler'].each{|f|require f}
 
 module ModSpox
     module Handlers
@@ -9,56 +9,72 @@ module ModSpox
                 @cache = Hash.new
                 @raw_cache = Hash.new
             end
-            
+            # :host 352 spox #mod_spox ~pizza_ 12.229.112.195 punch.va.us.dal.net pizza_ H@ :5 pizza_
             def process(string)
-                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
-                    # 2: username
-                    # 3: host
-                    # 4: server
-                    # 5: nick
-                    # 6: info
-                    # 7: hops
-                    # 8: realname
-                    location = $1 == '*' ? nil : $1
-                    info = $6
-                    nick = find_model($5)
-                    nick.username = $2
-                    nick.address = $3
-                    nick.real_name = $8
-                    nick.connected_to = $4
-                    nick.away = info =~ /G/ ? true : false
-                    nick.visible = true
-                    nick.save_changes
-                    key = location.nil? ? nick.nick : location
-                    @cache[key] = Array.new unless @cache[key]
-                    @cache[key] << nick
-                    @raw_cache[key] = Array.new unless @raw_cache[key]
-                    @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?('+'))
-                            Models::NickMode.find_or_create(:channel_id => channel.pk, :nick_id => nick.pk, :mode => 'v')
-                        elsif(info.include?('@'))
-                            Models::NickMode.find_or_create(:channel_id => channel.pk, :nick_id => nick.pk, :mode => 'o')
-                        else
-                            Models::NickMode.filter(:channel_id => channel.pk, :nick_id => nick.pk).each{|m| m.destroy}
+                string = string.dup
+                orig = string.dup
+                begin
+                    until(string.slice(0..RPL_WHOREPLY.size-1) == RPL_WHOREPLY || string.slice(0..RPL_ENDOFWHO.size-1) == RPL_ENDOFWHO)
+                        string.slice!(0..string.index(' '))
+                    end
+                    if(string.slice(0..RPL_WHOREPLY.size-1) == RPL_WHOREPLY)
+                        2.times{string.slice!(0..string.index(' '))}
+                        location = string.slice!(0..string.index(' ')-1)
+                        string.slice!(0)
+                        username = string.slice!(0..string.index(' ')-1)
+                        string.slice!(0)
+                        host = string.slice!(0..string.index(' ')-1)
+                        string.slice!(0)
+                        server = string.slice!(0..string.index(' ')-1)
+                        string.slice!(0)
+                        nick = find_model(string.slice!(0..string.index(' ')-1))
+                        string.slice!(0)
+                        info = string.slice!(0..string.index(' ')-1)
+                        string.slice!(0..string.index(':'))
+                        hops = string.slice!(0..string.index(' ')-1)
+                        string.slice!(0)
+                        realname = string
+                        location = nil if location == '*'
+                        nick.username = username
+                        nick.address = location
+                        nick.real_name = realname
+                        nick.connected_to = server
+                        nick.away = !info.index('G').nil?
+                        nick.add_channel(find_model(location)) unless location.nil?
+                        nick.save_changes
+                        key = location.nil? ? nick.nick : location
+                        @cache[key] = Array.new unless @cache[key]
+                        @cache[key] << nick
+                        @raw_cache[key] = Array.new unless @raw_cache[key]
+                        @raw_cache[key] << orig
+                        unless(location.nil?)
+                            channel = find_model(location)
+                            channel.add_nick(nick)
+                            if(info.include?('+'))
+                                m = Models::NickMode.find_or_create(:channel_id => channel.pk, :nick_id => nick.pk)
+                                m.set_mode('v')
+                            elsif(info.include?('@'))
+                                m = Models::NickMode.find_or_create(:channel_id => channel.pk, :nick_id => nick.pk)
+                                m.set_mode('o')
+                            else
+                                m = Models::NickMode.find_or_create(:channel_id => channel.pk, :nick_id => nick.pk)
+                                m.clear_modes
+                            end
                         end
+                        return nil
+                    else
+                        2.times{string.slice!(0..string.index(' '))}
+                        location = string.slice!(0..string.index(' ')-1)
+                        loc = find_model(location)
+                        @raw_cache[location] << orig
+                        message = Messages::Incoming::Who.new(@raw_cache[location].join("\n"), loc, @cache[location])
+                        @raw_cache.delete(location)
+                        @cache.delete(location)
+                        return message
                     end
-                    return nil
-                elsif(string =~ /#{RPL_ENDOFWHO}\s\S+\s(\S+)\s/)
-                    location = $1
-                    loc = find_model(location)
-                    @raw_cache[location] << string
-                    message = Messages::Incoming::Who.new(@raw_cache[location].join("\n"), loc, @cache[location])
-                    @raw_cache.delete(location)
-                    @cache.delete(location)
-                    return message
-                else
-                    Logger.warn('Failed to match RPL_WHO type message')
-                    return nil
+                rescue Object => boom
+                    Logger.error("Failed to match WHO type message: #{orig}")
+                    raise boom
                 end
             end
             

data/lib/mod_spox/handlers/Whois.rb

@@ -15,70 +15,102 @@ module ModSpox
             end
             
             def process(string)
-                if(string =~ /#{RPL_WHOISUSER}\s\S+\s(\S+)\s(\S+)\s(\S+)\s\*\s:(.+)$/)
-                    key = $1
-                    nick = find_model($1)
-                    nick.username = $2
-                    nick.address = $3
-                    nick.real_name = $4
-                    nick.save_changes
-                    @cache[$1] = Messages::Incoming::Whois.new(nick)
-                    @cache[$1].raw_push(string)
-                    return nil
-                elsif(string =~ /#{RPL_WHOISCHANNELS}\s\S+\s(\S+)\s:(.+)$/)
-                    nick = $1
-                    @cache[nick] = Messages::Incoming::Whois.new(find_model(nick)) unless @cache[nick]
-                    @cache[$1].raw_push(string)
-                    $2.split(/\s/).each{|chan|
-                        channel = find_model(chan.gsub(/^[@\+]/, ''))
-                        @cache[nick].channels_push(channel)
-                        if(chan[0].chr == '@')
-                            Models::NickMode.find_or_create(:nick_id => @cache[nick].nick.pk, :mode => 'o', :channel_id => channel.pk)
-                        elsif(chan[0].chr == '+')
-                            Models::NickMode.find_or_create(:nick_id => @cache[nick].nick.pk, :mode => 'v', :channel_id => channel.pk)
+                orig = string.dup
+                string = string.dup
+                begin
+                    until(string.slice(0..string.index(' ')-1) == RPL_WHOISUSER ||
+                            string.slice(0..string.index(' ')-1) == RPL_WHOISSERVER ||
+                            string.slice(0..string.index(' ')-1) == RPL_WHOISOPERATOR ||
+                            string.slice(0..string.index(' ')-1) == RPL_WHOISIDLE ||
+                            string.slice(0..string.index(' ')-1) == RPL_WHOISCHANNELS ||
+                            string.slice(0..string.index(' ')-1) == RPL_WHOISIDENTIFIED ||
+                            string.slice(0..string.index(' ')-1) == RPL_ENDOFWHOIS)
+                        string.slice!(0..string.index(' '))
+                    end
+                    case string.slice!(0..string.index(' ')-1)
+                        when RPL_WHOISUSER
+                            string.slice!(0)
+                            string.slice!(0..string.index(' '))
+                            nick = find_model(string.slice!(0..string.index(' ')-1))
+                            string.slice!(0)
+                            nick.username = string.slice!(0..string.index(' ')-1)
+                            string.slice!(0)
+                            nick.address = string.slice!(0..string.index(' ')-1)
+                            string.slice!(0..string.index(':'))
+                            nick.real_name = string
+                            nick.save_changes
+                            @cache[nick.nick] = Messages::Incoming::Whois.new(nick)
+                            @cache[nick.nick].raw_push(orig)
+                        when RPL_WHOISCHANNELS
+                            2.times{string.slice!(0..string.index(' '))}
+                            nick = find_model(string.slice!(0..string.index(' ')-1))
+                            @cache[nick.nick] = Messages::Incoming::Whois.new(nick) unless @cache[nick.nick]
+                            string.slice!(0..string.index(':'))
+                            string.split.each do |c|
+                                channel = find_model(['@','+'].include?(c.slice(0)) ? c.slice(1..c.size) : c)
+                                channel.add_nick(nick)
+                                @cache[nick.nick].channels_push(channel)
+                                if(c[0].chr == '@')
+                                    m = Models::NickMode.find_or_create(:nick_id => nick.pk, :channel_id => channel.pk)
+                                    m.set_mode('o')
+                                elsif(c[0].chr == '+')
+                                    m = Models::NickMode.find_or_create(:nick_id => nick.pk, :channel_id => channel.pk)
+                                    m.set_mode('v')
+                                else
+                                    m = Models::NickMode.find_or_create(:nick_id => nick.pk, :channel_id => channel.pk)
+                                    m.clear_modes
+                                end
+                            end
+                            @cache[nick.nick].raw_push(orig)
+                        when RPL_WHOISSERVER
+                            2.times{string.slice!(0..string.index(' '))}
+                            nick = find_model(string.slice!(0..string.index(' ')-1))
+                            string.slice!(0)
+                            @cache[nick.nick] = Messages::Incoming::Whois.new(nick) unless @cache[nick.nick]
+                            nick.connected_to = string.slice!(0..string.index(' ')-1)
+                            nick.save_changes
+                            @cache[nick.nick].raw_push(orig)
+                        when RPL_WHOISIDENTIFIED
+                            2.times{string.slice!(0..string.index(' '))}
+                            nick = find_model(string.slice!(0..string.index(' ')-1))
+                            @cache[nick.nick] = Messages::Incoming::Whois.new(nick) unless @cache[nick.nick]
+                            nick.auth.services_identified = true
+                            @cache[nick.nick].raw_push(orig)
+                        when RPL_WHOISIDLE
+                            2.times{string.slice!(0..string.index(' '))}
+                            nick = find_model(string.slice!(0..string.index(' ')-1))
+                            string.slice!(0)
+                            @cache[nick.nick] = Messages::Incoming::Whois.new(nick) unless @cache[nick.nick]
+                            nick.seconds_idle = string.slice!(0..string.index(' ')-1).to_i
+                            string.slice!(0)
+                            nick.connected_at = Time.at(string.slice!(0..string.index(' ')-1).to_i)
+                            nick.save_changes
+                            @cache[nick.nick].raw_push(orig)
+                        when RPL_WHOISOPERATOR
+                            2.times{string.slice!(0..string.index(' '))}
+                            nick = find_model(string.slice!(0..string.index(' ')-1))
+                            string.slice!(0)
+                            @cache[nick.nick] = Messages::Incoming::Whois.new(nick) unless @cache[nick.nick]
+                            @cache[nick.nick].raw_push(orig)
+                        when RPL_ENDOFWHOIS
+                            2.times{string.slice!(0..string.index(' '))}
+                            nick = find_model(string.slice!(0..string.index(' ')-1))
+                            @cache[nick.nick] = Messages::Incoming::Whois.new(nick) unless @cache[nick.nick]
+                            @cache[nick.nick].raw_push(orig)
+                            message = @cache[nick.nick]
+                            message.lock
+                            @cache.delete(nick.nick)
+                            return message
                         else
-                            Models::NickMode.filter(:nick_id => @cache[nick].nick.pk, :channel_id => channel.pk).each{|m| m.destroy}
-                        end
-                    }
-                    return nil
-                elsif(string =~ /#{RPL_WHOISSERVER}\s\S+\s(\S+)\s(\S+)\s:(.+)$/)
-                    nick = $1
-                    @cache[nick] = Messages::Incoming::Whois.new(find_model(nick)) unless @cache[nick]
-                    @cache[nick].nick.connected_to = $2
-                    @cache[nick].raw_push(string)
-                    return nil
-                elsif(string =~ /#{RPL_WHOISIDENTIFIED}\s\S+\s(\S+)\s/)
-                    nick = $1
-                    @cache[nick] = Messages::Incoming::Whois.new(find_model(nick)) unless @cache[nick]
-                    @cache[nick].nick.auth.services_identified = true
-                    @cache[nick].raw_push(string)
-                    return nil
-                elsif(string =~ /#{RPL_WHOISIDLE}\s\S+\s(\S+)\s(\d+)\s(\d+)\s:(.+?),(.+?)/)
-                    nick = $1
-                    @cache[nick] = Messages::Incoming::Whois.new(find_model(nick)) unless @cache[nick]
-                    @cache[nick].nick.seconds_idle = $2.to_i
-                    @cache[nick].nick.connected_at = Time.at($3.to_i)
-                    @cache[nick].raw_push(string)
-                    return nil
-                elsif(string =~ /#{RPL_WHOISOPERATOR}\s\S+\s(\S+)/)
-                    nick = $1
-                    @cache[nick] = Messages::Incoming::Whois.new(find_model(nick)) unless @cache[nick]
-                    @cache[nick].raw_push(string)
-                    return nil
-                elsif(string =~ /#{RPL_ENDOFWHOIS}\s\S+\s(\S+)\s:/)
-                    nick = $1
-                    @cache[nick] = Messages::Incoming::Whois.new(find_model(nick)) unless @cache[nick]
-                    @cache[nick].raw_push(string)
-                    message = @cache[nick]
-                    message.lock
-                    @cache[nick].nick.save
-                    @cache.delete(nick)
-                    return message
-                else
-                    Logger.warn('Failed to parse WHOIS type reply')
+                            Logger.error("Failed to parse WHOIS type reply. Unknown part found: #{orig}")
+                    end
                     return nil
+                rescue Object => boom
+                    Logger.error("Failed to parse WHOIS type reply: #{orig}")
+                    raise boom
                 end
             end
+
         end
     end
 end