Include friend names in SteamOnline

Author: DeinFreund

ChobbyLauncher/ChobbyLoopbackMessages.cs

@@ -121,8 +121,9 @@ public class DownloadFileProgress
     [ChobbyMessage]
     public class SteamOnline
     {
+
         public string AuthToken { get; set; }
-        public List<string> Friends { get; set; }
+        public List<SteamFriend> Friends { get; set; }
         public string FriendSteamID { get; set; }
         public string SuggestedName { get; set; }
         public List<ulong> Dlc { get; set; }

ChobbyLauncher/ChobbylaLocalListener.cs

@@ -15,6 +15,7 @@
 using PlasmaDownloader;
 using PlasmaShared;
 using ZkData;
+using static ChobbyLauncher.SteamOnline;
 using Timer = System.Threading.Timer;
 
 namespace ChobbyLauncher
@@ -756,13 +757,13 @@ private async Task SendSteamOnline()
             {
                 var friendId = initialConnectLobbyID != 0 ? steam.GetLobbyOwner(initialConnectLobbyID) : null;
 
-                
+
 
                 await
                     SendCommand(new SteamOnline()
                     {
                         AuthToken = steam.AuthToken,
-                        Friends = steam.Friends.Select(x => x.ToString()).ToList(),
+                        Friends = steam.Friends,
                         FriendSteamID = friendId?.ToString(),
                         SuggestedName = steam.MySteamNameSanitized,
                         Dlc = steam.GetDlcList()

ChobbyLauncher/SteamClient.cs

@@ -47,7 +47,7 @@ public enum OverlayOption
 
         public string AuthToken { get; private set; }
 
-        public List<ulong> Friends { get; private set; }
+        public List<SteamFriend> Friends { get; private set; }
         public bool IsOnline { get; private set; }
         public ChobbylaLocalListener Listener { get; set; }
 
@@ -85,7 +85,7 @@ public void ConnectToSteam()
         public ulong? GetLobbyOwner(ulong lobbyID)
         {
             if (IsOnline)
-                foreach (var f in GetFriends())
+                foreach (var f in GetFriendIDs())
                 {
                     FriendGameInfo_t gi;
                     SteamFriends.GetFriendGamePlayed(new CSteamID(f), out gi);
@@ -155,7 +155,7 @@ public void PrepareToHostP2PGame(SteamHostGameRequest request)
                 ulong.TryParse(player.SteamID, out playerSteamID);
 
                 p2pProxies[playerSteamID] = null;
-                SendSteamMessage(playerSteamID, new SteamP2PRequestPrepareProxy() {Channel = steamChannelCounter++});
+                SendSteamMessage(playerSteamID, new SteamP2PRequestPrepareProxy() { Channel = steamChannelCounter++ });
             }
 
             // wait for response
@@ -191,7 +191,7 @@ public void PrepareToHostP2PGame(SteamHostGameRequest request)
                             ScriptPassword = player.ScriptPassword
                         });
                 }
-                
+
                 // send command to start spring to self
                 Listener.SendCommand(new SteamHostGameSuccess() { HostPort = gameHostUdpPort });
             });
@@ -241,7 +241,20 @@ private string GetClientAuthTokenHex()
         }
 
 
-        private List<ulong> GetFriends()
+        private List<SteamFriend> getFriends()
+        {
+            if (IsOnline)
+            {
+                return GetFriendIDs().Select(x => new SteamFriend()
+                {
+                    Name = SteamFriends.GetFriendPersonaName(x),
+                    SteamID = x.ToString()
+                }).ToList();
+            }
+            return null;
+        }
+
+        private List<ulong> GetFriendIDs()
         {
             if (IsOnline)
             {
@@ -274,7 +287,7 @@ private void OnSteamOnline()
             newConnectionCallback = Callback<P2PSessionRequest_t>.Create(t => SteamNetworking.AcceptP2PSessionWithUser(t.m_steamIDRemote));
             MySteamNameSanitized = Utils.StripInvalidLobbyNameChars(GetMyName());
 
-            
+
             var ev = new EventWaitHandle(false, EventResetMode.ManualReset);
             AuthToken = GetClientAuthTokenHex();
             CreateLobbyAsync((lobbyID) =>
@@ -283,7 +296,7 @@ private void OnSteamOnline()
                 ev.Set();
             });
             SteamNetworking.AllowP2PPacketRelay(true);
-            Friends = GetFriends();
+            Friends = GetFriendIDs();
             ev.WaitOne(2000);
             SteamOnline?.Invoke();
         }
@@ -323,7 +336,7 @@ private void DisposeExistingProxies()
         /// </summary>
         private void ProcessMessage(ulong remoteUser, SteamP2PConfirmCreateProxy cmd)
         {
-            p2pProxies[remoteUser] = new SteamP2PPortProxy(cmd.Channel, new CSteamID(remoteUser), gameHostUdpPort); 
+            p2pProxies[remoteUser] = new SteamP2PPortProxy(cmd.Channel, new CSteamID(remoteUser), gameHostUdpPort);
         }
 
         /// <summary>
@@ -425,4 +438,11 @@ private void TimerOnElapsed(object sender)
             }
         }
     }
+
+    class SteamFriend
+    {
+
+        public string SteamID;
+        public string Name;
+    }
 }