diff src/plugins/plugin_xep_0249.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 2daf7b4c6756
children 200cd707a46d
line wrap: on
line diff
--- a/src/plugins/plugin_xep_0249.py	Sun Jun 19 22:22:13 2016 +0200
+++ b/src/plugins/plugin_xep_0249.py	Mon Jun 20 18:41:53 2016 +0200
@@ -125,13 +125,9 @@
 
         @param room (jid.JID): JID of the room
         """
-        profile = self.host.memory.getProfileName(profile_key)
-        if not profile:
-            log.error(_("Profile doesn't exists !"))
-            return
-        log.info(_(u'Invitation accepted for room %(room)s [%(profile)s]') % {'room': room_jid.userhost(), 'profile': profile})
-        _jid, xmlstream = self.host.getJidNStream(profile)
-        d = self.host.plugins["XEP-0045"].join(room_jid, _jid.user, {}, profile)
+        client = self.host.getClient(profile_key)
+        log.info(_(u'Invitation accepted for room %(room)s [%(profile)s]') % {'room': room_jid.userhost(), 'profile': client.profile})
+        d = self.host.plugins["XEP-0045"].join(client, room_jid, client.jid.user, {})
         return d
 
     def onInvitation(self, message, profile):
@@ -165,23 +161,23 @@
             data = {"message": _("You have been invited by %(user)s to join the room %(room)s. Do you accept?") % {'user': from_jid_s, 'room': room_jid_s}, "title": _("MUC invitation")}
             self.host.askConfirmation(room_jid_s, "YES/NO", data, accept_cb, profile)
 
-    def cmd_invite(self, mess_data, profile):
+    def cmd_invite(self, client, mess_data):
         """invite someone in the room
 
         @command (group): JID
             - JID: the JID of the person to invite
         """
         contact_jid_s = mess_data["unparsed"].strip()
-        my_host = self.host.profiles[profile].jid.host
+        my_host = client.jid.host
         try:
             contact_jid = jid.JID(contact_jid_s)
         except (RuntimeError, jid.InvalidFormat, AttributeError):
             feedback = _(u"You must provide a valid JID to invite, like in '/invite contact@{host}'").format(host=my_host)
-            self.host.plugins[C.TEXT_CMDS].feedBack(feedback, mess_data, profile)
+            self.host.plugins[C.TEXT_CMDS].feedBack(client, feedback, mess_data)
             return False
         if not contact_jid.user:
             contact_jid.user, contact_jid.host = contact_jid.host, my_host
-        self.invite(contact_jid, mess_data["to"], {}, profile)
+        self.invite(contact_jid, mess_data["to"], {}, client.profile)
         return False