Mercurial > libervia-backend

diff src/core/sat_main.py @ 1963:a2bc5089c2eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 19b9d3f8a6c7
line wrap: on
line diff
--- a/src/core/sat_main.py	Sun Jun 19 22:22:13 2016 +0200
+++ b/src/core/sat_main.py	Mon Jun 20 18:41:53 2016 +0200
@@ -95,7 +95,7 @@
         self.bridge.register("getParamsUI", self.memory.getParamsUI)
         self.bridge.register("getParamsCategories", self.memory.getParamsCategories)
         self.bridge.register("paramsRegisterApp", self.memory.paramsRegisterApp)
-        self.bridge.register("historyGet", self.memory.historyGet)
+        self.bridge.register("historyGet", self.memory._historyGet)
         self.bridge.register("setPresence", self._setPresence)
         self.bridge.register("subscription", self.subscription)
         self.bridge.register("addContact", self._addContact)
@@ -553,11 +553,11 @@
         for lang, subject in data["subject"].iteritems():
             subject_elt = message_elt.addElement("subject", content=subject)
             if lang:
-                subject_elt['xml:lang'] = lang
+                subject_elt[(C.NS_XML, 'lang')] = lang
         for lang, message in data["message"].iteritems():
             body_elt = message_elt.addElement("body", content=message)
             if lang:
-                body_elt['xml:lang'] = lang
+                body_elt[(C.NS_XML, 'lang')] = lang
         try:
             thread = data['extra']['thread']
         except KeyError:
@@ -646,21 +646,21 @@
 
         pre_xml_treatments.addCallback(lambda dummy: self.generateMessageXML(data))
         pre_xml_treatments.chainDeferred(post_xml_treatments)
-        post_xml_treatments.addCallback(self._sendMessageToStream, client)
+        post_xml_treatments.addCallback(self.messageSendToStream, client)
         if send_only:
             log.debug(_("Triggers, storage and echo have been inhibited by the 'send_only' parameter"))
         else:
-            post_xml_treatments.addCallback(self._storeMessage, client)
-            post_xml_treatments.addCallback(self.sendMessageToBridge, client)
+            post_xml_treatments.addCallback(self.messageAddToHistory, client)
+            post_xml_treatments.addCallback(self.messageSendToBridge, client)
             post_xml_treatments.addErrback(self._cancelErrorTrap)
         pre_xml_treatments.callback(data)
         return pre_xml_treatments
 
-    def _cancelErrorTrap(failure):
+    def _cancelErrorTrap(self, failure):
         """A message sending can be cancelled by a plugin treatment"""
         failure.trap(exceptions.CancelError)
 
-    def _sendMessageToStream(self, data, client):
+    def messageSendToStream(self, data, client):
         """Actualy send the message to the server
 
         @param data: message data dictionnary
@@ -669,7 +669,7 @@
         client.xmlstream.send(data['xml'])
         return data
 
-    def _storeMessage(self, data, client):
+    def messageAddToHistory(self, data, client):
         """Store message into database (for local history)
 
         @param data: message data dictionnary
@@ -678,13 +678,13 @@
         if data["type"] != C.MESS_TYPE_GROUPCHAT:
             # we don't add groupchat message to history, as we get them back
             # and they will be added then
-            if data['message']: # we need a message to save something
+            if data['message'] or data['subject']: # we need a message to store
                 self.memory.addToHistory(client, data)
             else:
                log.warning(u"No message found") # empty body should be managed by plugins before this point
         return data
 
-    def sendMessageToBridge(self, data, client):
+    def messageSendToBridge(self, data, client):
         """Send message to bridge, so frontends can display it
 
         @param data: message data dictionnary
@@ -693,7 +693,7 @@
         if data["type"] != C.MESS_TYPE_GROUPCHAT:
             # we don't send groupchat message to bridge, as we get them back
             # and they will be added the
-            if data['message']: # we need a message to send something
+            if data['message'] or data['subject']: # we need a message to send something
                 # We send back the message, so all frontends are aware of it
                 self.bridge.messageNew(data['uid'], data['timestamp'], data['from'].full(), data['to'].full(), data['message'], data['subject'], data['type'], data['extra'], profile=client.profile)
             else:
@@ -1039,6 +1039,7 @@
 
     def importMenu(self, path, callback, security_limit=C.NO_SECURITY_LIMIT, help_string="", type_=C.MENU_GLOBAL):
         """register a new menu for frontends
+
         @param path: path to go to the menu (category/subcategory/.../item), must be an iterable (e.g.: ("File", "Open"))
             /!\ use D_() instead of _() for translations (e.g. (D_("File"), D_("Open")))
         @param callback: method to be called when menuitem is selected, callable or a callback id (string) as returned by [registerCallback]