Garmelon/euphoxide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Commands not being Send + Sync

Browse source
This commit is contained in:
Joscha 2024-12-27 19:05:35 +01:00
parent 4160d69a2b
commit 818b8748a1
1 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

48
euphoxide-bot/src/command.rs
View file

@ -8,13 +8,15 @@ use std::future::Future;
use async_trait::async_trait; use async_trait::async_trait;
use euphoxide::{ use euphoxide::{
api::{Data, Message, MessageId, ParsedPacket, Send, SendEvent, SendReply}, api::{self, Data, Message, MessageId, ParsedPacket, SendEvent, SendReply},
client::{ client::{
conn::ClientConnHandle, conn::ClientConnHandle,
state::{Joined, State}, state::{Joined, State},
}, },
}; };
use crate::{bot::BotEvent, instance::InstanceEvent};
#[non_exhaustive] #[non_exhaustive]
pub struct Context { pub struct Context {
pub conn: ClientConnHandle, pub conn: ClientConnHandle,
@ -27,7 +29,7 @@ impl Context {
content: S, content: S,
) -> euphoxide::Result<impl Future<Output = euphoxide::Result<SendReply>>> { ) -> euphoxide::Result<impl Future<Output = euphoxide::Result<SendReply>>> {
self.conn self.conn
.send(Send { .send(api::Send {
content: content.to_string(), content: content.to_string(),
parent: None, parent: None,
}) })
@ -45,7 +47,7 @@ impl Context {
content: S, content: S,
) -> euphoxide::Result<impl Future<Output = euphoxide::Result<SendReply>>> { ) -> euphoxide::Result<impl Future<Output = euphoxide::Result<SendReply>>> {
self.conn self.conn
.send(Send { .send(api::Send {
content: content.to_string(), content: content.to_string(),
parent: Some(parent), parent: Some(parent),
}) })
@ -121,7 +123,7 @@ pub trait Command<B, E> {
} }
pub struct Commands<B, E = euphoxide::Error> { pub struct Commands<B, E = euphoxide::Error> {
commands: Vec<Box<dyn Command<B, E>>>, commands: Vec<Box<dyn Command<B, E> + Sync + Send>>,
} }
impl<B, E> Commands<B, E> { impl<B, E> Commands<B, E> {
@ -129,11 +131,11 @@ impl<B, E> Commands<B, E> {
Self { commands: vec![] } Self { commands: vec![] }
} }
pub fn add(&mut self, command: impl Command<B, E> + 'static) { pub fn add(&mut self, command: impl Command<B, E> + Sync + Send + 'static) {
self.commands.push(Box::new(command)); self.commands.push(Box::new(command));
} }
pub fn then(mut self, command: impl Command<B, E> + 'static) -> Self { pub fn then(mut self, command: impl Command<B, E> + Sync + Send + 'static) -> Self {
self.add(command); self.add(command);
self self
} }
@ -142,7 +144,7 @@ impl<B, E> Commands<B, E> {
self.commands.iter().map(|c| c.info(ctx)).collect() self.commands.iter().map(|c| c.info(ctx)).collect()
} }
pub async fn execute( pub async fn on_packet(
&self, &self,
conn: ClientConnHandle, conn: ClientConnHandle,
state: State, state: State,
@ -168,6 +170,38 @@ impl<B, E> Commands<B, E> {
Ok(Propagate::Yes) Ok(Propagate::Yes)
} }
pub async fn on_instance_event(
&self,
event: InstanceEvent,
bot: &mut B,
) -> Result<Propagate, E> {
if let InstanceEvent::Packet {
conn,
state,
packet,
..
} = event
{
self.on_packet(conn, state, packet, bot).await
} else {
Ok(Propagate::Yes)
}
}
pub async fn on_bot_event(&self, event: BotEvent, bot: &mut B) -> Result<Propagate, E> {
if let BotEvent::Packet {
conn,
state,
packet,
..
} = event
{
self.on_packet(conn, state, packet, bot).await
} else {
Ok(Propagate::Yes)
}
}
} }
// Has fewer restrictions on generic types than #[derive(Default)]. // Has fewer restrictions on generic types than #[derive(Default)].