diff options
| -rw-r--r-- | alias_server/component.py | 14 | ||||
| -rw-r--r-- | alias_server/user.py | 6 |
2 files changed, 8 insertions, 12 deletions
diff --git a/alias_server/component.py b/alias_server/component.py index ae238ed..1770c20 100644 --- a/alias_server/component.py +++ b/alias_server/component.py @@ -33,22 +33,18 @@ class ObjectComponent(ComponentXMPP): msg.reply("Thanks for sending\n{[body]}".format(msg)).send() def presence_subscription(self, subscription): + userJID = subscription["from"].full + subscriber = User(subscription["from"].bare) if subscription["type"] == "subscribe": - userJID = subscription["from"].full - if not self.userHandler.registered(userJID): - self.userHandler.register(userJID) + if not subscriber.is_registered(): logger.info('registering user {}'.format(userJID)) subscription.reply().send() self.send_presence(pto = userJID) self.send_presence_subscription(pto = userJID, ptype = "subscribe") if subscription["type"] == "unsubscribe": - userJID = subscription["from"].full - if self.userHandler.registered(userJID): - self.userHandler.unregister(userJID) + if subscriber.is_registered: + subscriber.unregister() logger.info('unregistering user {}'.format(userJID)) #def presence_probe(self, event): # self.send_presence(pto = event["from"].full) - - - diff --git a/alias_server/user.py b/alias_server/user.py index f6800f9..6c5b809 100644 --- a/alias_server/user.py +++ b/alias_server/user.py @@ -20,7 +20,7 @@ class User: ObjectWriter('pubkey', self.jid, split_name = False).add_user('*', READ) ObjectWriter('privkey', self.jid, split_name = False).write(self.jid, registration['privkey']) ObjectWriter(self.hash, self.jid) - + def get_registration(self): registration = {} registration['pubkey'], ignore = ObjectReader('pubkey',self.jid, split_name = False).get_content(self.jid) @@ -30,7 +30,7 @@ class User: def is_registered(self): return Object(self.hash, self.jid).exists() - def unregister(self, jid): + def unregister(self): pass class UserHandler: @@ -42,4 +42,4 @@ class UserHandler: return os.listdir(self.root) if __name__ == '__main__': - print UserHandler('/var/lib/alias').get_user_list()
\ No newline at end of file + print UserHandler('/var/lib/alias').get_user_list() |