Mercurial > libervia-backend

diff src/plugins/plugin_exp_parrot.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 200cd707a46d
line wrap: on
line diff
--- a/src/plugins/plugin_exp_parrot.py	Sun Jun 19 22:22:13 2016 +0200
+++ b/src/plugins/plugin_exp_parrot.py	Mon Jun 20 18:41:53 2016 +0200
@@ -67,12 +67,12 @@
     #        log.debug("Parrot link detected, skipping other triggers")
     #        raise trigger.SkipOtherTriggers
 
-    def MessageReceivedTrigger(self, client, message, post_treat):
+    def MessageReceivedTrigger(self, client, message_elt, 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"])
+        from_jid = message_elt["from"]
 
         try:
             _links = client.parrot_links
@@ -83,7 +83,7 @@
             return True
 
         message = {}
-        for e in message.elements(C.NS_CLIENT, 'body'):
+        for e in message_elt.elements(C.NS_CLIENT, 'body'):
             body = unicode(e)
             lang = e.getAttribute('lang') or ''
 
@@ -106,12 +106,12 @@
 
         return True
 
-    def addParrot(self, source_jid, dest_jid, profile):
+    def addParrot(self, client, source_jid, dest_jid):
         """Add a parrot link from one entity to another one
+
         @param source_jid: entity from who messages will be repeated
         @param dest_jid: entity where the messages will be repeated
-        @param profile: %(doc_profile_key)s"""
-        client = self.host.getClient(profile)
+        """
         try:
             _links = client.parrot_links
         except AttributeError:
@@ -120,17 +120,17 @@
         _links[source_jid.userhostJID()] = dest_jid
         log.info(u"Parrot mode: %s will be repeated to %s" % (source_jid.userhost(), unicode(dest_jid)))
 
-    def removeParrot(self, source_jid, profile):
+    def removeParrot(self, client, source_jid):
         """Remove parrot link
+
         @param source_jid: this entity will no more be repeated
-        @param profile: %(doc_profile_key)s"""
-        client = self.host.getClient(profile)
+        """
         try:
             del client.parrot_links[source_jid.userhostJID()]
         except (AttributeError, KeyError):
             pass
 
-    def cmd_parrot(self, mess_data, profile):
+    def cmd_parrot(self, client, mess_data):
         """activate Parrot mode between 2 entities, in both directions."""
         log.debug("Catched parrot command")
         txt_cmd = self.host.plugins[C.TEXT_CMDS]
@@ -140,19 +140,19 @@
             if not link_left_jid.user or not link_left_jid.host:
                 raise jid.InvalidFormat
         except (RuntimeError, jid.InvalidFormat, AttributeError):
-            txt_cmd.feedBack("Can't activate Parrot mode for invalid jid", mess_data, profile)
+            txt_cmd.feedBack(client, "Can't activate Parrot mode for invalid jid", mess_data)
             return False
 
         link_right_jid = mess_data['to']
 
-        self.addParrot(link_left_jid, link_right_jid, profile)
-        self.addParrot(link_right_jid, link_left_jid, profile)
+        self.addParrot(client, link_left_jid, link_right_jid)
+        self.addParrot(client, link_right_jid, link_left_jid)
 
-        txt_cmd.feedBack("Parrot mode activated for %s" % (unicode(link_left_jid), ), mess_data, profile)
+        txt_cmd.feedBack(client, "Parrot mode activated for {}".format(unicode(link_left_jid)), mess_data)
 
         return False
 
-    def cmd_unparrot(self, mess_data, profile):
+    def cmd_unparrot(self, client, mess_data):
         """remove Parrot mode between 2 entities, in both directions."""
         log.debug("Catched unparrot command")
         txt_cmd = self.host.plugins[C.TEXT_CMDS]
@@ -162,14 +162,14 @@
             if not link_left_jid.user or not link_left_jid.host:
                 raise jid.InvalidFormat
         except jid.InvalidFormat:
-            txt_cmd.feedBack("Can't deactivate Parrot mode for invalid jid", mess_data, profile)
+            txt_cmd.feedBack(client, u"Can't deactivate Parrot mode for invalid jid", mess_data)
             return False
 
         link_right_jid = mess_data['to']
 
-        self.removeParrot(link_left_jid, profile)
-        self.removeParrot(link_right_jid, profile)
+        self.removeParrot(client, link_left_jid)
+        self.removeParrot(client, link_right_jid)
 
-        txt_cmd.feedBack("Parrot mode deactivated for %s and %s" % (unicode(link_left_jid), unicode(link_right_jid)), mess_data, profile)
+        txt_cmd.feedBack(client, u"Parrot mode deactivated for {} and {}".format(unicode(link_left_jid), unicode(link_right_jid)), mess_data)
 
         return False