mod_spox 0.1.0.1 → 0.2.0

data/lib/mod_spox/handlers/Handler.rb

@@ -4,10 +4,19 @@ module ModSpox
     
         class Handler
         
+            def initialize(handlers)
+            end
+        
             def process(data)
                 raise Exceptions::NotImplemented.new('Method has not been implemented')
             end
             
+            # data:: any expected data
+            # Preprocessing allows for actions to be taken
+            # while messages are still in a synchronized state
+            def preprocess(data)
+            end
+            
             protected
             
             def find_model(string)

data/lib/mod_spox/handlers/Invite.rb

@@ -12,7 +12,7 @@ module ModSpox
                     channel = find_model($3)
                     return Messages::Incoming::Invite.new(string, source, target, channel)
                 else
-                    Logger.log('Failed to parse INVITE message')
+                    Logger.warn('Failed to parse INVITE message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/Join.rb

@@ -20,11 +20,11 @@ module ModSpox
                         channel.nick_add(nick)
                         return Messages::Incoming::Join.new(string, channel, nick)
                     else
-                        Logger.log('Failed to parse source on JOIN message')
+                        Logger.warn('Failed to parse source on JOIN message')
                         return nil
                     end
                 else
-                    Logger.log('Failed to parse JOIN message')
+                    Logger.warn('Failed to parse JOIN message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/Kick.rb

@@ -17,7 +17,7 @@ module ModSpox
                     channel.nick_remove(kickee)
                     return Messages::Incoming::Kick.new(string, channel, kicker, kickee, reason)
                 else
-                    Logger.log('Failed to process KICK message')
+                    Logger.warn('Failed to process KICK message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/LuserChannels.rb

@@ -9,7 +9,7 @@ module ModSpox
                 if(string =~ /(\d+)\s:channels/)
                     return Messages::Incoming::LuserChannels.new(string, $1.to_i)
                 else
-                    Logger.log('Failed to match RPL_LUSERCHANNELS message')
+                    Logger.warn('Failed to match RPL_LUSERCHANNELS message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/LuserOp.rb

@@ -9,7 +9,7 @@ module ModSpox
                 if(string =~ /(\d+) :.*?\s*[oO]perators/)
                     return Messages::Incoming::LuserOp.new(string, $1.to_i)
                 else
-                    Logger.log('Failed to match RPL_LUSEROP message')
+                    Logger.warn('Failed to match RPL_LUSEROP message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/LuserUnknown.rb

@@ -9,7 +9,7 @@ module ModSpox
                 if(string =~ /(\d+) :.*[Uu]nknown/)
                     return Messages::Incoming::LuserUnknown.new(string, $1.to_i)
                 else
-                    Logger.log('Failed to match RPL_LUSERUNKNOWN message')
+                    Logger.warn('Failed to match RPL_LUSERUNKNOWN message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/Mode.rb

@@ -43,10 +43,10 @@ module ModSpox
                         nicks = nicks[0] if nicks.size == 1
                         return Messages::Incoming::Mode.new(string, full_modes, source, nicks, channel)
                     else
-                        Logger.log('Failed to parse MODE message')
+                        Logger.warn('Failed to parse MODE message')
                     end
                 rescue Object => boom
-                    Logger.log("Failed to process MODE message. Reason: #{boom}")
+                    Logger.warn("Failed to process MODE message. Reason: #{boom}")
                 end
                 return nil
             end

data/lib/mod_spox/handlers/MyInfo.rb

@@ -14,7 +14,7 @@ module ModSpox
                     channelmodes = $4
                     return Messages::Incoming::MyInfo.new(string, servername, version, usermodes, channelmodes)
                 else
-                    Logger.log('Failed to match My Info message')
+                    Logger.warn('Failed to match My Info message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/Names.rb

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

data/lib/mod_spox/handlers/Nick.rb

@@ -9,15 +9,32 @@ module ModSpox
                 if(string =~ /^:([^!]+)!\S+\sNICK\s:(.+)$/)
                     old_nick = find_model($1)
                     new_nick = find_model($2)
+                    new_nick.visible = true
+                    old_nick.channels.each do |channel|
+                        new_nick.channel_add(channel)
+                        Models::NickMode.find_or_create(:nick_id => new_nick.pk, :channel_id => channel.pk, :mode => 'o') if old_nick.is_op?(channel)
+                        Models::NickMode.find_or_create(:nick_id => new_nick.pk, :channel_id => channel.pk, :mode => 'v') if old_nick.is_voice?(channel)
+                        Models::NickMode.filter(:nick_id => old_nick.pk, :channel_id => channel.pk).destroy
+                    end
+                    new_nick.username = old_nick.username
+                    new_nick.address = old_nick.address
+                    new_nick.real_name = old_nick.real_name
+                    new_nick.connected_to = old_nick.connected_to
+                    new_nick.away = old_nick.away
+                    new_nick.visible = true
+                    new_nick.save_changes
+                    Models::Nick.transfer_groups(old_nick, new_nick)
+                    old_nick.visible = false
+                    old_nick.clear_channels
                     if(old_nick.botnick == true)
                         old_nick.botnick = false
-                        old_nick.save
                         new_nick.botnick = true
-                        new_nick.save
                     end
+                    new_nick.save
+                    old_nick.save
                     return Messages::Incoming::Nick.new(string, old_nick, new_nick)
                 else
-                    Logger.log('Failed to parse NICK message')
+                    Logger.warn('Failed to parse NICK message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/NickInUse.rb

@@ -3,13 +3,13 @@ module ModSpox
     module Handlers
         class NickInUse < Handler
             def initialize(handlers)
-                handlers[:RPL_NICKNAMEINUSE] = self
+                handlers[ERR_NICKNAMEINUSE] = self
             end
             def process(string)
-                if(string =~ /#{RPL_NICKNAMEINUSE}\s\S+\s(\S+)\s:/)
+                if(string =~ /#{ERR_NICKNAMEINUSE}\s\S+\s(\S+)\s:/)
                     return Messages::Incoming::NickInUse.new(string, $1)
                 else
-                    Logger.log('Failed to parse RPL_NICKNAMEINUSE message')
+                    Logger.warn('Failed to parse ERR_NICKNAMEINUSE message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/Notice.rb

@@ -14,20 +14,10 @@ module ModSpox
                     if(base_source =~ /\!/)
                         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
                         target = find_model(target)
                     else
@@ -35,7 +25,7 @@ module ModSpox
                     end
                     return Messages::Incoming::Notice.new(string, source, target, message)
                 else
-                    Logger.log('Failed to match NOTICE message')
+                    Logger.warn('Failed to match NOTICE message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/Part.rb

@@ -12,7 +12,7 @@ module ModSpox
                     channel.nick_remove(nick)
                     return Messages::Incoming::Part.new(string, channel, nick, $3)
                 else
-                    Logger.log('Failed to parse PART message')
+                    Logger.warn('Failed to parse PART message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/Ping.rb

@@ -9,7 +9,7 @@ module ModSpox
                 if(string =~ /^PING\s:(.+)$/)
                     return Messages::Incoming::Ping.new(string, $1, nil)
                 else
-                    Logger.log('Failed to match PING message')
+                    Logger.warn('Failed to match PING message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/Pong.rb

@@ -9,7 +9,7 @@ module ModSpox
                 if(string =~ /^:\S+\sPONG\s(\S+)\s:(.+)$/)
                     return Messages::Incoming::Pong.new(string, $1, $2)
                 else
-                    Logger.log('Failed to parse PONG message')
+                    Logger.warn('Failed to parse PONG message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/Privmsg.rb

@@ -13,7 +13,7 @@ module ModSpox
                     base_source = $1
                     source = find_model(base_source.gsub(/!.+$/, ''))
                     if(base_source =~ /!(.+)@(.+)$/)
-                        source.username == $1
+                        source.username = $1
                         source.address = $2
                         source.source = base_source
                         source.save_changes
@@ -21,7 +21,7 @@ module ModSpox
                     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.log('Failed to match PRIVMSG message')
+                    Logger.warn('Failed to match PRIVMSG message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/Quit.rb

@@ -14,7 +14,7 @@ module ModSpox
                     nick.save
                     return Messages::Incoming::Quit.new(string, nick, reason)
                 else
-                    Logger.log('Failed to parse KICK message')
+                    Logger.warn('Failed to parse KICK message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/Topic.rb

@@ -11,6 +11,7 @@ module ModSpox
             def process(string)
                 if(string =~ /#{RPL_TOPIC}.+?(\S+)\s:(.+)$/)
                     channel = find_model($1)
+                    channel.update(:topic => $2)
                     return Messages::Incoming::Topic.new(string, channel, $2)
                 elsif(string =~ /#{RPL_NOTOPIC}.+?(\S+)\s:/)
                     channel = find_model($1)
@@ -21,7 +22,7 @@ module ModSpox
                     time = Time.at($3.to_i)
                     return Messages::Incoming::TopicInfo.new(string, channel, nick, time)
                 else
-                    Logger.log('Failed to parse TOPIC type string')
+                    Logger.warn('Failed to parse TOPIC type string')
                     return nil
                 end                    
             end

data/lib/mod_spox/handlers/Welcome.rb

@@ -16,7 +16,7 @@ module ModSpox
                         nick = $1
                         username = $2
                         hostname = $3
-                        nick = Models::Nick.find_or_create(:nick => nick)
+                        nick = Models::Nick.locate(nick)
                         nick.botnick = true
                         nick.username = username
                         nick.address = hostname
@@ -24,11 +24,11 @@ module ModSpox
                         nick.save
                         return Messages::Incoming::Welcome.new(string, server, message, nick, username, hostname)
                     else
-                        Logger.log('Failed to match user string in welcome message')
+                        Logger.warn('Failed to match user string in welcome message')
                         return nil
                     end
                 else
-                    Logger.log('Failed to match welcome message')
+                    Logger.warn('Failed to match welcome message')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/Who.rb

@@ -1,4 +1,5 @@
-require 'mod_spox/handlers/Handler'
+['mod_spox/handlers/Handler', 'mod_spox/Monitors'].each{|f|require f}
+
 module ModSpox
     module Handlers
         class Who < Handler
@@ -8,9 +9,8 @@ module ModSpox
                 @cache = Hash.new
                 @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
@@ -29,11 +29,12 @@ module ModSpox
                     nick.real_name = $8
                     nick.connected_to = $4
                     nick.away = info =~ /G/ ? true : false
-                    nick.save
+                    nick.visible = true
+                    nick.save_changes
                     key = location.nil? ? nick.nick : location
-                    @cache[key] = Array.new unless @cache[location]
+                    @cache[key] = Array.new unless @cache[key]
                     @cache[key] << nick
-                    @raw_cache[key] = Array.new unless @raw_cache[location]
+                    @raw_cache[key] = Array.new unless @raw_cache[key]
                     @raw_cache[key] << string
                     unless(location.nil?)
                         channel = find_model(location)
@@ -56,10 +57,11 @@ module ModSpox
                     @cache.delete(location)
                     return message
                 else
-                    Logger.log('Failed to match RPL_WHO type message')
+                    Logger.warn('Failed to match RPL_WHO type message')
                     return nil
                 end
             end
+            
         end
     end
 end

data/lib/mod_spox/handlers/Whois.rb

@@ -16,53 +16,66 @@ module ModSpox
             
             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].pk, :mode => 'o', :channel_id => channel.pk)
+                            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].pk, :mode => 'v', :channel_id => channel.pk)
+                            Models::NickMode.find_or_create(:nick_id => @cache[nick].nick.pk, :mode => 'v', :channel_id => channel.pk)
                         else
                             Models::NickMode.filter(:nick_id => @cache[nick].nick.pk, :channel_id => channel.pk).each{|m| m.destroy}
                         end
                     }
-                    @cache[$1].raw_push(string)
                     return nil
                 elsif(string =~ /#{RPL_WHOISSERVER}\s\S+\s(\S+)\s(\S+)\s:(.+)$/)
-                    @cache[$1].nick.connected_to = $2
-                    @cache[$1].raw_push(string)
+                    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/)
-                    @cache[$1].nick.auth.services_identified = true
-                    @cache[$1].raw_push(string)
+                    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:(.+?),(.+?)/)
-                    @cache[$1].nick.seconds_idle = $2.to_i
-                    @cache[$1].nick.connected_at = Time.at($3.to_i)
-                    @cache[$1].raw_push(string)
+                    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+)/)
-                    @cache[$1].raw_push(string)
+                    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:/)
-                    @cache[$1].raw_push(string)
-                    message = @cache[$1]
+                    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[$1].nick.save
-                    @cache.delete($1)
+                    @cache[nick].nick.save
+                    @cache.delete(nick)
                     return message
                 else
-                    Logger.log('Failed to parse WHOIS type reply')
+                    Logger.warn('Failed to parse WHOIS type reply')
                     return nil
                 end
             end

data/lib/mod_spox/handlers/YourHost.rb

@@ -10,7 +10,7 @@ module ModSpox
                 if(string =~ /:Your host is (\S+), running version (.+)$/)
                     return Messages::Incoming::YourHost.new(string, $1, $2)
                 else
-                    Logger.log('Failed to match Your Host message')
+                    Logger.warn('Failed to match Your Host message')
                     return nil
                 end
             end

data/lib/mod_spox/messages/incoming/Privmsg.rb

@@ -3,23 +3,29 @@ module ModSpox
     module Messages
         module Incoming
             class Privmsg < Message
-                
+
                 # source of the message
                 attr_reader :source
                 # target of the message
                 attr_reader :target
-                # the message sent
-                attr_reader :message
+                # message is CTCP
+                attr_reader :ctcp
+                # message CTCP type
+                attr_reader :ctcp_type
                 def initialize(raw, source, target, message)
                     super(raw)
                     @source = source
                     @target = target
-                    if(message =~ /^\001ACTION\s(.+)\001/)
-                        @message = $1
-                        @action = true
+                    @ctcp = false
+                    @ctcp_type = nil
+                    @action = false
+                    if(@raw_content =~ /\x01(\S+)\s(.+)\x01/)
+                        @ctcp = true
+                        @ctcp_type = $1
+                        @message = $2
+                        @action = @ctcp_type.downcase == 'action'
                     else
                         @message = message
-                        @action = false
                     end
                     botnick = Models::Nick.filter(:botnick => true).first
                     if(botnick)
@@ -28,43 +34,56 @@ module ModSpox
                         @addressed = false
                     end
                 end
-                
+
                 # Is message addressing the bot
                 def addressed?
                     return @addressed || is_private?
                 end
-                
+
                 # Is this is private message
                 def is_private?
-                    return @target.is_a?(Models::Nick)
+                    return @target.is_a?(Models::Nick) || @target.is_a?(String)
+                end
+
+                # Is this a DCC message
+                def is_dcc?
+                    return @target.is_a?(String)
                 end
-                
+
                 # Is this a public message
                 def is_public?
                     return @target.is_a?(Models::Channel)
                 end
-                
+
                 # Does the message contain colors
                 def is_colored?
                     return @message =~ /\cC\d\d?(?:,\d\d?)?/
                 end
-                
+
                 # Message with coloring stripped
                 def message_nocolor
-                    return @message.gsub(/\cC\d\d?(?:,\d\d?)?/, '')
+                    return @message.gsub(/\cC\d\d?(?:,\d\d?)?/, '').tr("\x00-\x1f", '')
                 end
-                
+
+                # the message sent
+                def message(color=false)
+                    return color ? @message : message_nocolor
+                end
+
                 # Is this message an action message
                 def is_action?
                     @action
                 end
-                
+
+                def is_ctcp?
+                    @ctcp
+                end
+
                 # Convinence method for replying to the correct place
                 def replyto
-                    return @source if is_private?
-                    return @target if is_public?
+                    return is_public? || is_dcc? ? @target : @source
                 end
-            
+
             end
         end
     end

data/lib/mod_spox/messages/internal/DCCListener.rb

@@ -0,0 +1,12 @@
+module ModSpox
+    module Messages
+        module Internal
+            class DCCListener
+                attr_reader :nick
+                def initialize(nick)
+                    @nick = nick
+                end
+            end
+        end
+    end
+end

data/lib/mod_spox/messages/internal/DCCRequest.rb

@@ -0,0 +1,12 @@
+module ModSpox
+    module Messages
+        module Internal
+            class DCCRequest
+                attr_reader :socket_id
+                def initialize(id)
+                    @socket_id = id
+                end
+            end
+        end
+    end
+end

data/lib/mod_spox/messages/internal/DCCSocket.rb

@@ -0,0 +1,19 @@
+module ModSpox
+    module Messages
+        module Internal
+            class DCCSocket
+                # ID of the contained socket
+                attr_reader :socket_id
+                # Models::Nick this socket is connected to
+                attr_reader :nick
+                # socket
+                attr_reader :socket
+                def initialize(id, nick, socket)
+                    @socket_id = id
+                    @nick = nick
+                    @socket = socket
+                end
+            end
+        end
+    end
+end

data/lib/mod_spox/messages/internal/StatusRequest.rb

@@ -1,8 +1,9 @@
+require 'mod_spox/messages/internal/Request'
 module ModSpox
     module Messages
         module Internal
             # Request current bot status
-            class Status < Request
+            class StatusRequest < Request
             end
         end
     end