PaxAndromeda · PaxAndromeda · Feb 9, 2026 · Jul 6, 2025 · Jul 2, 2025 · Jul 2, 2025
diff --git a/Commands/ApplicationStart/StartInstar.sh b/Commands/ApplicationStart/StartInstar.sh
@@ -12,7 +12,7 @@ startInstar() {
 
   local INSTAR_CONF="/Instar/bin/Config/$INSTAR_CONF_FILE"
 
-  /Instar/bin/InstarBot --config-path "$INSTAR_CONF" > /dev/null 2> /dev/null < /dev/null &
+  /Instar/bin/InstarBot --config-path "$INSTAR_CONF" --level Debug > /dev/null 2> /dev/null < /dev/null &
 }
 
 startInstar
diff --git a/InstarBot.Tests.Common/EmbedVerifier.cs b/InstarBot.Tests.Common/EmbedVerifier.cs
@@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using Discord;
 using Serilog;
+using Xunit;
 
 namespace InstarBot.Tests;
 

diff --git a/InstarBot.Tests.Common/InstarBot.Tests.Common.csproj b/InstarBot.Tests.Common/InstarBot.Tests.Common.csproj
@@ -7,20 +7,20 @@
         <RootNamespace>InstarBot.Tests</RootNamespace>
         <IsTestProject>false</IsTestProject>
         <PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
+        <OutputType>Exe</OutputType>
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="AWSSDK.Core" Version="4.0.3.12" />
         <PackageReference Include="FluentAssertions" Version="8.8.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
         <PackageReference Include="Moq" Version="4.20.72" />
-        <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
-        <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
         <PackageReference Include="System.Linq.Async" Version="7.0.0" />
-        <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="xunit.v3" Version="3.2.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/InstarBot.Tests.Integration/Assembly.cs b/InstarBot.Tests.Integration/Assembly.cs
diff --git a/InstarBot.Tests.Integration/InstarBot.Tests.Integration.csproj b/InstarBot.Tests.Integration/InstarBot.Tests.Integration.csproj
@@ -4,20 +4,20 @@
         <TargetFramework>net10.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
+        <OutputType>Exe</OutputType>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Ardalis.GuardClauses" Version="5.0.0" />
+        <PackageReference Include="AWSSDK.Core" Version="4.0.3.12" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
         <PackageReference Include="Moq" Version="4.20.72" />
-        <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
-        <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
-        <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="FluentAssertions" Version="8.8.0" />
+        <PackageReference Include="xunit.v3" Version="3.2.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/InstarBot.Tests.Integration/Interactions/AutoMemberSystemCommandTests.cs b/InstarBot.Tests.Integration/Interactions/AutoMemberSystemCommandTests.cs
@@ -149,7 +149,7 @@ await tds.CreateNotificationAsync(new Notification
 
 		// There is a potential asynchronous delay here, so let's keep waiting for this condition for 5 seconds.
 		await Task.WhenAny(
-			Task.Delay(5000),
+			Task.Delay(5000, TestContext.Current.CancellationToken),
 			Task.Factory.StartNew(async () =>
 			{
 				while (true)
@@ -160,7 +160,7 @@ await Task.WhenAny(
 					// only poll once every 50ms
 					await Task.Delay(50);
 				}
-			}));
+			}, TestContext.Current.CancellationToken));
 	}
 
 	[Fact]

diff --git a/InstarBot.Tests.Integration/Interactions/PageCommandTests.cs b/InstarBot.Tests.Integration/Interactions/PageCommandTests.cs
@@ -14,7 +14,7 @@ public static class PageCommandTests
 {
 	private const string TestReason = "Test reason for paging";
 
-    private static async Task<TestOrchestrator> SetupOrchestrator(PageCommandTestContext context)
+	private static async Task<TestOrchestrator> SetupOrchestrator(PageCommandTestContext context)
     {
 		var orchestrator = TestOrchestrator.Default;
 

diff --git a/InstarBot.Tests.Integration/Interactions/PingCommandTests.cs b/InstarBot.Tests.Integration/Interactions/PingCommandTests.cs
@@ -6,13 +6,13 @@ namespace InstarBot.Tests.Integration.Interactions;
 
 public static class PingCommandTests
 {
-    /// <summary>
-    /// Tests that the ping command emits an ephemeral "Pong!" response.
-    /// </summary>
-    /// <remarks>This test verifies that calling the ping command results in the
-    /// expected ephemeral "Pong!" response.</remarks>
-    /// <returns></returns>
-    [Fact(DisplayName = "User should be able to issue the Ping command.")]
+	/// <summary>
+	/// Tests that the ping command emits an ephemeral "Pong!" response.
+	/// </summary>
+	/// <remarks>This test verifies that calling the ping command results in the
+	/// expected ephemeral "Pong!" response.</remarks>
+	/// <returns></returns>
+	[Fact(DisplayName = "User should be able to issue the Ping command.")]
     public static async Task PingCommand_Send_ShouldEmitEphemeralPong()
     {
 		// Arrange

diff --git a/InstarBot.Tests.Integration/Services/BirthdaySystemTests.cs b/InstarBot.Tests.Integration/Services/BirthdaySystemTests.cs
@@ -4,6 +4,7 @@
 using Moq;
 using PaxAndromeda.Instar;
 using PaxAndromeda.Instar.Services;
+using Serilog;
 using Xunit;
 using Metric = PaxAndromeda.Instar.Metrics.Metric;
 
@@ -68,7 +69,7 @@ public static async Task BirthdaySystem_WhenUserBirthday_ShouldGrantRole()
 		var channel = await orchestrator.Discord.GetChannel(orchestrator.Configuration.BirthdayConfig.BirthdayAnnounceChannel) as TestChannel;
 		channel.Should().NotBeNull();
 
-		var messages = await channel.GetMessagesAsync().SelectMany(n => n).ToListAsync();
+		var messages = await channel.GetMessagesAsync().SelectMany(n => n).ToListAsync(TestContext.Current.CancellationToken);
 		messages.Count.Should().BeGreaterThan(0);
 		TestUtilities.MatchesFormat(Strings.Birthday_Announcement, messages[0].Content);
 
@@ -153,7 +154,7 @@ public static async Task BirthdaySystem_WhenNoBirthdays_ShouldDoNothing()
 		var channel = await orchestrator.Discord.GetChannel(orchestrator.Configuration.BirthdayConfig.BirthdayAnnounceChannel) as TestChannel;
 		channel.Should().NotBeNull();
 
-		var messages = await channel.GetMessagesAsync().SelectMany(n => n).ToListAsync();
+		var messages = await channel.GetMessagesAsync().SelectMany(n => n).ToListAsync(TestContext.Current.CancellationToken);
 		messages.Count.Should().Be(0);
 	}
 
@@ -210,8 +211,8 @@ public static async Task BirthdaySystem_WithBirthdayRoleButNoBirthdayRecord_Shou
 	public static async Task BirthdaySystem_WithUserBirthdayStill_ShouldKeepBirthdayRoles()
 	{
 		// Arrange
-		var birthday = DateTime.Parse("2000-02-13T12:00:00Z");
-		var currentTime = DateTime.Parse("2025-02-14T00:00:00Z");
+		var birthday = DateTimeOffset.Parse("2000-02-13T00:00:00-08:00");
+		var currentTime = DateTimeOffset.Parse("2025-02-14T00:00:00Z");
 
 		var orchestrator = await SetupOrchestrator(currentTime, birthday);
 		var system = orchestrator.GetService<IBirthdaySystem>();

diff --git a/InstarBot.Tests.Orchestrator/InstarBot.Test.Framework.csproj b/InstarBot.Tests.Orchestrator/InstarBot.Test.Framework.csproj
@@ -4,8 +4,15 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="AWSSDK.Core" Version="4.0.3.12" />
+    <PackageReference Include="Serilog.Sinks.XUnit3" Version="1.2.0" />
+    <PackageReference Include="xunit.v3" Version="3.2.2" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\InstarBot.Tests.Common\InstarBot.Tests.Common.csproj" />
   </ItemGroup>

diff --git a/InstarBot.Tests.Orchestrator/TestOrchestrator.cs b/InstarBot.Tests.Orchestrator/TestOrchestrator.cs
@@ -12,6 +12,8 @@
 using Serilog.Events;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
+using Serilog.Sinks.XUnit3;
+using Xunit;
 using InvalidOperationException = Amazon.CloudWatchLogs.Model.InvalidOperationException;
 
 namespace InstarBot.Test.Framework
@@ -109,12 +111,13 @@ private void InitializeActor()
 			tdbs.CreateUserAsync(InstarUserData.CreateFrom(user)).Wait();
 		}
 
-		private static void SetupLogging()
+		public static void SetupLogging()
 		{
 			Log.Logger = new LoggerConfiguration()
 				.Enrich.FromLogContext()
 				.MinimumLevel.Is(LogEventLevel.Verbose)
 				.WriteTo.Console()
+				.WriteTo.XUnit3TestOutput()
 				.CreateLogger();
 			Log.Warning("Logging is enabled for this unit test.");
 		}

diff --git a/InstarBot.Tests.Unit/Assembly.cs b/InstarBot.Tests.Unit/Assembly.cs
diff --git a/InstarBot.Tests.Unit/AsyncAutoResetEventTests.cs b/InstarBot.Tests.Unit/AsyncAutoResetEventTests.cs
@@ -15,7 +15,7 @@ public void WaitAsync_CompletesImmediately_WhenInitiallySignaled()
 		var ev = new AsyncAutoResetEvent(true);
 
 		// Act
-		var task = ev.WaitAsync();
+		var task = ev.WaitAsync(TestContext.Current.CancellationToken);
 
 		// Assert
 		task.IsCompleted.Should().BeTrue();
@@ -26,8 +26,8 @@ public void Set_ReleasesSingleWaiter()
 	{
 		var ev = new AsyncAutoResetEvent(false);
 
-		var waiter1 = ev.WaitAsync();
-		var waiter2 = ev.WaitAsync();
+		var waiter1 = ev.WaitAsync(TestContext.Current.CancellationToken);
+		var waiter2 = ev.WaitAsync(TestContext.Current.CancellationToken);
 
 		// First Set should release only one waiter.
 		ev.Set();
@@ -49,13 +49,13 @@ public void Set_MarksEventSignaled_WhenNoWaiters()
 		// No waiters now — Set should mark the event signaled so the next WaitAsync completes immediately.
 		ev.Set();
 
-		var immediate = ev.WaitAsync();
+		var immediate = ev.WaitAsync(TestContext.Current.CancellationToken);
 
 		// WaitAsync should complete immediately after Set() when there were no waiters
 		immediate.IsCompleted.Should().BeTrue();
 
 		// That consumption should reset the event; a subsequent waiter should block.
-		var next = ev.WaitAsync();
+		var next = ev.WaitAsync(TestContext.Current.CancellationToken);
 
 		next.IsCompleted.Should().BeFalse();
 	}

diff --git a/InstarBot.Tests.Unit/BirthdayTests.cs b/InstarBot.Tests.Unit/BirthdayTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using FluentAssertions;
 using Moq;
 using PaxAndromeda.Instar;

diff --git a/InstarBot.Tests.Unit/InstarBot.Tests.Unit.csproj b/InstarBot.Tests.Unit/InstarBot.Tests.Unit.csproj
@@ -7,16 +7,15 @@
         <IsPackable>false</IsPackable>
 
         <RootNamespace>InstarBot.Tests</RootNamespace>
+        <OutputType>Exe</OutputType>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Ardalis.GuardClauses" Version="5.0.0" />
+        <PackageReference Include="AWSSDK.Core" Version="4.0.3.12" />
         <PackageReference Include="FluentAssertions" Version="8.8.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
         <PackageReference Include="Moq" Version="4.20.72" />
-        <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
-        <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
-        <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
@@ -25,6 +24,7 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
+        <PackageReference Include="xunit.v3" Version="3.2.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/InstarBot/Birthday.cs b/InstarBot/Birthday.cs
@@ -1,4 +1,5 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
+using Serilog;
 
 namespace PaxAndromeda.Instar;
 
@@ -94,7 +95,7 @@ public bool IsToday
 			var currentLocalTime = dtNow.ToOffset(utcOffset);
 
 			var localTimeToday = new DateTimeOffset(currentLocalTime.Date, currentLocalTime.Offset);
-			var localTimeTomorrow = localTimeToday.Date.AddDays(1);
+			var localTimeTomorrow = localTimeToday.AddDays(1);
 
 			return Observed >= localTimeToday && Observed < localTimeTomorrow;
 		}

diff --git a/InstarBot/Commands/SetBirthdayCommand.cs b/InstarBot/Commands/SetBirthdayCommand.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Discord;
 using Discord.Interactions;
 using Discord.WebSocket;

diff --git a/InstarBot/ConfigModels/AutoMemberConfig.cs b/InstarBot/ConfigModels/AutoMemberConfig.cs
@@ -14,7 +14,8 @@ public sealed class AutoMemberConfig
     public int MinimumMessages { get; init; }
     public int MinimumMessageTime { get; init; }
     public List<RoleGroup> RequiredRoles { get; init; } = null!;
-    public bool EnableGaiusCheck { get; init; }
+	public bool EnableGaiusCheck { get; init; }
+	public List<string> AllowedPunishmentReasons { get; init; } = [];
 }
 
 [UsedImplicitly]

diff --git a/InstarBot/InstarBot.csproj b/InstarBot/InstarBot.csproj
@@ -22,6 +22,7 @@
         <PackageReference Include="Ardalis.GuardClauses" Version="5.0.0" />
         <PackageReference Include="AWSSDK.AppConfigData" Version="4.0.2.6" />
         <PackageReference Include="AWSSDK.CloudWatch" Version="4.0.5.4" />
+        <PackageReference Include="AWSSDK.Core" Version="4.0.3.12" />
         <PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.10" />
         <PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="4.0.6.3" />
         <PackageReference Include="CommandLineParser" Version="2.9.1" />

diff --git a/InstarBot/Modals/UserUpdatedEventArgs.cs b/InstarBot/Modals/UserUpdatedEventArgs.cs
@@ -2,18 +2,18 @@
 
 namespace PaxAndromeda.Instar.Modals;
 
-public class UserUpdatedEventArgs(Snowflake id, IGuildUser before, IGuildUser after)
+public class UserUpdatedEventArgs(Snowflake id, IUser before, IUser after)
 {
 	public Snowflake ID { get; } = id;
 
-	public IGuildUser Before { get; } = before;
+	public IUser Before { get; } = before;
 
-	public IGuildUser After { get; } = after;
+	public IUser After { get; } = after;
 
 	// TODO: add additional parts to this for the data we care about
 
 	/// <summary>
 	/// A flag indicating whether data we care about (e.g. nicknames, usernames) has changed.
 	/// </summary>
-	public bool HasUpdated => Before.Username != After.Username || Before.Nickname != After.Nickname;
+	public bool HasUpdated => Before.Username != After.Username || (Before is IGuildUser gBefore && After is IGuildUser gAfter && gBefore.Nickname != gAfter.Nickname);
 }