Merge pull request #17 from BNETDocs/channeljoin-username

fix(chatevent): adding username to eid_channeljoin

Author: carlbennett

src/Atlasd/Battlenet/Channel.cs

@@ -124,7 +124,7 @@ public bool AcceptUser(GameState user, bool ignoreLimits = false, bool extendedE
                 Users.Add(user);
 
                 // Tell this user they entered the channel:
-                new ChatEvent(ChatEvent.EventIds.EID_CHANNELJOIN, ActiveFlags, 0, "", Name).WriteTo(user.Client);
+                new ChatEvent(ChatEvent.EventIds.EID_CHANNELJOIN, ActiveFlags, 0, RenderOnlineName(user, user), Name).WriteTo(user.Client);
 
                 if (!ActiveFlags.HasFlag(Flags.Silent))
                 {
@@ -673,6 +673,12 @@ public static string RenderOnlineName(GameState context, GameState target)
                 targetName = $"{Encoding.UTF8.GetString(target.CharacterName)}*{targetName}";
             }
 
+            // Add Warcraft III internal identifier:
+            if (context == target && Product.IsWarcraftIII(context.Product))
+            {
+                targetName = $"w#{targetName}";
+            }
+
             // TODO: Suffix "#{gateway}" or "@{gateway}" name, such as: JoeUser#Azeroth
 
             return targetName;
@@ -707,7 +713,7 @@ public bool Resync()
                 foreach (var user in Users)
                 {
                     // Tell users they re-entered the channel:
-                    args["chatEvent"] = new ChatEvent(ChatEvent.EventIds.EID_CHANNELJOIN, ActiveFlags, 0, "", Name);
+                    args["chatEvent"] = new ChatEvent(ChatEvent.EventIds.EID_CHANNELJOIN, ActiveFlags, 0, RenderOnlineName(user, user), Name);
                     msg.Invoke(new MessageContext(user.Client, Protocols.MessageDirection.ServerToClient, args));
                     user.Client.Send(msg.ToByteArray(user.Client.ProtocolType));