From 8a55c97b4e2c49e0bb762184f6a546ffbb891e77 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Thu, 15 Jun 2017 00:07:12 +0200
Subject: Fix utf-8 issues #193

---
 gateway/gateway.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gateway/gateway.go b/gateway/gateway.go
index 022f606f..881e0ac9 100644
--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -235,7 +235,16 @@ func (gw *Gateway) modifyUsername(msg *config.Message, dest *bridge.Bridge) {
 		nick = dest.Config.RemoteNickFormat
 	}
 	if len(msg.Username) > 0 {
-		nick = strings.Replace(nick, "{NOPINGNICK}", msg.Username[:1]+"​"+msg.Username[1:], -1)
+		// fix utf-8 issue #193
+		i := 0
+		for index := range msg.Username {
+			if i == 1 {
+				i = index
+				break
+			}
+			i++
+		}
+		nick = strings.Replace(nick, "{NOPINGNICK}", msg.Username[:i]+"​"+msg.Username[i:], -1)
 	}
 	nick = strings.Replace(nick, "{NICK}", msg.Username, -1)
 	nick = strings.Replace(nick, "{BRIDGE}", br.Name, -1)
-- 
cgit v1.2.3