+ delegate notice() for NoticeMessage

[user/henk/code/ruby/rbot.git] / lib / rbot / ircbot.rb

diff --git a/lib/rbot/ircbot.rb b/lib/rbot/ircbot.rb
index 9a6685da5472909b4dbe5c2f16a42a6d4edd475f..12f087896a885e56e6c03d867bb5e6929faa5eb3 100644 (file)
--- a/lib/rbot/ircbot.rb
+++ b/lib/rbot/ircbot.rb
@@ -528,8 +528,11 @@ class Bot
     @quiet = []
 
     @client[:welcome] = proc {|data|
+      m = WelcomeMessage.new(self, server, data[:source], data[:target], data[:message])
+
       irclog "joined server #{@client.server} as #{myself}", "server"
 
+      @plugins.delegate("welcome", m)
       @plugins.delegate("connect")
 
       @config['irc.join_channels'].each { |c|
@@ -566,29 +569,21 @@ class Bot
       # debug "Message target is #{data[:target].inspect}"
       # debug "Bot is #{myself.inspect}"
 
-      ignored = false
       @config['irc.ignore_users'].each { |mask|
         if m.source.matches?(server.new_netmask(mask))
-          ignored = true
-          break
+          m.ignored = true
         end
       }
 
       irclogprivmsg(m)
 
-      unless ignored
-        @plugins.delegate "listen", m
-        @plugins.delegate("ctcp_listen", m) if m.ctcp
-        @plugins.privmsg(m) if m.address?
-        if not m.replied
-          @plugins.delegate "unreplied", m
-        end
-      end
+      @plugins.irc_delegate('privmsg', m) unless m.ignored?
     }
     @client[:notice] = proc { |data|
       message = NoticeMessage.new(self, server, data[:source], data[:target], data[:message])
       # pass it off to plugins that want to hear everything
       @plugins.delegate "listen", message
+      @plugins.delegate "notice", message
     }
     @client[:motd] = proc { |data|
       data[:motd].each_line { |line|
@@ -629,8 +624,7 @@ class Bot
       data[:is_on].each { |ch|
         irclog "@ #{old} is now known as #{new}", ch
       }
-      @plugins.delegate("listen", m)
-      @plugins.delegate("nick", m)
+      @plugins.irc_delegate("nick", m)
     }
     @client[:quit] = proc {|data|
       source = data[:source]
@@ -639,8 +633,7 @@ class Bot
       data[:was_on].each { |ch|
         irclog "@ Quit: #{source}: #{message}", ch
       }
-      @plugins.delegate("listen", m)
-      @plugins.delegate("quit", m)
+      @plugins.irc_delegate("quit", m)
     }
     @client[:mode] = proc {|data|
       irclog "@ Mode #{data[:modestring]} by #{data[:source]}", data[:channel]
@@ -649,35 +642,31 @@ class Bot
       m = JoinMessage.new(self, server, data[:source], data[:channel], data[:message])
       irclogjoin(m)
 
-      @plugins.delegate("listen", m)
-      @plugins.delegate("join", m)
+      @plugins.irc_delegate("join", m)
       sendq("WHO #{data[:channel]}", data[:channel], 2) if m.address?
     }
     @client[:part] = proc {|data|
       m = PartMessage.new(self, server, data[:source], data[:channel], data[:message])
       irclogpart(m)
 
-      @plugins.delegate("listen", m)
-      @plugins.delegate("part", m)
+      @plugins.irc_delegate("part", m)
     }
     @client[:kick] = proc {|data|
       m = KickMessage.new(self, server, data[:source], data[:target], data[:channel],data[:message])
       irclogkick(m)
 
-      @plugins.delegate("listen", m)
-      @plugins.delegate("kick", m)
+      @plugins.irc_delegate("kick", m)
     }
     @client[:invite] = proc {|data|
-      if data[:target] == myself
-        join data[:channel] if @auth.allow?("join", data[:source], data[:source].nick)
-      end
+      m = InviteMessage.new(self, server, data[:source], data[:target], data[:channel])
+
+      @plugins.irc_delegate("invite", m)
     }
     @client[:changetopic] = proc {|data|
       m = TopicMessage.new(self, server, data[:source], data[:channel], data[:topic])
       irclogtopic(m)
 
-      @plugins.delegate("listen", m)
-      @plugins.delegate("topic", m)
+      @plugins.irc_delegate("topic", m)
     }
     @client[:topic] = proc { |data|
       irclog "@ Topic is \"#{data[:topic]}\"", data[:channel]
@@ -688,8 +677,7 @@ class Bot
       irclog "@ Topic set by #{topic.set_by} on #{topic.set_on}", channel
       m = TopicMessage.new(self, server, data[:source], channel, topic)
 
-      @plugins.delegate("listen", m)
-      @plugins.delegate("topic", m)
+      @plugins.irc_delegate("topic", m)
     }
     @client[:names] = proc { |data|
       @plugins.delegate "names", data[:channel], data[:users]