From 79d6f1c445c72513ac2bce097a531db0c5884829 Mon Sep 17 00:00:00 2001
From: Alexandre Oliveira <rockytvbr@gmail.com>
Date: Wed, 20 Dec 2017 17:00:27 -0200
Subject: [PATCH] Add support for userhost-in-names cap

---
 ChatSharp/Handlers/ChannelHandlers.cs | 69 ++++++++++++++++++++-------
 ChatSharp/IrcClient.cs                |  2 +-
 2 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/ChatSharp/Handlers/ChannelHandlers.cs b/ChatSharp/Handlers/ChannelHandlers.cs
index 259d5d4..d6e1578 100644
--- a/ChatSharp/Handlers/ChannelHandlers.cs
+++ b/ChatSharp/Handlers/ChannelHandlers.cs
@@ -64,27 +64,64 @@ namespace ChatSharp.Handlers
 
         public static void HandleUserListPart(IrcClient client, IrcMessage message)
         {
-            var channel = client.Channels[message.Parameters[2]];
-            var users = message.Parameters[3].Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
-            foreach (var rawNick in users)
+            if (client.Capabilities.IsEnabled("userhost-in-names"))
             {
-                if (string.IsNullOrWhiteSpace(rawNick))
-                    continue;
+                var channel = client.Channels[message.Parameters[2]];
+                var users = message.Parameters[3].Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var hostmask in users)
+                {
+                    if (string.IsNullOrWhiteSpace(hostmask))
+                        continue;
 
-                var nick = rawNick;
-                var modes = client.ServerInfo.GetModesForNick(nick);
+                    // Parse hostmask
+                    var nick = hostmask.Substring(0, hostmask.IndexOf("!"));
+                    var ident = hostmask.Substring(nick.Length + 1, hostmask.LastIndexOf("@") - (nick.Length + 1));
+                    var hostname = hostmask.Substring(hostmask.LastIndexOf("@") + 1);
 
-                if (modes.Count > 0)
-                    nick = rawNick.Remove(0, modes.Count);
+                    // Get user modes
+                    var modes = client.ServerInfo.GetModesForNick(nick);
+                    if (modes.Count > 0)
+                        nick = nick.Remove(0, modes.Count);
 
-                var user = client.Users.GetOrAdd(nick);
+                    var user = client.Users.GetOrAdd(nick);
+                    if (user.Hostname != hostname && user.User != ident)
+                    {
+                        user.Hostname = hostname;
+                        user.User = ident;
+                    }
 
-                if (!user.Channels.Contains(channel))
-                    user.Channels.Add(channel);
-                if (!user.ChannelModes.ContainsKey(channel))
-                    user.ChannelModes.Add(channel, modes);
-                else
-                    user.ChannelModes[channel] = modes;
+                    if (!user.Channels.Contains(channel))
+                        user.Channels.Add(channel);
+                    if (!user.ChannelModes.ContainsKey(channel))
+                        user.ChannelModes.Add(channel, modes);
+                    else
+                        user.ChannelModes[channel] = modes;
+                }
+            }
+            else
+            {
+                var channel = client.Channels[message.Parameters[2]];
+                var users = message.Parameters[3].Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var rawNick in users)
+                {
+                    if (string.IsNullOrWhiteSpace(rawNick))
+                        continue;
+
+                    var nick = rawNick;
+                    var modes = client.ServerInfo.GetModesForNick(nick);
+
+                    if (modes.Count > 0)
+                        nick = rawNick.Remove(0, modes.Count);
+
+                    var user = client.Users.GetOrAdd(nick);
+
+                    if (!user.Channels.Contains(channel))
+                        user.Channels.Add(channel);
+                    if (!user.ChannelModes.ContainsKey(channel))
+                        user.ChannelModes.Add(channel, modes);
+                    else
+                        user.ChannelModes[channel] = modes;
+                }
             }
         }
 
diff --git a/ChatSharp/IrcClient.cs b/ChatSharp/IrcClient.cs
index b222d47..9bf4ab4 100644
--- a/ChatSharp/IrcClient.cs
+++ b/ChatSharp/IrcClient.cs
@@ -169,7 +169,7 @@ namespace ChatSharp
             // List of supported capabilities
             Capabilities.AddRange(new string[] {
                 "server-time", "multi-prefix", "cap-notify", "znc.in/server-time", "znc.in/server-time-iso",
-                "account-notify", "chghost"
+                "account-notify", "chghost", "userhost-in-names"
             });
 
             IsNegotiatingCapabilities = false;