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

Update to xmpp main (274baaef9afb)

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2024-08-30 19:24:17 +02:00
commit 77c193bfb6
2 changed files with 26 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/bot.rs
View file

@ -16,14 +16,14 @@
use crate::hook::{format_hook, GitlabHook};
use log::debug;
use tokio_xmpp::starttls::ServerConfig;
use xmpp::jid::{BareJid, Jid};
use xmpp::parsers::message::MessageType;
use xmpp::tokio_xmpp::connect::StartTlsServerConnector;
use xmpp::{Agent, ClientBuilder, ClientFeature, ClientType, Event};
pub struct XmppClient {
is_online: bool,
agent: Agent<ServerConfig>,
agent: Agent<StartTlsServerConnector>,
rooms: Vec<BareJid>,
nickname: String,
}
@ -46,33 +46,31 @@ impl XmppClient {
}
pub async fn next(&mut self) {
if let Some(events) = self.agent.wait_for_events().await {
for event in events {
match event {
Event::Online => {
self.is_online = true;
debug!("XMPP Online");
for event in self.agent.wait_for_events().await {
match event {
Event::Online => {
self.is_online = true;
debug!("XMPP Online");
for room in &self.rooms {
self.agent
.join_room(
room.clone(),
Some(self.nickname.clone()),
None,
"en",
"Hi there!",
)
.await
}
}
Event::Disconnected(e) => {
self.is_online = false;
debug!("XMPP Disconnected: {e}");
}
_ => {
debug!("XMPP Event not supported")
for room in &self.rooms {
self.agent
.join_room(
room.clone(),
Some(self.nickname.clone()),
None,
"en",
"Hi there!",
)
.await
}
}
Event::Disconnected(e) => {
self.is_online = false;
debug!("XMPP Disconnected: {e}");
}
_ => {
debug!("XMPP Event not supported")
}
}
}
}
@ -84,7 +82,7 @@ impl XmppClient {
for room in &self.rooms {
self.agent
.send_message(
Jid::Bare(room.clone()),
Jid::from(room.clone()),
MessageType::Groupchat,
"en",
&display,