pseudoclient/sys_auth: Allow request override; erepublik/sys_auth is now using it...

diff --git a/pyva/pyva/src/main/python/erepublik/sys_auth.py b/pyva/pyva/src/main/python/erepublik/sys_auth.py
index 04334c958112768c21163a14723002ecfeed1038..578cac592440f09a6fb78fb1df898cf8517c94c1 100644 (file)
--- a/pyva/pyva/src/main/python/erepublik/sys_auth.py
+++ b/pyva/pyva/src/main/python/erepublik/sys_auth.py
@@ -4,6 +4,12 @@ class ErepublikAuthManager(AuthManager):
        def __init__(self, module):
                AuthManager.__init__(self, module)
 
+       def onRequest(self, user, action, channel):
+               if action in ['usermass', 'nousermass']:
+                       self.accept(user)
+                       return True
+               return False
+
        def onAccept(self, user, request, action, channel):
                if action == 'news':
                        if self.module.channels.is_valid(channel):

diff --git a/pyva/pyva/src/main/python/pseudoclient/sys_auth.py b/pyva/pyva/src/main/python/pseudoclient/sys_auth.py
index 259818ac97844734139a659add690e16744a3b7d..bf1ba64f072ed5736fdba83d522d9da91bfcef67 100644 (file)
--- a/pyva/pyva/src/main/python/pseudoclient/sys_auth.py
+++ b/pyva/pyva/src/main/python/pseudoclient/sys_auth.py
@@ -21,7 +21,9 @@ class AuthManager(Subsystem):
                
                self.requests[user] = Request(user, channel, action)
                
-               if anope_major == 1:
+               if self.onRequest(user, action, channel):
+                       pass
+               elif anope_major == 1:
                        self.module.msg('ChanServ', 'WHY %s %s' % (channel, user))
                elif anope_major == 2:
                        self.module.msg('ChanServ', 'STATUS %s %s' % (channel, user))
@@ -53,6 +55,9 @@ class AuthManager(Subsystem):
                self.module.elog.request('Request accepted. Action: @b%s@b. Channel: @b%s@b. User: @b%s@b.' % (action, channel, user))
                del self.requests[user]
 
+       def onRequest(self, user, action, channel):
+               return False
+
        def onAccept(self, user, request, action, channel):
                return False