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

Use new nick functions in bang command

Browse source
This commit is contained in:
Joscha 2023-01-30 19:01:16 +01:00
parent de62727dc6
commit f394ddc5a6
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/bot/command/bang.rs
View file

@ -1,6 +1,7 @@
use async_trait::async_trait; use async_trait::async_trait;
use crate::api::Message; use crate::api::Message;
use crate::nick;
use super::{Command, Context}; use super::{Command, Context};
@ -32,14 +33,6 @@ fn parse_specific(text: &str) -> Option<(&str, &str)> {
Some((name, rest)) Some((name, rest))
} }
fn specific_nick(nick: &str) -> String {
nick.replace(char::is_whitespace, "")
}
fn normalize_specific_nick(nick: &str) -> String {
specific_nick(nick).to_lowercase()
}
pub struct Global<C> { pub struct Global<C> {
prefix: String, prefix: String,
name: String, name: String,
@ -170,7 +163,7 @@ where
{ {
fn description(&self, ctx: &Context) -> Option<String> { fn description(&self, ctx: &Context) -> Option<String> {
let inner = self.inner.description(ctx)?; let inner = self.inner.description(ctx)?;
let nick = specific_nick(&ctx.joined.session.name); let nick = nick::mention(&ctx.joined.session.name);
Some(format!("{}{} @{nick} - {inner}", self.prefix, self.name)) Some(format!("{}{} @{nick} - {inner}", self.prefix, self.name))
} }
@ -191,7 +184,7 @@ where
None => return Ok(()), None => return Ok(()),
}; };
if normalize_specific_nick(nick) != normalize_specific_nick(&ctx.joined.session.name) { if nick::normalize(nick) != nick::normalize(&ctx.joined.session.name) {
return Ok(()); return Ok(());
} }