Changeset 36:f2953cadca90 in ralphm-patches

Timestamp:

Feb 12, 2010, 8:07:12 PM (12 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Work on roster item representation.

Files:

• client_service_example.patch (modified) (4 diffs)
• roster_item.patch (added)
• roster_server.patch (modified) (8 diffs)
• series (modified) (1 diff)

client_service_example.patch

@@ -1 @@
-diff -r 0a3d1655a3e5 doc/examples/client_service.tac
+diff -r 22c292560ce9 doc/examples/client_service.tac
 --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
-+++ b/doc/examples/client_service.tac   Fri Feb 12 11:55:08 2010 +0100
-@@ -0,0 +1,41 @@
++++ b/doc/examples/client_service.tac   Fri Feb 12 20:06:47 2010 +0100
+@@ -0,0 +1,56 @@
 +from twisted.application import service
 +from twisted.internet import defer
@@ -8 +8 @@
 +from wokkel.client import ClientService
 +from wokkel.generic import FallbackHandler
-+from wokkel.xmppim import RosterServerProtocol
++from wokkel.subprotocols import XMPPHandler
++from wokkel.xmppim import RosterItem, RosterServerProtocol
++
++from twisted.words.protocols.jabber.jid import internJID as JID
 +
 +import socket
@@ -17 +20 @@
 +    def __init__(self):
 +        RosterServerProtocol.__init__(self)
-+        self.roster = {'ralphm':
-+                           [{'jid': 'intosi@' + domain,
-+                             'name': 'Intosi',
-+                             'subscription': 'both',
-+                             'ask': None,
-+                             'groups': ['Friends']
-+                            },
-+                            {'jid': 'termie@' + domain,
-+                             'name': 'termie',
-+                             'subscription': 'both',
-+                             'ask': None,
-+                             'groups': []
-+                            }],
-+                       'test':
-+                            [
-+                            ]}
++        self.roster = {'ralphm': [
++                           RosterItem(JID('intosi@'+domain),
++                                      subscriptionTo=True,
++                                      subscriptionFrom=True,
++                                      name='Intosi',
++                                      groups=set(['Friends'])),
++                           RosterItem(JID('termie@'+domain),
++                                      subscriptionTo=True,
++                                      subscriptionFrom=True,
++                                      name='termie'),
++                           ],
++                       'test': [],
++                       }
 +
 +    def getRoster(self, entity):
 +        return defer.succeed(self.roster[entity.user])
++
++
++class Hello(XMPPHandler):
++
++    def q(self):
++        from wokkel.xmppim import AvailabilityPresence
++        p = AvailabilityPresence(JID('ralphm@'+domain+'/default'), JID('termie@'+domain+'/Home'), show='chat')
++        self.parent.send(p.toElement())
++
++
++    def connectionInitialized(self):
++        from twisted.internet import reactor
++        reactor.callLater(5, self.q)
++
 +
 +
@@ -43 +57 @@
 +FallbackHandler().setHandlerParent(clientService)
 +StaticRoster().setHandlerParent(clientService)
++Hello().setHandlerParent(clientService)
 +clientService.setServiceParent(application)

roster_server.patch

@@ -1 @@
-diff -r 09858bbc7f56 wokkel/xmppim.py
---- a/wokkel/xmppim.py  Fri Feb 12 09:37:28 2010 +0100
-+++ b/wokkel/xmppim.py  Fri Feb 12 09:40:15 2010 +0100
+diff -r 7b9f484b0b44 wokkel/xmppim.py
+--- a/wokkel/xmppim.py  Fri Feb 12 19:49:36 2010 +0100
++++ b/wokkel/xmppim.py  Fri Feb 12 19:53:42 2010 +0100
 @@ -12,6 +12,7 @@
  All of it should eventually move to Twisted.
@@ -20 +20 @@
      def __init__(self, to=None, type=None):
          domish.Element.__init__(self, (None, "presence"))
-@@ -605,6 +609,7 @@
-         self.groups = set()
+@@ -636,6 +640,7 @@
+ 
  
  
@@ -28 +28 @@
      """
      Client side XMPP roster protocol.
-@@ -614,6 +619,7 @@
+@@ -645,6 +650,7 @@
          ROSTER_SET = "/iq[@type='set']/query[@xmlns='%s']" % NS_ROSTER
          self.xmlstream.addObserver(ROSTER_SET, self._onRosterSet)
@@ -36 +36 @@
          jid = JID(element['jid'])
          item = RosterItem(jid)
-@@ -628,6 +634,7 @@
+@@ -659,6 +665,7 @@
  
          return item
@@ -44 +44 @@
          """
          Retrieve contact list.
-@@ -683,6 +690,7 @@
+@@ -713,6 +720,7 @@
              item = self._parseRosterItem(iq.query.item)
              self.onRosterSet(item)
@@ -52 +52 @@
          """
          Called when a roster push for a new or update item was received.
-@@ -691,6 +699,7 @@
+@@ -721,6 +729,7 @@
          @type item: L{RosterItem}
          """
@@ -60 +60 @@
          """
          Called when a roster push for the removal of an item was received.
-@@ -699,6 +708,57 @@
+@@ -729,6 +738,48 @@
          @type entity: L{JID}
          """
@@ -76 +76 @@
 +
 +
-+    def _toRosterReply(self, items, iq):
++    def _toRosterReply(self, roster, iq):
 +        response = xmlstream.toResponse(iq, 'result')
 +        response.addElement((NS_ROSTER, 'query'))
 +
-+        for item in items:
-+            element = response.query.addElement('item')
-+            element['jid'] = item['jid']
-+            if item['name']:
-+                element['name'] = item['name']
-+            element['subscription'] = item['subscription']
-+            if item['ask']:
-+                element['ask'] = item['ask']
-+
-+            for group in item['groups']:
-+                element.addElement('group', content=group)
++        for item in roster:
++            response.query.addChild(item.toElement())
 +
 +        return response

series

@@ +1 @@
+roster_item.patch
+roster_server.patch
 xmpp_client_listener.patch
 xmpp_client_service.patch
-roster_server.patch
 client_service_example.patch
 component_server.patch