changeset 2152:6a004a22dd9e

plugins XEP-0033, XEP-0280, text commands: fixed method renaming after client refactoring
author Goffi <goffi@goffi.org>
date Mon, 13 Feb 2017 20:59:09 +0100 (2017-02-13)
parents fff88c33442f
children f67434fd88d2
files src/plugins/plugin_misc_text_commands.py src/plugins/plugin_xep_0033.py src/plugins/plugin_xep_0280.py
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/plugin_misc_text_commands.py	Sun Feb 12 21:17:56 2017 +0100
+++ b/src/plugins/plugin_misc_text_commands.py	Mon Feb 13 20:59:09 2017 +0100
@@ -290,7 +290,7 @@
         mess_data["type"] = C.MESS_TYPE_INFO
         mess_data["message"] = {'': message}
         mess_data["extra"]["info_type"] = info_type
-        self.host.sendMessageToBridge(mess_data, client)
+        client.messageSendToBridge(mess_data)
 
     def cmd_whois(self, client, mess_data):
         """show informations on entity
--- a/src/plugins/plugin_xep_0033.py	Sun Feb 12 21:17:56 2017 +0100
+++ b/src/plugins/plugin_xep_0033.py	Mon Feb 13 20:59:09 2017 +0100
@@ -126,8 +126,8 @@
             d = defer.Deferred()
             if not skip_send:
                 d.addCallback(client.sendMessageData)
-            d.addCallback(self.host.messageAddToHistory, client)
-            d.addCallback(self.host.sendMessageToBridge, client)
+            d.addCallback(client.messageAddToHistory)
+            d.addCallback(client.messageSendToBridge)
             d.addErrback(lambda failure: failure.trap(exceptions.CancelError))
             return d.callback(mess_data)
 
--- a/src/plugins/plugin_xep_0280.py	Sun Feb 12 21:17:56 2017 +0100
+++ b/src/plugins/plugin_xep_0280.py	Mon Feb 13 20:59:09 2017 +0100
@@ -147,8 +147,8 @@
             mess_data = SatMessageProtocol.parseMessage(cc_message_elt, client)
             if not mess_data['message'] and not mess_data['subject']:
                 return False
-            self.host.messageAddToHistory(mess_data, client)
-            self.host.sendMessageToBridge(mess_data, client)
+            client.messageAddToHistory(mess_data)
+            client.messageSendToBridge(mess_data)
         else:
             log.warning(u"invalid message carbons received:\n{xml}".format(
                 xml = message_elt.toXml()))