exception handling

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / nickserv.rb

diff --git a/data/rbot/plugins/nickserv.rb b/data/rbot/plugins/nickserv.rb
index 976bb8f8a765d2e545edb902ba796f41022dc44f..6e7a26b9de1f289941b2e3de4ae066200bf6678e 100644 (file)
--- a/data/rbot/plugins/nickserv.rb
+++ b/data/rbot/plugins/nickserv.rb
@@ -72,7 +72,7 @@ class NickServPlugin < Plugin
   def listen(m)
     return unless(m.kind_of? NoticeMessage)
 
-    if (m.sourcenick == "NickServ" && m.message =~ /This nickname is owned by someone else/)
+    if (m.sourcenick == "NickServ" && m.message =~ /IDENTIFY/)
       debug "nickserv asked us to identify for nick #{@bot.nick}"
       if @registry.has_key?(@bot.nick)
         @bot.sendmsg "PRIVMSG", "NickServ", "IDENTIFY " + @registry[@bot.nick]
@@ -82,8 +82,8 @@ class NickServPlugin < Plugin
 
 end
 plugin = NickServPlugin.new
-plugin.map 'nickserv password :nick :passwd'
+plugin.map 'nickserv password :nick :passwd', :action => "password"
 plugin.map 'nickserv register :passwd :email', :action => 'nick_register',
            :defaults => {:passwd => false, :email => false}
-plugin.map 'nickserv listnicks'
-plugin.map 'nickserv identify'
+plugin.map 'nickserv listnicks', :action => "listnicks"
+plugin.map 'nickserv identify', :action => "identify"