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

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_exp_parrot.py	Mon Apr 18 18:35:19 2016 +0200
+++ b/src/plugins/plugin_exp_parrot.py	Tue May 24 22:11:04 2016 +0200
@@ -43,22 +43,21 @@
     """Parrot mode plugin: repeat messages from one entity or MUC room to another one"""
     #XXX: This plugin can be potentially dangerous if we don't trust entities linked
     #     this is specially true if we have other triggers.
-    #     sendMessageTrigger avoid other triggers execution, it's deactivated to allow
+    #     messageSendTrigger avoid other triggers execution, it's deactivated to allow
     #     /unparrot command in text commands plugin.
 
     def __init__(self, host):
         log.info(_("Plugin Parrot initialization"))
         self.host = host
         host.trigger.add("MessageReceived", self.MessageReceivedTrigger, priority=100)
-        #host.trigger.add("sendMessage", self.sendMessageTrigger, priority=100)
+        #host.trigger.add("messageSend", self.messageSendTrigger, priority=100)
         try:
             self.host.plugins[C.TEXT_CMDS].registerTextCommands(self)
         except KeyError:
             log.info(_("Text commands not available"))
 
-    #def sendMessageTrigger(self, mess_data, treatments, profile):
+    #def messageSendTrigger(self, client, mess_data, treatments):
     #    """ Deactivate other triggers if recipient is in parrot links """
-    #    client = self.host.getClient(profile)
     #    try:
     #        _links = client.parrot_links
     #    except AttributeError:
@@ -68,8 +67,10 @@
     #        log.debug("Parrot link detected, skipping other triggers")
     #        raise trigger.SkipOtherTriggers
 
-    def MessageReceivedTrigger(self, message, post_treat, profile):
+    def MessageReceivedTrigger(self, client, message, post_treat):
         """ Check if source is linked and repeat message, else do nothing  """
+        # TODO: many things are not repeated (subject, thread, etc)
+        profile = client.profile
         client = self.host.getClient(profile)
         from_jid = jid.JID(message["from"])
 
@@ -81,28 +82,27 @@
         if not from_jid.userhostJID() in _links:
             return True
 
-        for e in message.elements():
-            if e.name == "body":
-                mess_body = e.children[0] if e.children else ""
+        message = {}
+        for e in message.elements(C.NS_CLIENT, 'body'):
+            body = unicode(e)
+            lang = e.getAttribute('lang') or ''
 
-                try:
-                    entity_type = self.host.memory.getEntityData(from_jid, ['type'], profile)["type"]
-                except (UnknownEntityError, KeyError):
-                    entity_type = "contact"
-                if entity_type == 'chatroom':
-                    src_txt = from_jid.resource
-                    if src_txt == self.host.plugins["XEP-0045"].getRoomNick(from_jid.userhostJID(), profile):
-                        #we won't repeat our own messages
-                        return True
-                else:
-                    src_txt = from_jid.user
-                msg = "[%s] %s" % (src_txt, mess_body)
+            try:
+                entity_type = self.host.memory.getEntityData(from_jid, ['type'], profile)["type"]
+            except (UnknownEntityError, KeyError):
+                entity_type = "contact"
+            if entity_type == 'chatroom':
+                src_txt = from_jid.resource
+                if src_txt == self.host.plugins["XEP-0045"].getRoomNick(from_jid.userhostJID(), profile):
+                    #we won't repeat our own messages
+                    return True
+            else:
+                src_txt = from_jid.user
+            message[lang] = u"[{}] {}".format(src_txt, body)
 
-                linked = _links[from_jid.userhostJID()]
+            linked = _links[from_jid.userhostJID()]
 
-                self.host.sendMessage(jid.JID(unicode(linked)), msg, None, "auto", no_trigger=True, profile_key=profile)
-        else:
-            log.warning("No body element found in message, following normal behaviour")
+            self.host.messageSend(jid.JID(unicode(linked)), message, None, "auto", no_trigger=True, profile_key=profile)
 
         return True