diff src/plugins/plugin_xep_0071.py @ 1963:a2bc5089c2eb

backend, frontends: message refactoring (huge commit): /!\ several features are temporarily disabled, like notifications in frontends next step in refactoring, with the following changes: - jp: updated jp message to follow changes in backend/bridge - jp: added --lang, --subject, --subject_lang, and --type options to jp message + fixed unicode handling for jid - quick_frontend (QuickApp, QuickChat): - follow backend changes - refactored chat, message are now handled in OrderedDict and uid are kept so they can be updated - Message and Occupant classes handle metadata, so frontend just have to display them - Primitivus (Chat): - follow backend/QuickFrontend changes - info & standard messages are handled in the same MessageWidget class - improved/simplified handling of messages, removed update() method - user joined/left messages are merged when next to each other - a separator is shown when message is received while widget is out of focus, so user can quickly see the new messages - affiliation/role are shown (in a basic way for now) in occupants panel - removed "/me" messages handling, as it will be done by a backend plugin - message language is displayed when available (only one language per message for now) - fixed :history and :search commands - core (constants): new constants for messages type, XML namespace, entity type - core: *Message methods renamed to follow new code sytle (e.g. sendMessageToBridge => messageSendToBridge) - core (messages handling): fixed handling of language - core (messages handling): mes_data['from'] and ['to'] are now jid.JID - core (core.xmpp): reorganised message methods, added getNick() method to client.roster - plugin text commands: fixed plugin and adapted to new messages behaviour. client is now used in arguments instead of profile - plugins: added information for cancellation reason in CancelError calls - plugin XEP-0045: various improvments, but this plugin still need work: - trigger is used to avoid message already handled by the plugin to be handled a second time - changed the way to handle history, the last message from DB is checked and we request only messages since this one, in seconds (thanks Poezio folks :)) - subject reception is waited before sending the roomJoined signal, this way we are sure that everything including history is ready - cmd_* method now follow the new convention with client instead of profile - roomUserJoined and roomUserLeft messages are removed, the events are now handled with info message with a "ROOM_USER_JOINED" info subtype - probably other forgotten stuffs :p
author Goffi <goffi@goffi.org>
date Mon, 20 Jun 2016 18:41:53 +0200
parents 633b5c21aefd
children 3626b2813158
line wrap: on
line diff
--- a/src/plugins/plugin_xep_0071.py	Sun Jun 19 22:22:13 2016 +0200
+++ b/src/plugins/plugin_xep_0071.py	Mon Jun 20 18:41:53 2016 +0200
@@ -18,6 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from sat.core.i18n import _
+from sat.core.constants import Const as C
 from sat.core import exceptions
 from sat.core.log import getLogger
 log = getLogger(__name__)
@@ -91,7 +92,7 @@
         @return: the data with the extra parameter updated
         """
         # TODO: check if text only body is empty, then try to convert XHTML-IM to pure text and show a warning message
-        def converted(xhtml):
+        def converted(xhtml, lang):
             if lang:
                 data['extra']['xhtml_{}'.format(lang)] = xhtml
             else:
@@ -99,7 +100,7 @@
 
         defers = []
         for body_elt in body_elts:
-            lang = body_elt.getAttribute('xml:lang', '')
+            lang = body_elt.getAttribute((C.NS_XML, 'lang'), '')
             d = self._s.convert(body_elt.toXml(), self.SYNTAX_XHTML_IM, safe=True)
             d.addCallback(converted, lang)
             defers.append(d)
@@ -121,7 +122,7 @@
         def syntax_converted(xhtml_im, lang):
             body_elt = html_elt.addElement((NS_XHTML, 'body'))
             if lang:
-                body_elt['xml:lang'] = lang
+                body_elt[(C.NS_XML, 'lang')] = lang
                 data['extra']['xhtml_{}'.format(lang)] = xhtml_im
             else:
                 data['extra']['xhtml'] = xhtml_im