From 9608829d3b5759803acda56a27e0b98af0482c77 Mon Sep 17 00:00:00 2001 From: Goffi Date: Mon, 13 Feb 2017 20:59:09 +0100 Subject: [PATCH] plugins XEP-0033, XEP-0280, text commands: fixed method renaming after client refactoring --- src/plugins/plugin_misc_text_commands.py | 2 +- src/plugins/plugin_xep_0033.py | 4 ++-- src/plugins/plugin_xep_0280.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/plugin_misc_text_commands.py b/src/plugins/plugin_misc_text_commands.py index c16f70eb..80cff0e7 100755 --- a/src/plugins/plugin_misc_text_commands.py +++ b/src/plugins/plugin_misc_text_commands.py @@ -290,7 +290,7 @@ class TextCommands(object): 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 diff --git a/src/plugins/plugin_xep_0033.py b/src/plugins/plugin_xep_0033.py index 243a1778..dd92faa0 100644 --- a/src/plugins/plugin_xep_0033.py +++ b/src/plugins/plugin_xep_0033.py @@ -126,8 +126,8 @@ class XEP_0033(object): 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) diff --git a/src/plugins/plugin_xep_0280.py b/src/plugins/plugin_xep_0280.py index e27f5e54..90b68e12 100755 --- a/src/plugins/plugin_xep_0280.py +++ b/src/plugins/plugin_xep_0280.py @@ -147,8 +147,8 @@ class XEP_0280(object): 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()))