sponsor info sync with bot

SerbiaStrong-220 · Jan 2, 2024 · fd01cf3 · fd01cf3
1 parent d2fd725
commit fd01cf3
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 29 deletions.
diff --git a/Content.Client/SS220/Discord/DiscordPlayerInfoManager.cs b/Content.Client/SS220/Discord/DiscordPlayerInfoManager.cs
@@ -1,3 +1,5 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
 using Content.Shared.SS220.Discord;
 using Robust.Shared.Network;
 
@@ -23,9 +25,9 @@ private void UpdateSponsorStatus(MsgUpdatePlayerDiscordStatus message)
             SponsorStatusChanged?.Invoke();
         }
 
-        public SponsorTier GetSponsorTier()
+        public SponsorTier[] GetSponsorTier()
         {
-            return _info?.Tier ?? SponsorTier.None;
+            return _info?.Tiers ?? Array.Empty<SponsorTier>();
         }
     }
 }
diff --git a/Content.Server/SS220/Discord/DiscordPlayerManager.cs b/Content.Server/SS220/Discord/DiscordPlayerManager.cs
@@ -5,6 +5,8 @@
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
 using System.Security.Cryptography;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Content.Server.Database;
 using Content.Shared.Corvax.CCCVars;
@@ -78,27 +80,43 @@ private async Task UpdateUserDiscordRolesStatus(SessionStatusEventArgs e)
             return null;
         }
 
-        var url = $"{_apiUrl}/sponsors/{userId}";
-        var response = await _httpClient.GetAsync(url);
+        try
+        {
+            var url = $"{_apiUrl}/userinfo/{userId.UserId}";
+            var response = await _httpClient.GetAsync(url);
+
+            if (response.StatusCode != HttpStatusCode.OK)
+            {
+                var errorText = await response.Content.ReadAsStringAsync();
 
-        if (response.StatusCode == HttpStatusCode.NotFound)
+                _sawmill.Error(
+                    "Failed to get player sponsor info: [{StatusCode}] {Response}",
+                    response.StatusCode,
+                    errorText);
+
+                return null;
+            }
+
+            return await response.Content.ReadFromJsonAsync<DiscordSponsorInfo>(GetJsonSerializerOptions());
+        }
+        catch (Exception exc)
         {
-            return null;
+            _sawmill.Error(exc.Message);
         }
 
-        if (response.StatusCode != HttpStatusCode.OK)
-        {
-            var errorText = await response.Content.ReadAsStringAsync();
+        return null;
+    }
 
-            _sawmill.Error(
-                "Failed to get player sponsor info: [{StatusCode}] {Response}",
-                response.StatusCode,
-                errorText);
+    private static JsonSerializerOptions GetJsonSerializerOptions()
+    {
+        var opt = new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true
+        };
 
-            return null;
-        }
+        opt.Converters.Add(new JsonStringEnumConverter());
 
-        return await response.Content.ReadFromJsonAsync<DiscordSponsorInfo>();
+        return opt;
     }
 
     /// <summary>

diff --git a/Content.Shared/SS220/Discord/DiscordSponsorInfo.cs b/Content.Shared/SS220/Discord/DiscordSponsorInfo.cs
@@ -1,8 +1,11 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.SS220.Discord;
 
+[Serializable, NetSerializable]
 public sealed class DiscordSponsorInfo
 {
-    public SponsorTier Tier { get; set; }
+    public SponsorTier[] Tiers { get; set; } = Array.Empty<SponsorTier>();
 }
diff --git a/Content.Shared/SS220/Discord/MsgUpdatePlayerDiscordStatus.cs b/Content.Shared/SS220/Discord/MsgUpdatePlayerDiscordStatus.cs
@@ -1,6 +1,10 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+using System.IO;
 using Lidgren.Network;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.SS220.Discord;
 
@@ -14,22 +18,29 @@ public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer
     {
         if (buffer.ReadBoolean())
         {
-            Info = new DiscordSponsorInfo
-            {
-                Tier = (SponsorTier) buffer.ReadUInt32()
-            };
+            buffer.ReadPadBits();
+            var length = buffer.ReadVariableInt32();
+            using var stream = new MemoryStream();
+            buffer.ReadAlignedMemory(stream, length);
+            serializer.DeserializeDirect<DiscordSponsorInfo>(stream, out var info);
+
+            Info = info;
         }
     }
 
     public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer)
     {
         buffer.Write(Info is not null);
+        buffer.WritePadBits();
 
-        if (Info == null)
+        if (Info is null)
         {
             return;
         }
 
-        buffer.Write((uint) Info.Tier);
+        var stream = new MemoryStream();
+        serializer.SerializeDirect(stream, Info);
+        buffer.WriteVariableInt32((int) stream.Length);
+        buffer.Write(stream.AsSpan());
     }
 }
diff --git a/Content.Shared/SS220/Discord/SponsorTier.cs b/Content.Shared/SS220/Discord/SponsorTier.cs
@@ -1,11 +1,16 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+using Robust.Shared.Serialization;
+
 namespace Content.Shared.SS220.Discord;
 
+[Serializable, NetSerializable]
 public enum SponsorTier
 {
-    None = 0,
-    FirstTier = 1,
-    SecondTier = 2,
-    ThirdTier = 3,
-    FourthTier = 4,
-    FifthTier = 5
+    None,
+    Shlopa,
+    BigShlopa,
+    HugeShlopa,
+    GoldenShlopa,
+    CriticalMassShlopa
 }