X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fiplookup.rb;h=495aa614f61f5657e2be379c0eeec159f04248b9;hb=16336b4a240a4265d1f2df1e30d7b68d3a924287;hp=87c94699fa9c9d3f42ab1ae21f712a35bd4c6140;hpb=58e65601becf1d3a1febf1d6067cd66754711c8b;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/iplookup.rb b/data/rbot/plugins/iplookup.rb
index 87c94699..495aa614 100644
--- a/data/rbot/plugins/iplookup.rb
+++ b/data/rbot/plugins/iplookup.rb
@@ -189,23 +189,25 @@ class IPLookupPlugin < Plugin
 
   def iplookup(m, params)
     reply = ""
-    if params[:domain]
+    if params[:domain].match(/^#{Regexp::Irc::HOSTADDR}$/)
+      ip = params[:domain]
+    else
       begin
         ip = Resolv.getaddress(params[:domain])
-        reply += "#{params[:domain]} | "
+        reply << "#{params[:domain]} | "
       rescue => e
         m.reply "#{e.message}"
         return
       end
-    else
-      ip = params[:ip]
     end
 
-    reply += ArinWhois.lookup_info(ip)
+    reply << ArinWhois.lookup_info(ip)
+
     m.reply reply
   end
 
   def userip(m, params)
+    m.reply "not implemented yet"
     #users = @channels[m.channel].users
     #m.reply "users = #{users.inspect}"
     #m.reply @bot.sendq("WHO #{params[:user]}")
@@ -214,8 +216,7 @@ class IPLookupPlugin < Plugin
 end
 
 plugin = IPLookupPlugin.new
-plugin.map 'iplookup :ip', :action => 'iplookup', :requirements => {:ip => /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/}, :thread => true
-plugin.map 'iplookup :domain', :action => 'iplookup', :requirements => {:domain => /^[a-z0-9\.\-]{4,255}$/i}, :thread => true
+plugin.map 'iplookup :domain', :action => 'iplookup', :thread => true
 plugin.map 'userip :user', :action => 'userip', :requirements => {:user => /\w+/}, :thread => true