Mercurial > libervia-backend
comparison src/plugins/plugin_xep_0033.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 | 6e509ee853a8 |
comparison
equal
deleted
inserted
replaced
| 1962:a45235d8dc93 | 1963:a2bc5089c2eb |
|---|---|
| 84 return mess_data | 84 return mess_data |
| 85 | 85 |
| 86 def discoCallback(entities): | 86 def discoCallback(entities): |
| 87 if not entities: | 87 if not entities: |
| 88 log.warning(_("XEP-0033 is being used but the server doesn't support it!")) | 88 log.warning(_("XEP-0033 is being used but the server doesn't support it!")) |
| 89 raise failure.Failure(exceptions.CancelError()) | 89 raise failure.Failure(exceptions.CancelError(u'Cancelled by XEP-0033')) |
| 90 if mess_data["to"] not in entities: | 90 if mess_data["to"] not in entities: |
| 91 expected = _(' or ').join([entity.userhost() for entity in entities]) | 91 expected = _(' or ').join([entity.userhost() for entity in entities]) |
| 92 log.warning(_(u"Stanzas using XEP-0033 should be addressed to %(expected)s, not %(current)s!") % {'expected': expected, 'current': mess_data["to"]}) | 92 log.warning(_(u"Stanzas using XEP-0033 should be addressed to %(expected)s, not %(current)s!") % {'expected': expected, 'current': mess_data["to"]}) |
| 93 log.warning(_(u"TODO: addressing has been fixed by the backend... fix it in the frontend!")) | 93 log.warning(_(u"TODO: addressing has been fixed by the backend... fix it in the frontend!")) |
| 94 mess_data["to"] = list(entities)[0].userhostJID() | 94 mess_data["to"] = list(entities)[0].userhostJID() |
| 97 for type_, jid_ in entries: | 97 for type_, jid_ in entries: |
| 98 element.addChild(domish.Element((None, 'address'), None, {'type': type_, 'jid': jid_})) | 98 element.addChild(domish.Element((None, 'address'), None, {'type': type_, 'jid': jid_})) |
| 99 # when the prosody plugin is completed, we can immediately return mess_data from here | 99 # when the prosody plugin is completed, we can immediately return mess_data from here |
| 100 self.sendAndStoreMessage(mess_data, entries, profile) | 100 self.sendAndStoreMessage(mess_data, entries, profile) |
| 101 log.debug("XEP-0033 took over") | 101 log.debug("XEP-0033 took over") |
| 102 raise failure.Failure(exceptions.CancelError()) | 102 raise failure.Failure(exceptions.CancelError(u'Cancelled by XEP-0033')) |
| 103 d = self.host.findFeaturesSet([NS_ADDRESS], profile=profile) | 103 d = self.host.findFeaturesSet([NS_ADDRESS], profile=profile) |
| 104 d.addCallbacks(discoCallback, lambda dummy: discoCallback(None)) | 104 d.addCallbacks(discoCallback, lambda dummy: discoCallback(None)) |
| 105 return d | 105 return d |
| 106 | 106 |
| 107 post_xml_treatments.addCallback(treatment) | 107 post_xml_treatments.addCallback(treatment) |
| 122 """ | 122 """ |
| 123 def send(mess_data, skip_send=False): | 123 def send(mess_data, skip_send=False): |
| 124 client = self.host.profiles[profile] | 124 client = self.host.profiles[profile] |
| 125 d = defer.Deferred() | 125 d = defer.Deferred() |
| 126 if not skip_send: | 126 if not skip_send: |
| 127 d.addCallback(self.host._sendMessageToStream, client) | 127 d.addCallback(self.host.messageSendToStream, client) |
| 128 d.addCallback(self.host._storeMessage, client) | 128 d.addCallback(self.host.messageAddToHistory, client) |
| 129 d.addCallback(self.host.sendMessageToBridge, client) | 129 d.addCallback(self.host.messageSendToBridge, client) |
| 130 d.addErrback(lambda failure: failure.trap(exceptions.CancelError)) | 130 d.addErrback(lambda failure: failure.trap(exceptions.CancelError)) |
| 131 return d.callback(mess_data) | 131 return d.callback(mess_data) |
| 132 | 132 |
| 133 def discoCallback(entities, to_jid_s): | 133 def discoCallback(entities, to_jid_s): |
| 134 history_data = copy.deepcopy(mess_data) | 134 history_data = copy.deepcopy(mess_data) |