From bb80670a18a09acc1b3e3f3192ffd209a24e867d Mon Sep 17 00:00:00 2001
From: Jaidyn Levesque <10477760+JadedCtrl@users.noreply.github.com>
Date: Sun, 15 Jan 2023 21:08:53 -0600
Subject: [PATCH] Fix parsing of RPL_NAMREPLY by trimming user prefixes

---
 ircc.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/ircc.scm b/ircc.scm
index a0e72ad..557764c 100644
--- a/ircc.scm
+++ b/ircc.scm
@@ -110,6 +110,17 @@
 		 (string-cursor<? at-@ at-.))))
 
 
+;; Remove all usermode prefixes from a user string (hostmask, nick, etc)
+(define (irc:trim-usermode-prefixes user-string)
+  (string-trim user-string
+			   (lambda (char)
+				 (or (eq? char #\~)
+					 (eq? char #\&)
+					 (eq? char #\@)
+					 (eq? char #\%)
+					 (eq? char #\+)))))
+
+
 ;; Return whether or not the given string (username/nick/hostmask/etc) is
 ;; equivalent to current user.
 (define (irc:user-is-self? conn user-string)
@@ -163,7 +174,8 @@
 		[(eq? reply RPL_NAMREPLY)
 		 (let ([channel (third params)]
 			   [chan-symbol (second params)]
-			   [users (string-split (cadddr params) " ")])
+			   [users (map irc:trim-usermode-prefixes
+						   (string-split (cadddr params) " "))])
 		   (irc:channel-set! conn channel 'symbol chan-symbol)
 		   (map
 			(lambda (user)