fix: discord links (#190)

.github/workflows/cmake-single-platform.yml

@@ -117,7 +117,21 @@ jobs:
         with:
           dotnet-version: '7.0.x'
 
-      - run: |
+      - name: Install dependencies
+        run: dotnet restore managed/CounterStrikeSharp.sln
+
+      - name: Run tests
+        run: dotnet test --logger trx --results-directory "TestResults-${{ env.GITHUB_SHA_SHORT }}" managed/CounterStrikeSharp.API.Tests/CounterStrikeSharp.API.Tests.csproj
+
+      - name: Upload dotnet test results
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-results-${{ env.GITHUB_SHA_SHORT }}
+          path: TestResults-${{ env.GITHUB_SHA_SHORT }}
+        if: ${{ always() }}
+
+      - name: Publish artifacts
+        run: |
           dotnet publish -c Release /p:Version=1.0.${{ env.BUILD_NUMBER }} managed/CounterStrikeSharp.API
           dotnet pack -c Release /p:Version=1.0.${{ env.BUILD_NUMBER }} managed/CounterStrikeSharp.API   
 

README.md

@@ -2,7 +2,7 @@
 
 CounterStrikeSharp is a server side modding framework for Counter-Strike: Global Offensive. This project attempts to implement a .NET Core scripting layer on top of a Metamod Source Plugin, allowing developers to create plugins that interact with the game server in a modern language (C#) to facilitate the creation of maintainable and testable code.
 
-[Come and join our Discord](https://discord.gg/X7r3PmuYKq)
+[Come and join our Discord](https://discord.gg/eAZU3guKWU)
 
 ## History
 
@@ -39,7 +39,7 @@ These features are the core of the platform and work pretty well/have a low risk
 
 ## Links
 
-- [Join the Discord](https://discord.gg/X7r3PmuYKq): Ask questions, provide suggestions
+- [Join the Discord](https://discord.gg/eAZU3guKWU): Ask questions, provide suggestions
 - [Read the docs](https://docs.cssharp.dev/): Getting started guide, hello world plugin example
 - [Issue tracker](https://github.com/roflmuffin/CounterStrikeSharp/issues): Raise any issues here
 - [Builds](https://github.com/roflmuffin/CounterStrikeSharp/actions): Download latest unstable dev snapshot

docfx/layouts/cssharp/public/main.js

@@ -7,7 +7,7 @@ export default {
     },
     {
       icon: "discord",
-      href: "https://discord.gg/X7r3PmuYKq",
+      href: "https://discord.gg/eAZU3guKWU",
       title: "Discord",
     },
   ],

managed/CounterStrikeSharp.API.Tests/CounterStrikeSharp.API.Tests.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net7.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2"/>
+        <PackageReference Include="xunit" Version="2.4.2"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="3.1.2">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\CounterStrikeSharp.API\CounterStrikeSharp.API.csproj" />
+    </ItemGroup>
+
+</Project>

managed/CounterStrikeSharp.API.Tests/SteamIDTests.cs

@@ -0,0 +1,52 @@
+using CounterStrikeSharp.API.Modules.Entities;
+using CounterStrikeSharp.API.Modules.Entities.Constants;
+
+namespace CounterStrikeSharp.API.Tests;
+
+public class SteamIdTests
+{
+    [Theory]
+    [InlineData(76561197960524373ul, 76561197960524373ul, "STEAM_0:1:129322", "[U:1:258645]", 258645, SteamAccountType.Individual, SteamAccountInstance.Desktop, SteamAccountUniverse.Public, true)]
+    [InlineData(258645, 76561197960524373ul, "STEAM_0:1:129322", "[U:1:258645]", 258645, SteamAccountType.Individual, SteamAccountInstance.Desktop, SteamAccountUniverse.Public, true)]
+    [InlineData(76561197960265728ul, 76561197960265728ul, "STEAM_0:0:0", "[U:1:0]", 0, SteamAccountType.Individual, SteamAccountInstance.Desktop, SteamAccountUniverse.Public, false)]
+    [InlineData(103582791429521412ul, 103582791429521412ul, "STEAM_0:0:13510796734627842", "[g:1:27021593469255684]", 4, SteamAccountType.Clan, SteamAccountInstance.All, SteamAccountUniverse.Public, true)]
+    public void ValidateSteamId(ulong parseValue, ulong steamId64, string steamId2, string steamId3, int steamId32, SteamAccountType accountType, SteamAccountInstance accountInstance, SteamAccountUniverse accountUniverse, bool valid)
+    {
+        var steamId = new SteamID(parseValue);
+        
+        Assert.Equal(steamId64, steamId.SteamId64);
+        Assert.Equal(steamId2, steamId.SteamId2);
+        Assert.Equal(steamId3, steamId.SteamId3);
+        Assert.Equal(steamId32, steamId.SteamId32);
+        Assert.Equal(accountType, steamId.AccountType);
+        Assert.Equal(accountInstance, steamId.AccountInstance);
+        Assert.Equal(accountUniverse, steamId.AccountUniverse);
+        Assert.Equal(valid, steamId.IsValid());
+    }
+    
+    [Theory]
+    [InlineData(76561197960524373ul, 76561197960524373ul)]
+    [InlineData("STEAM_0:1:129322", 76561197960524373ul)]
+    [InlineData("[U:1:258645]", 76561197960524373ul)]
+    public void CanCastLongToString(dynamic parseable, ulong longValue)
+    {
+        Assert.Equal(longValue, ((SteamID)parseable).SteamId64);
+    }
+    
+    [Fact]
+    public void CanUseValueEquality()
+    {
+        var steamId1 = new SteamID(76561197960524373ul);
+        var steamId2 = new SteamID(76561197960524373ul);
+        var steamId3 = new SteamID(76561197960265728ul);
+        
+        Assert.True(steamId1 == steamId2);
+        Assert.True(steamId1 != steamId3);
+    }
+    
+    [Fact]
+    public void ThrowsOutOfRangeException()
+    {
+        Assert.Throws<ArgumentOutOfRangeException>(() => new SteamID(0));
+    }
+}

managed/CounterStrikeSharp.API.Tests/Usings.cs

@@ -0,0 +1 @@
+global using Xunit;

managed/CounterStrikeSharp.API/Modules/Entities/SteamID.cs

@@ -8,20 +8,25 @@ namespace CounterStrikeSharp.API.Modules.Entities
         const long Base = 76561197960265728;
         public ulong SteamId64 { get; set; }
 
-        public SteamID(ulong id) => SteamId64 = id;
-        public SteamID(string id) => SteamId64 = id.StartsWith("[") ? ParseId3(id) : ParseId(id);
+        public SteamID(ulong id)
+        {
+            if (id <= 0) throw new ArgumentOutOfRangeException(nameof(id));
+            SteamId64 = id >= Base ? id : id + Base;
+        }
+
+        public SteamID(string id) : this(id.StartsWith('[') ? ParseId3(id) : ParseId(id)) { }
 
         public static explicit operator SteamID(ulong u) => new(u);
         public static explicit operator SteamID(string s) => new(s);
 
-        ulong ParseId(string id)
+        static ulong ParseId(string id)
         {
             var parts = id.Split(':');
             if (parts.Length != 3 || !ulong.TryParse(parts[2], out var num)) throw new FormatException();
-            return Base + num * 2 + (parts[1] == "1" ? 1UL : 0);
+            return Base + (num * 2) + (parts[1] == "1" ? 1UL : 0);
         }
 
-        ulong ParseId3(string id)
+        static ulong ParseId3(string id)
         {
             var parts = id.Replace("[", "").Replace("]", "").Split(':');
             if (parts.Length != 3 || !ulong.TryParse(parts[2], out var num)) throw new FormatException();
@@ -39,34 +44,34 @@ namespace CounterStrikeSharp.API.Modules.Entities
             get => $"[{EnumUtils.GetEnumMemberAttributeValue(AccountType)}:{(int)AccountUniverse}:{SteamId64 - Base}]";
             set => SteamId64 = ParseId3(value);
         }
-        
+
         public int SteamId32
         {
             get => (int)(SteamId64 - Base);
             set => SteamId64 = (ulong)value + Base;
         }
 
-        public int AccountId => (int)((SteamId64 >> 0) & 0xFFFFFFFF);
+        public int AccountId => (int)(SteamId64 & 0xFFFFFFFF);
 
-        public SteamAccountInstance AccountInstance => 
+        public SteamAccountInstance AccountInstance =>
             (SteamAccountInstance)((SteamId64 >> 32) & 0xFFFFF);
- 
-        public SteamAccountType AccountType => 
+
+        public SteamAccountType AccountType =>
             (SteamAccountType)((SteamId64 >> 52) & 0xF);
 
-        public SteamAccountUniverse AccountUniverse => 
+        public SteamAccountUniverse AccountUniverse =>
             (SteamAccountUniverse)((SteamId64 >> 56) & 0xF);
 
         public bool IsValid()
         {
-            if (AccountUniverse == SteamAccountUniverse.Unspecified 
-                || AccountType == SteamAccountType.Invalid 
+            if (AccountUniverse == SteamAccountUniverse.Unspecified
+                || AccountType == SteamAccountType.Invalid
                 || AccountInstance == SteamAccountInstance.Invalid)
                 return false;
-            if (AccountType == SteamAccountType.Individual 
+            if (AccountType == SteamAccountType.Individual
                 && (AccountId == 0 || AccountInstance != SteamAccountInstance.Desktop))
                 return false;
-            if (AccountType == SteamAccountType.Clan 
+            if (AccountType == SteamAccountType.Clan
                 && (AccountId == 0 || AccountInstance != SteamAccountInstance.All))
                 return false;
             if (AccountType == SteamAccountType.GameServer && AccountId == 0)
@@ -78,12 +83,12 @@ namespace CounterStrikeSharp.API.Modules.Entities
 
         public Uri ToCommunityUrl()
         {
-            string url = string.Empty;
-            if (AccountType == SteamAccountType.Individual)
-                url = "https://steamcommunity.com/profiles/" + SteamId64;
-            if (AccountType == SteamAccountType.Clan)
-                url = "https://steamcommunity.com/gid/" + SteamId64;
-            return new Uri(url);
+            return AccountType switch
+            {
+                SteamAccountType.Individual => new Uri("https://steamcommunity.com/profiles/" + SteamId64),
+                SteamAccountType.Clan => new Uri("https://steamcommunity.com/gid/" + SteamId64),
+                _ => new Uri(string.Empty),
+            };
         }
 
         public bool Equals(SteamID? other)
@@ -96,7 +101,7 @@ namespace CounterStrikeSharp.API.Modules.Entities
             if (obj?.GetType() != this.GetType()) return false;
             return Equals((SteamID)obj);
         }
-        
+
         public static bool TryParse(string s, out SteamID? steamId)
         {
             try

managed/CounterStrikeSharp.sln

@@ -26,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WithDatabaseDapper", "..\ex
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WithEntityOutputHooks", "..\examples\WithEntityOutputHooks\WithEntityOutputHooks.csproj", "{31EABE0B-871F-497B-BF36-37FFC6FAD15F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CounterStrikeSharp.API.Tests", "CounterStrikeSharp.API.Tests\CounterStrikeSharp.API.Tests.csproj", "{BBA80E1B-109D-4ABD-9ADF-46EB0FEDFCD3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -80,6 +82,10 @@ Global
 		{31EABE0B-871F-497B-BF36-37FFC6FAD15F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{31EABE0B-871F-497B-BF36-37FFC6FAD15F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{31EABE0B-871F-497B-BF36-37FFC6FAD15F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBA80E1B-109D-4ABD-9ADF-46EB0FEDFCD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBA80E1B-109D-4ABD-9ADF-46EB0FEDFCD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBA80E1B-109D-4ABD-9ADF-46EB0FEDFCD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBA80E1B-109D-4ABD-9ADF-46EB0FEDFCD3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{57E64289-5D69-4AA1-BEF0-D0D96A55EE8F} = {7DF99C35-881D-4FF2-B1C9-246BD3DECB9A}