Part a channel if the channel is not registered

diff --git a/pyva/pyva/src/main/python/pseudoclient/inviteable.py b/pyva/pyva/src/main/python/pseudoclient/inviteable.py
index 772b1327de201ae392aa0ecbe81e312c26326bb6..9134695147c9c474f7f058d00a2a300414b30b61 100644 (file)
--- a/pyva/pyva/src/main/python/pseudoclient/inviteable.py
+++ b/pyva/pyva/src/main/python/pseudoclient/inviteable.py
@@ -107,6 +107,8 @@ class InviteablePseudoclient(object):
 
                # common to both anope1 and anope2
                if "isn't registered" in msg:
+                       # Function is called reject, but it actually accepts the request if
+                       # it's a remove request
                        self.auth.reject_not_registered(strip_ascii_irc(sp[1]))
                        return
 

diff --git a/pyva/pyva/src/main/python/pseudoclient/sys_auth.py b/pyva/pyva/src/main/python/pseudoclient/sys_auth.py
index 4bc4057ff33556c15d865ade9b524b255bca8d18..615ec6c374f58125d6b7523e2befdcb4e3aedac4 100644 (file)
--- a/pyva/pyva/src/main/python/pseudoclient/sys_auth.py
+++ b/pyva/pyva/src/main/python/pseudoclient/sys_auth.py
@@ -87,7 +87,10 @@ class AuthManager(Subsystem):
        def reject_not_registered(self, channel):
                for user in self.requests:
                        if self.requests[user].channel == channel:
-                               self.reject(user, 'Channel @b%s@b is unregistered.' % channel)
+                               if self.requests[user].action == 'remove':
+                                       self.accept(user)
+                               else:
+                                       self.reject(user, 'Channel @b%s@b is unregistered.' % channel)
                                break
 
        def reject(self, user, reason = ''):