diff src/plugins/plugin_misc_room_game.py @ 849:c5a8f602662b

plugin room_game, radiocol: RoomGame.send returns a Deferred.
author souliane <souliane@mailoo.org>
date Tue, 18 Feb 2014 17:49:33 +0100
parents f3513c8cc2e6
children 3c270d691e56
line wrap: on
line diff
--- a/src/plugins/plugin_misc_room_game.py	Tue Feb 18 16:24:19 2014 +0100
+++ b/src/plugins/plugin_misc_room_game.py	Tue Feb 18 17:49:33 2014 +0100
@@ -21,6 +21,7 @@
 from logging import debug, warning, error
 from twisted.words.protocols.jabber.jid import JID
 from twisted.words.xish import domish
+from twisted.internet import defer
 from time import time
 from wokkel import disco, iwokkel
 from zope.interface import implements
@@ -617,10 +618,11 @@
         - attrs: dictionary of attributes for the new child
         - content: unicode that is appended to the child content
         @param profile: the profile from which the message is sent
+        @return: a Deferred instance
         """
         if profile is None:
             error(_("Message can not be sent without a sender profile"))
-            return
+            return defer.fail(None)
         msg = self._createGameElt(to_jid)
         for elem, attrs, content in data:
             if elem is not None:
@@ -633,6 +635,7 @@
                 if content is not None:
                     elem.addContent(content)
         self.host.profiles[profile].xmlstream.send(msg)
+        return defer.succeed(None)
 
     def send(self, to_jid, elem=None, attrs=None, content=None, profile=None):
         """
@@ -644,8 +647,9 @@
         @param attrs: dictionary of attributes for the new child
         @param content: unicode that is appended to the child content
         @param profile: the profile from which the message is sent
+        @return: a Deferred instance
         """
-        self._sendElements(to_jid, [(elem, attrs, content)], profile)
+        return self._sendElements(to_jid, [(elem, attrs, content)], profile)
 
     def getHandler(self, profile):
         return RoomGameHandler(self)