xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add StanzaTimeInfo for <delay> (XEP-0203)

Browse source
This commit is contained in:
xmppftw xmppftw 2023-12-31 21:06:15 +01:00
commit 3d9bdd6fe2
8 changed files with 114 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
xmpp/src/message/receive/chat.rs
View file

@ -9,13 +9,14 @@ use tokio_xmpp::{
Jid,
};
use crate::{Agent, Event};
use crate::{delay::StanzaTimeInfo, Agent, Event};
pub async fn handle_message_chat(
agent: &mut Agent,
events: &mut Vec<Event>,
from: Jid,
message: &Message,
time_info: StanzaTimeInfo,
) {
let langs: Vec<&str> = agent.lang.iter().map(String::as_str).collect();
if let Some((_lang, body)) = message.get_best_body(langs) {
@ -27,13 +28,19 @@ pub async fn handle_message_chat(
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())
Event::ServiceMessage(
message.id.clone(),
bare,
body.clone(),
time_info.clone(),
)
}
Jid::Full(full) => Event::RoomPrivateMessage(
message.id.clone(),
full.to_bare(),
full.resource_str().to_owned(),
body.clone(),
time_info.clone(),
),
};
@ -43,7 +50,8 @@ pub async fn handle_message_chat(
}
if !found_special_message {
let event = Event::ChatMessage(message.id.clone(), from.to_bare(), body.clone());
let event =
Event::ChatMessage(message.id.clone(), from.to_bare(), body.clone(), time_info);
events.push(event);
}
}

9
xmpp/src/message/receive/group_chat.rs
View file

@ -6,13 +6,14 @@
use tokio_xmpp::{parsers::message::Message, Jid};
use crate::{Agent, Event};
use crate::{delay::StanzaTimeInfo, Agent, Event};
pub async fn handle_message_group_chat(
agent: &mut Agent,
events: &mut Vec<Event>,
from: Jid,
message: &Message,
time_info: StanzaTimeInfo,
) {
let langs: Vec<&str> = agent.lang.iter().map(String::as_str).collect();
@ -21,6 +22,7 @@ pub async fn handle_message_group_chat(
from.to_bare(),
from.resource_str().map(String::from),
subject.0.clone(),
time_info.clone(),
));
}
@ -31,8 +33,11 @@ pub async fn handle_message_group_chat(
from.to_bare(),
full.resource_str().to_owned(),
body.clone(),
time_info,
),
Jid::Bare(bare) => Event::ServiceMessage(message.id.clone(), bare, body.clone()),
Jid::Bare(bare) => {
Event::ServiceMessage(message.id.clone(), bare, body.clone(), time_info)
}
};
events.push(event)
}

14
xmpp/src/message/receive/mod.rs
View file

@ -9,7 +9,7 @@ use tokio_xmpp::parsers::{
ns,
};
use crate::{pubsub, Agent, Event};
use crate::{delay::message_time_info, pubsub, Agent, Event};
pub mod chat;
pub mod group_chat;
@ -17,13 +17,21 @@ pub mod group_chat;
pub async fn handle_message(agent: &mut Agent, message: Message) -> Vec<Event> {
let mut events = vec![];
let from = message.from.clone().unwrap();
let time_info = message_time_info(&message);
match message.type_ {
MessageType::Groupchat => {
group_chat::handle_message_group_chat(agent, &mut events, from.clone(), &message).await;
group_chat::handle_message_group_chat(
agent,
&mut events,
from.clone(),
&message,
time_info,
)
.await;
}
MessageType::Chat | MessageType::Normal => {
chat::handle_message_chat(agent, &mut events, from.clone(), &message).await;
chat::handle_message_chat(agent, &mut events, from.clone(), &message, time_info).await;
}
_ => {}
}