Op limitserv on sync, fix channelless commands

diff --git a/acid/src/main/java/net/rizon/acid/conf/Command.java b/acid/src/main/java/net/rizon/acid/conf/Command.java
index 143625394dc163c70b49454adf672b5f36466f3e..5ca7aff77c9c58eedd08fbbc57405aad28947a4c 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/conf/Command.java
+++ b/acid/src/main/java/net/rizon/acid/conf/Command.java
@@ -12,7 +12,7 @@ public class Command implements Validatable
 
        public boolean allowsChannel(String channel)
        {
-               if (channels != null && channel != null)
+               if (channels != null)
                        for (String s : channels)
                                if (Acidictive.conf.getChannelNamed(s).equalsIgnoreCase(channel))
                                        return true;

diff --git a/acid/src/main/java/net/rizon/acid/core/AcidUser.java b/acid/src/main/java/net/rizon/acid/core/AcidUser.java
index 1ff2e3082c350643eaa2ec02f38088f8a3542d32..4076e5c93a6141d52b327d3a88b086cd1ec51f60 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/AcidUser.java
+++ b/acid/src/main/java/net/rizon/acid/core/AcidUser.java
@@ -81,7 +81,7 @@ public class AcidUser extends User
        {
                if (client != null && this.client.commands != null)
                        for (net.rizon.acid.conf.Command c : this.client.commands)
-                               if (c.name.equalsIgnoreCase(name) && c.allowsChannel(channel))
+                               if (c.name.equalsIgnoreCase(name) && (channel == null || c.allowsChannel(channel)))
                                        return c;
                return null;
        }

diff --git a/pyva/pyva/src/main/python/limitserv/limitserv.py b/pyva/pyva/src/main/python/limitserv/limitserv.py
index 62d8a1dba6e8ce68c187625c190ea0d67372b6c3..d61fc3f4f3d9629e3559b9fa3d64e54ec1db4c3c 100644 (file)
--- a/pyva/pyva/src/main/python/limitserv/limitserv.py
+++ b/pyva/pyva/src/main/python/limitserv/limitserv.py
@@ -102,6 +102,10 @@ class limitserv(
                self.elog.debug('Started threads.')
                return True
        
+       def onSync(self):
+               for channel in self.channels.list_valid():
+                       self.msg('ChanServ', 'OP %s' % channel.name)
+       
        def stop(self):
                if hasattr(self, 'auth'):
                        self.auth.stop()