Merge branch 'master' into master

ZeroK-RTS · Jul 24, 2024 · 42a34f1 · 42a34f1
2 parents 6a50620 + 6d19c32
commit 42a34f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ChobbyLauncher/ChobbyLauncher.csproj b/ChobbyLauncher/ChobbyLauncher.csproj
@@ -163,7 +163,7 @@
     <PackageReference Include="NeoLua" Version="1.3.14" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
     <PackageReference Include="NLog" Version="4.7.15" />
-    <PackageReference Include="Octokit" Version="10.0.0" />
+    <PackageReference Include="Octokit" Version="13.0.0" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="BeforeBuild">

diff --git a/ZkLobbyServer/ZkLobbyServer.cs b/ZkLobbyServer/ZkLobbyServer.cs
@@ -212,6 +212,9 @@ public bool CanUserSee(ConnectedUser uWatcher, ConnectedUser uWatched)
             // admins always visible
             if (uWatched.User?.IsAdmin == true) return true;
 
+            // admins see everybody
+            if (uWatcher.User?.IsAdmin == true) return true;
+
             // friends see each other
             if (uWatcher.FriendNames.Contains(uWatched.Name)) return true;