Mercurial > libervia-backend

diff src/plugins/plugin_misc_text_commands.py @ 1955:633b5c21aefd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backend, frontend: messages refactoring (huge commit, not finished): /!\ database schema has been modified, do a backup before updating message have been refactored, here are the main changes: - languages are now handled - all messages have an uid (internal to SàT) - message updating is anticipated - subject is now first class - new naming scheme is used newMessage => messageNew, getHistory => historyGet, sendMessage => messageSend - minimal compatibility refactoring in quick_frontend/Primitivus, better refactoring should follow - threads handling - delayed messages are saved into history - info messages may also be saved in history (e.g. to keep track of people joining/leaving a room) - duplicate messages should be avoided - historyGet return messages in right order, no need to sort again - plugins have been updated to follow new features, some of them need to be reworked (e.g. OTR) - XEP-0203 (Delayed Delivery) is now fully handled in core, the plugin just handle disco and creation of a delay element - /!\ jp and Libervia are currently broken, as some features of Primitivus It has been put in one huge commit to avoid breaking messaging between changes. This is the main part of message refactoring, other commits will follow to take profit of the new features/behaviour.
author Goffi <goffi@goffi.org>
date Tue, 24 May 2016 22:11:04 +0200
parents 2daf7b4c6756
children a2bc5089c2eb
line wrap: on
line diff
--- a/src/plugins/plugin_misc_text_commands.py	Mon Apr 18 18:35:19 2016 +0200
+++ b/src/plugins/plugin_misc_text_commands.py	Tue May 24 22:11:04 2016 +0200
@@ -58,7 +58,7 @@
     def __init__(self, host):
         log.info(_("Text commands initialization"))
         self.host = host
-        host.trigger.add("sendMessage", self.sendMessageTrigger)
+        host.trigger.add("messageSend", self.messageSendTrigger)
         self._commands = {}
         self._whois = []
         self.registerTextCommands(self)
@@ -166,12 +166,12 @@
         self._whois.append((priority, callback))
         self._whois.sort(key=lambda item: item[0], reverse=True)
 
-    def sendMessageTrigger(self, mess_data, pre_xml_treatments, post_xml_treatments, profile):
-        """ Install SendMessage command hook """
-        pre_xml_treatments.addCallback(self._sendMessageCmdHook, profile)
+    def messageSendTrigger(self, client, mess_data, pre_xml_treatments, post_xml_treatments):
+        """Install SendMessage command hook """
+        pre_xml_treatments.addCallback(self._messageSendCmdHook, client)
         return True
 
-    def _sendMessageCmdHook(self, mess_data, profile):
+    def _messageSendCmdHook(self, mess_data, client):
         """ Check text commands in message, and react consequently
 
         msg starting with / are potential command. If a command is found, it is executed, else and help message is sent
@@ -179,14 +179,25 @@
         commands can abord message sending (if they return anything evaluating to False), or continue it (if they return True), eventually after modifying the message
         an "unparsed" key is added to message, containing part of the message not yet parsed
         commands can be deferred or not
-        @param mess_data(dict): data comming from sendMessage trigger
+        @param mess_data(dict): data comming from messageSend trigger
         @param profile: %(doc_profile)s
         """
-        msg = mess_data["message"]
+        profile = client.profile
+        try:
+            msg = mess_data["message"]['']
+            msg_lang = ''
+        except KeyError:
+            try:
+                # we have not default message, we try to take the first found
+                msg_lang, msg = mess_data["message"].iteritems().next()
+            except StopIteration:
+                log.debug(u"No message found, skipping text commands")
+                return mess_data
+
         try:
             if msg[:2] == '//':
                 # we have a double '/', it's the escape sequence
-                mess_data["message"] = msg[1:]
+                mess_data["message"][msg_lang] = msg[1:]
                 return mess_data
             if msg[0] != '/':
                 return mess_data
@@ -242,7 +253,7 @@
     def _contextValid(self, mess_data, cmd_data):
         """Tell if a command can be used in the given context
 
-        @param mess_data(dict): message data as given in sendMessage trigger
+        @param mess_data(dict): message data as given in messageSend trigger
         @param cmd_data(dict): command data as returned by self._parseDocString
         @return (bool): True if command can be used in this context
         """
@@ -272,7 +283,7 @@
         else:
             _from = self.host.getJidNStream(profile)[0]
 
-        self.host.bridge.newMessage(unicode(mess_data["to"]), message, C.MESS_TYPE_INFO, unicode(_from), {}, profile=profile)
+        self.host.bridge.messageNew(unicode(mess_data["to"]), {'': message}, {}, C.MESS_TYPE_INFO, unicode(_from), {}, profile=profile)
 
     def cmd_whois(self, mess_data, profile):
         """show informations on entity