libervia-backend: libervia/backend/plugins/plugin_xep

comparison libervia/backend/plugins/plugin_xep_0045.py @ 4155:453e53dfc50e

plugin XEP-0045: user normal workflow for history + `get_room_user_jid` method: - workflow is now using the normal messages workflow even for history message: previous workflow was dedicated to MUC and only adding message to history, resulting in other plugins being skipped. - new `get_room_user_jid` helps to retrieve easily the JID currently used in a joined room.

author	Goffi <goffi@goffi.org>
date	Wed, 22 Nov 2023 15:00:57 +0100
parents	d861ad696797
children	6784d07b99c8

comparison

equal deleted inserted replaced

-:85f5e6225aa1
+:453e53dfc50e
 if stanza_id:
 data["extra"]["stanza_id"] = stanza_id
 def message_received_trigger(self, client, message_elt, post_treat):
 if message_elt.getAttribute("type") == C.MESS_TYPE_GROUPCHAT:
-if message_elt.subject or message_elt.delay:
+if message_elt.subject:
 return False
 from_jid = jid.JID(message_elt['from'])
 room_jid = from_jid.userhostJID()
 if room_jid in client._muc_client.joined_rooms:
 room = client._muc_client.joined_rooms[room_jid]
 if peer_jid.resource:
 if not self.is_room(client, peer_jid):
 return peer_jid.userhostJID()
 return peer_jid
+def get_room_user_jid(self, client: SatXMPPEntity, room_jid: jid.JID) -> jid.JID:
+"""Get the nick used in the room
+@param room_jid: jid of the room to use
+@return: JID used in room
+@raise exceptions.NotFound: this room has not been joined
+@raise exceptions.InternalError: invalid room_jid
+"""
+# FIXME: doesn't check if room is anonymous or not
+# TODO: check if room is (semi)anonymous
+if room_jid.resource:
+raise exceptions.InternalError(f"{room_jid} should not have a ressource.")
+room = self.get_room(client, room_jid)
+return jid.JID(tuple=(room_jid.user, room_jid.host, room.nick))
 def _get_room_joined_args(self, room, profile):
 return [
 room.roomJID.userhost(),
 XEP_0045._get_occupants(room),
 room.nick,
 try:
 mam_data = await self._mam.get_archives(client, mam_req,
 service=room_jid)
 except xmpp_error.StanzaError as e:
 if last_mess and e.condition == 'item-not-found':
-log.info(
+log.warning(
 f"requested item (with id {stanza_id!r}) can't be found in "
 f"history of {room_jid}, history has probably been purged on "
 f"server.")
 # we get last items like for a new room
 rsm_req = rsm.RSMRequest(max_=50, before='')
 if fwd_message_elt.getAttribute("to"):
 log.warning(
 'Forwarded message element has a "to" attribute while it is '
 'forbidden by specifications')
 fwd_message_elt["to"] = client.jid.full()
-try:
+client.messageProt.onMessage(fwd_message_elt)
-mess_data = client.messageProt.parse_message(fwd_message_elt)
-except Exception as e:
-log.error(
-f"Can't parse message, ignoring it: {e}\n"
-f"{fwd_message_elt.toXml()}"
-)
-continue
-# we attache parsed message data to element, to avoid parsing
-# again in _add_to_history
-fwd_message_elt._mess_data = mess_data
-# and we inject to MUC workflow
 client._muc_client._onGroupChat(fwd_message_elt)
 if not count:
 log.info(_("No message received while offline in {room_jid}".format(
 room_jid=room_jid)))
 ## messages ##
 def receivedGroupChat(self, room, user, body):
 log.debug('receivedGroupChat: room=%s user=%s body=%s' % (room.roomJID.full(), user, body))
-def _add_to_history(self, __, user, message):
-try:
-# message can be already parsed (with MAM), in this case mess_data
-# it attached to the element
-mess_data = message.element._mess_data
-except AttributeError:
-mess_data = self.client.messageProt.parse_message(message.element)
-if mess_data['message'] or mess_data['subject']:
-return defer.ensureDeferred(
-self.host.memory.add_to_history(self.client, mess_data)
-)
-else:
-return defer.succeed(None)
-def _add_to_history_eb(self, failure):
-failure.trap(exceptions.CancelError)
-def receivedHistory(self, room, user, message):
-"""Called when history (backlog) message are received
-we check if message is not already in our history
-and add it if needed
-@param room(muc.Room): room instance
-@param user(muc.User, None): the user that sent the message
-None if the message come from the room
-@param message(muc.GroupChat): the parsed message
-"""
-if room.state != ROOM_STATE_SELF_PRESENCE:
-log.warning(_(
-"received history in unexpected state in room {room} (state: "
-"{state})").format(room = room.roomJID.userhost(),
-state = room.state))
-if not hasattr(room, "_history_d"):
-# XXX: this hack is due to buggy behaviour seen in the wild because of the
-#      "mod_delay" prosody module being activated. This module add an
-#      unexpected <delay> elements which break our workflow.
-log.warning(_("storing the unexpected message anyway, to avoid loss"))
-# we have to restore URI which are stripped by wokkel parsing
-for c in message.element.elements():
-if c.uri is None:
-c.uri = C.NS_CLIENT
-mess_data = self.client.messageProt.parse_message(message.element)
-message.element._mess_data = mess_data
-self._add_to_history(None, user, message)
-if mess_data['message'] or mess_data['subject']:
-self.host.bridge.message_new(
-*self.client.message_get_bridge_args(mess_data),
-profile=self.client.profile
-)
-return
-room._history_d.addCallback(self._add_to_history, user, message)
-room._history_d.addErrback(self._add_to_history_eb)
 ## subject ##
 def groupChatReceived(self, message):
 """
 A group chat message has been received from a MUC room.
 if message.subject is not None:
 self.receivedSubject(room, user, message.subject)
 elif message.delay is None:
 self.receivedGroupChat(room, user, message)
-else:
-self.receivedHistory(room, user, message)
 def subject(self, room, subject):
 return muc.MUCClientProtocol.subject(self, room, subject)
 def _history_cb(self, __, room):

Mercurial > libervia-backend

comparison libervia/backend/plugins/plugin_xep_0045.py @ 4155:453e53dfc50e