libervia-backend: sat/plugins/plugin_xep

plugin XEP-0045: fix `/join` text command

comparison

equal deleted inserted replaced

-:f19718296c20
+:ae5f63e5ed2c
 """join a new room
 @command (all): JID
 - JID: room to join (on the same service if full jid is not specified)
 """
-if mess_data["unparsed"].strip():
+room_raw = mess_data["unparsed"].strip()
-room_jid = self.text_cmds.getRoomJID(mess_data["unparsed"].strip(), mess_data["to"].host)
+if room_raw:
-nick = (self.getRoomNick(client, room_jid) or
+if self.isJoinedRoom(client, mess_data["to"]):
-client.jid.user)
+# we use the same service as the one from the room where the command has
+# been entered if full jid is not entered
+muc_service = mess_data["to"].host
+nick = self.getRoomNick(client, mess_data["to"]) or client.jid.user
+else:
+# the command has been entered in a one2one conversation, so we use
+# our server MUC service as default service
+muc_service = client.muc_service or ""
+nick = client.jid.user
+room_jid = self.text_cmds.getRoomJID(room_raw, muc_service)
 self.join(client, room_jid, nick, {})
 return False
 def cmd_leave(self, client, mess_data):
 """quit a room
 @command (group): [ROOM_JID]
 - ROOM_JID: jid of the room to live (current room if not specified)
 """
-if mess_data["unparsed"].strip():
+room_raw = mess_data["unparsed"].strip()
-room = self.text_cmds.getRoomJID(mess_data["unparsed"].strip(), mess_data["to"].host)
+if room_raw:
+room = self.text_cmds.getRoomJID(room_raw, mess_data["to"].host)
 else:
 room = mess_data["to"]
 self.leave(client, room)

Mercurial > libervia-backend