From f394ddc5a67f53223f977ccc414bb4c949790f6b Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Mon, 30 Jan 2023 19:01:16 +0100
Subject: [PATCH] Use new nick functions in bang command

---
 src/bot/command/bang.rs | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/bot/command/bang.rs b/src/bot/command/bang.rs
index 589811f..16c9b12 100644
--- a/src/bot/command/bang.rs
+++ b/src/bot/command/bang.rs
@@ -1,6 +1,7 @@
 use async_trait::async_trait;
 
 use crate::api::Message;
+use crate::nick;
 
 use super::{Command, Context};
 
@@ -32,14 +33,6 @@ fn parse_specific(text: &str) -> Option<(&str, &str)> {
     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> {
     prefix: String,
     name: String,
@@ -170,7 +163,7 @@ where
 {
     fn description(&self, ctx: &Context) -> Option<String> {
         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))
     }
 
@@ -191,7 +184,7 @@ where
             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(());
         }