X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fautoop.rb;h=a47375ca69d00e6ae5ccf096d07a4b1f961fdfa0;hb=facc2af8233f691d022742f8ba5b96625c4b55cb;hp=cc1e11a9a16ce887681bde799a26ea2732ba9bdd;hpb=8b0e2e09f81a7d89ceb52e947e9db12a206a8c37;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/autoop.rb b/data/rbot/plugins/autoop.rb
index cc1e11a9..a47375ca 100644
--- a/data/rbot/plugins/autoop.rb
+++ b/data/rbot/plugins/autoop.rb
@@ -6,14 +6,32 @@ class AutoOP < Plugin
     def join(m)
       return if m.address?
       @registry.each { |mask,channels|
-        if(Irc.netmaskmatch(mask, m.source) &&
-            (channels.empty? || channels.include?(m.channel)))
-          @bot.mode(m.channel, "+o", m.sourcenick)
+        if m.source.matches?(mask.to_irc_netmask(:server => m.server)) &&
+            (channels.empty? || channels.include?(m.channel.to_s))
+          @bot.mode(m.channel, "+o", m.source.nick)
           return
         end
       }
     end
 
+    def nick(m)
+      return if m.address?
+      is_on = m.server.channels.inject(ChannelList.new) { |list, ch|
+        list << ch if ch.users.include?(m.source)
+        list
+      }
+      is_on.each { |channel|
+        ch = channel.to_s
+        @registry.each { |mask,channels|
+          if m.source.matches?(mask.to_irc_netmask(:server => m.server)) &&
+            (channels.empty? || channels.include?(ch))
+            @bot.mode(ch, "+o", m.source.nick)
+            return
+          end
+        }
+      }
+    end
+
     def add(m, params)
       @registry[params[:mask]] = params[:channels].dup
       m.okay