# HG changeset patch # User Goffi # Date 1487015949 -3600 # Node ID 6a004a22dd9eeac94a8979eecd12d39a2e3430e4 # Parent fff88c33442f4558bcc6d37f898f3347a7cf370e plugins XEP-0033, XEP-0280, text commands: fixed method renaming after client refactoring diff -r fff88c33442f -r 6a004a22dd9e src/plugins/plugin_misc_text_commands.py --- 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 diff -r fff88c33442f -r 6a004a22dd9e src/plugins/plugin_xep_0033.py --- 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) diff -r fff88c33442f -r 6a004a22dd9e src/plugins/plugin_xep_0280.py --- 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()))