From 80426e4773a1852b93566f8f71a358944de2b059 Mon Sep 17 00:00:00 2001 From: ze0s <43699394+zze0s@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:36:40 +0200 Subject: [PATCH] fix(irc): revert lazy announcer check (#1707) --- internal/irc/handler.go | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/internal/irc/handler.go b/internal/irc/handler.go index 96bdf90..8e821bc 100644 --- a/internal/irc/handler.go +++ b/internal/irc/handler.go @@ -1019,24 +1019,9 @@ func (h *Handler) isValidAnnouncer(nick string) bool { h.m.RLock() defer h.m.RUnlock() - nick = strings.ToLower(nick) - for announcer := range h.validAnnouncers { - if nick == announcer { - return true - } + _, ok := h.validAnnouncers[strings.ToLower(nick)] + return ok - // Confirm if the nickname starts with the announcer and comprises one additional character - if strings.HasPrefix(nick, announcer) && len(nick) == len(announcer)+1 { - return true - } - - // Verify if the nickname concludes with an asterisk and holds the correct prefix - if strings.HasSuffix(announcer, "*") && strings.HasPrefix(nick, announcer) { - return true - } - } - - return false } // check if channel is one from the list in the definition