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

xmpp: RoomNick is newtype wrapper for ResourcePart

Browse source
This commit is contained in:
xmppftw xmppftw 2024-12-18 12:44:59 +01:00 • committed by xmpp ftw
commit 3fd8285a29
6 changed files with 53 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,7 @@ use tokio_xmpp::{
parsers::{message::Message, muc::user::MucUser},
};
use crate::{delay::StanzaTimeInfo, Agent, Event};
use crate::{delay::StanzaTimeInfo, Agent, Event, RoomNick};
pub async fn handle_message_chat(
agent: &mut Agent,
@ -38,7 +38,7 @@ pub async fn handle_message_chat(
Ok(full) => Event::RoomPrivateMessage(
message.id.clone(),
full.to_bare(),
full.resource().into(),
RoomNick::from_resource_ref(full.resource()),
body.clone(),
time_info.clone(),
),

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

@ -6,7 +6,7 @@
use tokio_xmpp::{jid::Jid, parsers::message::Message};
use crate::{delay::StanzaTimeInfo, Agent, Event};
use crate::{delay::StanzaTimeInfo, Agent, Event, RoomNick};
pub async fn handle_message_group_chat(
agent: &mut Agent,
@ -20,7 +20,7 @@ pub async fn handle_message_group_chat(
if let Some((_lang, subject)) = message.get_best_subject(langs.clone()) {
events.push(Event::RoomSubject(
from.to_bare(),
from.resource().map(Into::into),
from.resource().map(RoomNick::from_resource_ref),
subject.0.clone(),
time_info.clone(),
));
@ -31,7 +31,7 @@ pub async fn handle_message_group_chat(
Ok(full) => Event::RoomMessage(
message.id.clone(),
from.to_bare(),
full.resource().into(),
RoomNick::from_resource_ref(full.resource()),
body.clone(),
time_info,
),