comparison idavoll/memory_storage.py @ 112:72c8812fa1b5

Fix interpretation of JIDs.
author Ralph Meijer <ralphm@ik.nu>
date Fri, 08 Apr 2005 16:31:09 +0000
parents d252d793f0ed
children 97f10cfea28c
comparison
equal deleted inserted replaced
111:30c580286d27 112:72c8812fa1b5
47 return defer.fail(storage.NodeNotFound()) 47 return defer.fail(storage.NodeNotFound())
48 48
49 return defer.succeed(None) 49 return defer.succeed(None)
50 50
51 def get_affiliations(self, entity): 51 def get_affiliations(self, entity):
52 entity_full = entity.full() 52 entity = entity.userhost()
53 return defer.succeed([(node.id, node._affiliations[entity_full]) 53 return defer.succeed([(node.id, node._affiliations[entity])
54 for name, node in self._nodes.iteritems() 54 for name, node in self._nodes.iteritems()
55 if entity_full in node._affiliations]) 55 if entity in node._affiliations])
56 56
57 def get_subscriptions(self, entity): 57 def get_subscriptions(self, entity):
58 subscriptions = [] 58 subscriptions = []
59 for node in self._nodes.itervalues(): 59 for node in self._nodes.itervalues():
60 for subscriber, subscription in node._subscriptions.iteritems(): 60 for subscriber, subscription in node._subscriptions.iteritems():
61 subscriber = jid.JID(subscriber) 61 subscriber = jid.JID(subscriber)
62 if subscriber.userhostJID() == entity: 62 if subscriber.userhostJID() == entity.userhostJID():
63 subscriptions.append((node.id, subscriber, 63 subscriptions.append((node.id, subscriber,
64 subscription.state)) 64 subscription.state))
65 65
66 return defer.succeed(subscriptions) 66 return defer.succeed(subscriptions)
67 67
69 69
70 implements(storage.INode) 70 implements(storage.INode)
71 71
72 def __init__(self, node_id, owner, config): 72 def __init__(self, node_id, owner, config):
73 self.id = node_id 73 self.id = node_id
74 self._affiliations = {owner.full(): 'owner'} 74 self._affiliations = {owner.userhost(): 'owner'}
75 self._subscriptions = {} 75 self._subscriptions = {}
76 self._config = config 76 self._config = config
77 77
78 def get_type(self): 78 def get_type(self):
79 return self.type 79 return self.type