Try UA4 again

Team-Dim · Feb 6, 2024 · b648d5d · b648d5d
1 parent cfe31ac
commit b648d5d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
@@ -27,7 +27,7 @@ jobs:
     - name: Build
       run: dotnet publish -c Release -r linux-arm64 --no-self-contained
     - name: Upload program
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Bot
         path: |

diff --git a/Bot/Clash/ClanUtil.cs b/Bot/Clash/ClanUtil.cs
@@ -44,11 +44,11 @@ internal static ClanUtil FromInit(Clan clan)
 
     internal static ClanUtil FromPoll(Clan clan)
     {
-        ClanUtil c = new(clan, new(Coc.s_clan._members));
+        ClanUtil c = new(clan, new(Coc.Clan._members));
         foreach (ClanMember member in clan.MemberList!)
         {
             c._members[member.Tag] = member;
-            if (Coc.s_clan.HasMember(member))
+            if (Coc.Clan.HasMember(member))
             {
                 c._existingMembers[member.Tag] = member;
                 c._leavingMembers.Remove(member.Tag);

diff --git a/Bot/Clash/Coc.cs b/Bot/Clash/Coc.cs
@@ -10,7 +10,7 @@ internal static class Coc
     private const string ClanId = "#2QU2UCJJC"; // 2G8LP8PVV
     private static readonly ClashOfClansClient s_client = new(Secrets.s_coc);
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
-    internal static ClanUtil s_clan;// { get; private set; }
+    internal static ClanUtil Clan { get; private set; }
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
 
     private static void CheckMembersJoined(ClanUtil clan)
@@ -97,7 +97,7 @@ private static async Task PollAsync()
         await Task.WhenAll([
             CheckDonationsAsync(clanUtil),
         ]);
-        s_clan = clanUtil;
+        Clan = clanUtil;
     }
 
     private static async Task CheckDonationsAsync(ClanUtil clan)
@@ -106,7 +106,7 @@ private static async Task CheckDonationsAsync(ClanUtil clan)
         foreach (string tag in clan._existingMembers.Keys)
         {
             ClanMember current = clan._members[tag];
-            ClanMember previous = s_clan._members[tag];
+            ClanMember previous = Clan._members[tag];
             if (current.Donations > previous.Donations || current.DonationsReceived > previous.DonationsReceived)
             {
                 donDelta[current.Tag] = new(current.Donations - previous.Donations, current.DonationsReceived - previous.DonationsReceived);
@@ -170,13 +170,13 @@ private static async Task CheckDonationsAsync(ClanUtil clan)
 
     internal static string? GetMemberId(string name)
     {
-        ClanMember? result = s_clan._clan.MemberList!.FirstOrDefault(m => m.Name == name);
+        ClanMember? result = Clan._clan.MemberList!.FirstOrDefault(m => m.Name == name);
         return result?.Tag;
     }
 
-    internal static ClanMember GetMember(string id) => s_clan._members[id];
+    internal static ClanMember GetMember(string id) => Clan._members[id];
 
-    internal static async Task InitAsync() => s_clan = ClanUtil.FromInit(await GetClanAsync());
+    internal static async Task InitAsync() => Clan = ClanUtil.FromInit(await GetClanAsync());
 
     internal static async Task BotReadyAsync()
     {