lytedev/yourcloud
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ignore messages from self

Browse source
This commit is contained in:
Daniel Flanagan 2024-08-05 15:16:19 -05:00
parent 1914ee2ee8
commit 871c239ef2
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/chatbot.rs
View file

@ -13,7 +13,7 @@ const COMMAND_PREFIX: &str = "!";
struct Discord { struct Discord {
discord: discord::Discord, discord: discord::Discord,
connection: Option<Arc<Mutex<discord::Connection>>>, connection: Option<Arc<Mutex<discord::Connection>>>,
me: Option<discord::model::CurrentUser>, current_user: Option<discord::model::CurrentUser>,
} }
impl Discord { impl Discord {
@ -23,7 +23,7 @@ impl Discord {
Ok(Self { Ok(Self {
discord, discord,
connection: None, connection: None,
me: None, current_user: None,
}) })
} else { } else {
return Err(eyre!("discord configuration was empty")); return Err(eyre!("discord configuration was empty"));
@ -36,7 +36,8 @@ impl Discord {
} }
let (connection, ready_ev) = self.discord.connect()?; let (connection, ready_ev) = self.discord.connect()?;
self.connection = Some(Arc::new(Mutex::new(connection))); self.connection = Some(Arc::new(Mutex::new(connection)));
self.me = self.discord.get_current_user().ok(); self.current_user = self.discord.get_current_user().ok();
info!("Discord current user: {:?}", self.current_user);
Ok(ready_ev) Ok(ready_ev)
} }
@ -195,8 +196,8 @@ impl Discord {
} }
pub fn handle_message(&self, msg: Message) -> Result<()> { pub fn handle_message(&self, msg: Message) -> Result<()> {
if let Some(me) = &self.me { if let Some(current_user) = &self.current_user {
if msg.author.id == me.id { if msg.author.id == current_user.id {
trace!("Ignoring message from self"); trace!("Ignoring message from self");
} }
return Ok(()); return Ok(());