pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Event::RoomPrivateMessage for MUC PMs (#85)

Browse source
This commit is contained in:
xmppftw 2023-06-07 16:21:17 +02:00 committed by pep
parent 4701f6bb69
commit 6144a4c8b0
1 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
xmpp/src/lib.rs
View file

@ -90,6 +90,9 @@ pub enum Event {
RoomJoined(BareJid),
RoomLeft(BareJid),
RoomMessage(Id, BareJid, RoomNick, Body),
/// A private message received from a room, containing the message ID, the room's BareJid,
/// the sender's FullJid, the corresponding nickname, and the message body.
RoomPrivateMessage(Id, BareJid, FullJid, RoomNick, Body),
ServiceMessage(Id, BareJid, Body),
HttpUploadedFile(String),
}
@ -359,9 +362,38 @@ impl Agent {
events.push(event)
}
MessageType::Chat | MessageType::Normal => {
let event =
Event::ChatMessage(message.id.clone(), from.clone().into(), body.clone());
events.push(event)
let mut found_special_message = false;
for payload in &message.payloads {
if payload.is("x", xmpp_parsers::ns::MUC_USER) {
let event = match from.clone() {
Jid::Bare(bare) => {
// TODO: Can a service message be of type Chat/Normal and not Groupchat?
warn!("Received misformed MessageType::Chat in muc#user namespace from a bare JID.");
Event::ServiceMessage(message.id.clone(), bare, body.clone())
}
Jid::Full(full) => Event::RoomPrivateMessage(
message.id.clone(),
full.clone().into(),
full.clone(),
full.resource,
body.clone(),
),
};
found_special_message = true;
events.push(event);
}
}
if !found_special_message {
let event = Event::ChatMessage(
message.id.clone(),
from.clone().into(),
body.clone(),
);
events.push(event)
}
}
_ => (),
},