Mercurial > libervia-backend
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 1962:a45235d8dc93 | 1963:a2bc5089c2eb |
|---|---|
| 16 | 16 |
| 17 # You should have received a copy of the GNU Affero General Public License | 17 # You should have received a copy of the GNU Affero General Public License |
| 18 # along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 # along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 19 | 19 |
| 20 from sat.core.i18n import _ | 20 from sat.core.i18n import _ |
| 21 from sat.core.constants import Const as C | |
| 21 from sat.core import exceptions | 22 from sat.core import exceptions |
| 22 from sat.core.log import getLogger | 23 from sat.core.log import getLogger |
| 23 log = getLogger(__name__) | 24 log = getLogger(__name__) |
| 24 | 25 |
| 25 from twisted.internet import defer | 26 from twisted.internet import defer |
| 89 @param data: data send by MessageReceived trigger through post_treat deferred | 90 @param data: data send by MessageReceived trigger through post_treat deferred |
| 90 @param body_elts: XHTML-IM body elements found | 91 @param body_elts: XHTML-IM body elements found |
| 91 @return: the data with the extra parameter updated | 92 @return: the data with the extra parameter updated |
| 92 """ | 93 """ |
| 93 # TODO: check if text only body is empty, then try to convert XHTML-IM to pure text and show a warning message | 94 # TODO: check if text only body is empty, then try to convert XHTML-IM to pure text and show a warning message |
| 94 def converted(xhtml): | 95 def converted(xhtml, lang): |
| 95 if lang: | 96 if lang: |
| 96 data['extra']['xhtml_{}'.format(lang)] = xhtml | 97 data['extra']['xhtml_{}'.format(lang)] = xhtml |
| 97 else: | 98 else: |
| 98 data['extra']['xhtml'] = xhtml | 99 data['extra']['xhtml'] = xhtml |
| 99 | 100 |
| 100 defers = [] | 101 defers = [] |
| 101 for body_elt in body_elts: | 102 for body_elt in body_elts: |
| 102 lang = body_elt.getAttribute('xml:lang', '') | 103 lang = body_elt.getAttribute((C.NS_XML, 'lang'), '') |
| 103 d = self._s.convert(body_elt.toXml(), self.SYNTAX_XHTML_IM, safe=True) | 104 d = self._s.convert(body_elt.toXml(), self.SYNTAX_XHTML_IM, safe=True) |
| 104 d.addCallback(converted, lang) | 105 d.addCallback(converted, lang) |
| 105 defers.append(d) | 106 defers.append(d) |
| 106 | 107 |
| 107 d_list = defer.DeferredList(defers) | 108 d_list = defer.DeferredList(defers) |
| 119 html_elt = message_elt.addElement((NS_XHTML_IM, 'html')) | 120 html_elt = message_elt.addElement((NS_XHTML_IM, 'html')) |
| 120 | 121 |
| 121 def syntax_converted(xhtml_im, lang): | 122 def syntax_converted(xhtml_im, lang): |
| 122 body_elt = html_elt.addElement((NS_XHTML, 'body')) | 123 body_elt = html_elt.addElement((NS_XHTML, 'body')) |
| 123 if lang: | 124 if lang: |
| 124 body_elt['xml:lang'] = lang | 125 body_elt[(C.NS_XML, 'lang')] = lang |
| 125 data['extra']['xhtml_{}'.format(lang)] = xhtml_im | 126 data['extra']['xhtml_{}'.format(lang)] = xhtml_im |
| 126 else: | 127 else: |
| 127 data['extra']['xhtml'] = xhtml_im | 128 data['extra']['xhtml'] = xhtml_im |
| 128 body_elt.addRawXml(xhtml_im) | 129 body_elt.addRawXml(xhtml_im) |
| 129 | 130 |