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

Move handle_presence to presence mod

Browse source
This commit is contained in:
xmppftw 2023-12-29 18:08:04 +01:00 committed by xmppftw@kl.netlib.re
parent 82bb418cf3
commit bc28a77d5f
2 changed files with 55 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
xmpp/src/lib.rs
View file

@ -23,10 +23,7 @@ use tokio_xmpp::parsers::{
http_upload::{Header as HttpUploadHeader, SlotRequest, SlotResult},
iq::{Iq, IqType},
message::{Body, Message, MessageType},
muc::{
user::{MucUser, Status},
Muc,
},
muc::{user::MucUser, Muc},
ns,
presence::{Presence, Type as PresenceType},
private::Query as PrivateXMLQuery,
@ -40,8 +37,9 @@ pub use tokio_xmpp::{BareJid, Element, FullJid, Jid};
#[macro_use]
extern crate log;
mod message;
mod pubsub;
pub mod message;
pub mod presence;
pub mod pubsub;
pub type Error = tokio_xmpp::Error;
@ -497,44 +495,6 @@ impl Agent {
}
}
/// Translate a `Presence` stanza into a list of higher-level `Event`s.
async fn handle_presence(&mut self, presence: Presence) -> Vec<Event> {
// Allocate an empty vector to store the events.
let mut events = vec![];
// Extract the JID of the sender (i.e. the one whose presence is being sent).
let from = presence.from.unwrap().to_bare();
// Search through the payloads for a MUC user status.
if let Some(muc) = presence
.payloads
.iter()
.filter_map(|p| MucUser::try_from(p.clone()).ok())
.next()
{
// If a MUC user status was found, search through the statuses for a self-presence.
if muc.status.iter().any(|s| *s == Status::SelfPresence) {
// If a self-presence was found, then the stanza is about the client's own presence.
match presence.type_ {
PresenceType::None => {
// According to https://xmpp.org/extensions/xep-0045.html#enter-pres, no type should be seen as "available".
events.push(Event::RoomJoined(from.clone()));
}
PresenceType::Unavailable => {
// According to https://xmpp.org/extensions/xep-0045.html#exit, the server will use type "unavailable" to notify the client that it has left the room/
events.push(Event::RoomLeft(from.clone()));
}
_ => unimplemented!("Presence type {:?}", presence.type_), // TODO: What to do here?
}
}
}
// Return the list of events.
events
}
/// Wait for new events.
///
/// # Returns
@ -581,7 +541,7 @@ impl Agent {
events.extend(new_events);
} else if elem.is("presence", "jabber:client") {
let presence = Presence::try_from(elem).unwrap();
let new_events = self.handle_presence(presence).await;
let new_events = presence::handle_presence(self, presence).await;
events.extend(new_events);
} else if elem.is("error", "http://etherx.jabber.org/streams") {
println!("Received a fatal stream error: {}", String::from(&elem));

50
xmpp/src/presence/mod.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::{
muc::user::{MucUser, Status},
presence::{Presence, Type as PresenceType},
};
use crate::{Agent, Event};
/// Translate a `Presence` stanza into a list of higher-level `Event`s.
pub async fn handle_presence(_agent: &mut Agent, presence: Presence) -> Vec<Event> {
// Allocate an empty vector to store the events.
let mut events = vec![];
// Extract the JID of the sender (i.e. the one whose presence is being sent).
let from = presence.from.unwrap().to_bare();
// Search through the payloads for a MUC user status.
if let Some(muc) = presence
.payloads
.iter()
.filter_map(|p| MucUser::try_from(p.clone()).ok())
.next()
{
// If a MUC user status was found, search through the statuses for a self-presence.
if muc.status.iter().any(|s| *s == Status::SelfPresence) {
// If a self-presence was found, then the stanza is about the client's own presence.
match presence.type_ {
PresenceType::None => {
// According to https://xmpp.org/extensions/xep-0045.html#enter-pres, no type should be seen as "available".
events.push(Event::RoomJoined(from.clone()));
}
PresenceType::Unavailable => {
// According to https://xmpp.org/extensions/xep-0045.html#exit, the server will use type "unavailable" to notify the client that it has left the room/
events.push(Event::RoomLeft(from.clone()));
}
_ => unimplemented!("Presence type {:?}", presence.type_), // TODO: What to do here?
}
}
}
// Return the list of events.
events
}