pep/xmpp-rs-mirror
1
0
Fork 0
mirror of https://gitlab.com/xmpp-rs/xmpp-rs.git synced 2024-07-12 22:21:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move handling of MessageType::Chat to message::receive::chat module

Browse source
This commit is contained in:
xmppftw@kl.netlib.re 2023-12-30 13:18:12 +01:00
parent 3ce259b143
commit e3fcdf1428
2 changed files with 57 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
xmpp/src/message/receive/chat.rs Normal file
View file

@ -0,0 +1,50 @@
// Copyright (c) 2023 xmpp-rs contributors.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
use tokio_xmpp::{
parsers::{message::Message, muc::user::MucUser},
Jid,
};
use crate::{Agent, Event};
pub async fn handle_message_chat(
agent: &mut Agent,
events: &mut Vec<Event>,
from: Jid,
message: &Message,
) {
let langs: Vec<&str> = agent.lang.iter().map(String::as_str).collect();
if let Some((_lang, body)) = message.get_best_body(langs) {
let mut found_special_message = false;
for payload in &message.payloads {
if let Ok(_) = MucUser::try_from(payload.clone()) {
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.to_bare(),
full.resource_str().to_owned(),
body.clone(),
),
};
found_special_message = true;
events.push(event);
}
}
if !found_special_message {
let event = Event::ChatMessage(message.id.clone(), from.to_bare(), body.clone());
events.push(event);
}
}
}

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

@ -4,69 +4,30 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
use tokio_xmpp::{
parsers::{
message::{Message, MessageType},
muc::user::MucUser,
ns,
},
Jid,
use tokio_xmpp::parsers::{
message::{Message, MessageType},
ns,
};
use crate::{pubsub, Agent, Event};
pub mod chat;
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 langs: Vec<&str> = agent.lang.iter().map(String::as_str).collect();
let langs = agent.lang.to_vec();
let langs = langs.iter().map(|x| x.as_str()).collect();
match message.type_ {
MessageType::Groupchat => {
group_chat::handle_message_group_chat(agent, &mut events, from.clone(), &message).await;
}
MessageType::Chat | MessageType::Normal => {
chat::handle_message_chat(agent, &mut events, from.clone(), &message).await;
}
_ => {}
}
match message.get_best_body(langs) {
Some((_lang, body)) => match message.type_ {
MessageType::Chat | MessageType::Normal => {
let mut found_special_message = false;
for payload in &message.payloads {
if let Ok(_) = MucUser::try_from(payload.clone()) {
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.to_bare(),
full.resource_str().to_owned(),
body.clone(),
),
};
found_special_message = true;
events.push(event);
}
}
if !found_special_message {
let event =
Event::ChatMessage(message.id.clone(), from.to_bare(), body.clone());
events.push(event)
}
}
_ => (),
},
None => (),
}
for child in message.payloads {
if child.is("event", ns::PUBSUB_EVENT) {
let new_events = pubsub::handle_event(&from, child, agent).await;