Changeset 49:537d1413b661 in ralphm-patches for roster_server.patch

Timestamp:

May 25, 2011, 9:50:21 AM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Save work after moving stuff to keep from wokkel.xmppim to wokkel.im.

File:

• roster_server.patch (modified) (3 diffs)

roster_server.patch

@@ -1 @@
-diff -r 7b9f484b0b44 wokkel/xmppim.py
---- a/wokkel/xmppim.py  Fri Feb 12 19:49:36 2010 +0100
-+++ b/wokkel/xmppim.py  Sat Feb 13 18:57:26 2010 +0100
-@@ -12,6 +12,7 @@
- All of it should eventually move to Twisted.
- """
+diff -r 3c5fb05162e1 wokkel/im.py
+--- a/wokkel/im.py      Wed May 25 09:39:42 2011 +0200
++++ b/wokkel/im.py      Wed May 25 09:40:28 2011 +0200
+@@ -14,7 +14,7 @@
  
+ from twisted.internet import defer
+ from twisted.words.protocols.jabber.jid import JID, internJID
+-from twisted.words.protocols.jabber import error
 +from twisted.words.protocols.jabber import error, xmlstream
- from twisted.words.protocols.jabber.jid import JID
  from twisted.words.xish import domish
  
-@@ -22,6 +23,9 @@
- NS_XML = 'http://www.w3.org/XML/1998/namespace'
+ from wokkel.compat import IQ
+@@ -25,6 +25,7 @@
  NS_ROSTER = 'jabber:iq:roster'
  
-+XPATH_ROSTER_GET = "//iq[@type='get']/query[@xmlns='%s']" % NS_ROSTER
-+XPATH_ROSTER_SET = "//iq[@type='set']/query[@xmlns='%s']" % NS_ROSTER
-+
- class Presence(domish.Element):
-     def __init__(self, to=None, type=None):
-         domish.Element.__init__(self, (None, "presence"))
-@@ -636,6 +640,7 @@
+ XPATH_ROSTER_SET = "/iq[@type='set']/query[@xmlns='%s']" % NS_ROSTER
++XPATH_ROSTER_GET = "/iq[@type='get']/query[@xmlns='%s']" % NS_ROSTER
  
  
  
-+
- class RosterClientProtocol(XMPPHandler):
-     """
-     Client side XMPP roster protocol.
-@@ -645,6 +650,7 @@
-         ROSTER_SET = "/iq[@type='set']/query[@xmlns='%s']" % NS_ROSTER
-         self.xmlstream.addObserver(ROSTER_SET, self._onRosterSet)
- 
-+
-     def _parseRosterItem(self, element):
-         jid = JID(element['jid'])
-         item = RosterItem(jid)
-@@ -659,6 +665,7 @@
- 
-         return item
- 
-+
-     def getRoster(self):
-         """
-         Retrieve contact list.
-@@ -713,6 +720,7 @@
-             item = self._parseRosterItem(iq.query.item)
-             self.onRosterSet(item)
- 
-+
-     def onRosterSet(self, item):
-         """
-         Called when a roster push for a new or update item was received.
-@@ -721,6 +729,7 @@
-         @type item: L{RosterItem}
-         """
- 
-+
-     def onRosterRemove(self, entity):
-         """
-         Called when a roster push for the removal of an item was received.
-@@ -729,6 +738,48 @@
+@@ -579,3 +580,43 @@
+         @param entity: The entity for which the roster item has been removed.
          @type entity: L{JID}
          """
- 
++
 +
 +
@@ -89 +49 @@
 +        iq.handled = True
 +
-+        d = self.getRoster(JID(iq["from"]))
++        d = self.getRoster(internJID(iq["from"]))
 +        d.addCallback(self._toRosterReply, iq)
 +        d.addErrback(lambda _: error.ErrorStanza('internal-error').toResponse(iq))
@@ -103 +63 @@
 +    def getRoster(self, entity):
 +        raise NotImplemented
-+
-+
-+
- class MessageProtocol(XMPPHandler):
-     """
-     Generic XMPP subprotocol handler for incoming message stanzas.