From 113cdf7a82d1ede5868b1242279f516397b917fb Mon Sep 17 00:00:00 2001
From: Stevan Freeborn <65925598+StevanFreeborn@users.noreply.github.com>
Date: Wed, 28 May 2025 17:15:26 -0500
Subject: [PATCH] refactor: clean up usings

---
 src/src/StevesBot.Webhook/Program.cs          | 19 ++++++++-----------
 src/src/StevesBot.Webhook/Usings.cs           |  7 ++++++-
 .../YouTube/Data/YouTubeDataApiClient.cs      |  2 --
 .../Data/YouTubeLiveStreamingDetails.cs       |  2 --
 .../YouTube/Data/YouTubePageInfo.cs           |  2 --
 .../YouTube/Data/YouTubeVideoListResponse.cs  |  2 --
 6 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/src/StevesBot.Webhook/Program.cs b/src/src/StevesBot.Webhook/Program.cs
index 9fbc310..b585858 100644
--- a/src/src/StevesBot.Webhook/Program.cs
+++ b/src/src/StevesBot.Webhook/Program.cs
@@ -1,5 +1,3 @@
-using StevesBot.Library.Discord.Common;
-
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services
@@ -43,18 +41,16 @@ builder.Services.AddSingleton(TimeProvider.System);
 builder.Services.AddSingleton<ConcurrentQueue<SubscribeTask>>();
 builder.Services.AddHostedService<SubscriptionWorker>();
 
-// TODO: This probably should be
-// moved into the AddDiscordRestClient extension method.
-// and we should probably just take the dependency
-// on IOptions<DiscordClientOptions> in DiscordRestClient
+builder.Services.AddOptionsWithValidateOnStart<DiscordNotificationOptions>()
+  .BindConfiguration(nameof(DiscordNotificationOptions))
+  .ValidateDataAnnotations();
+
 builder.Services.AddOptions<DiscordClientOptions>()
   .BindConfiguration(nameof(DiscordClientOptions));
 
-builder.Services.AddSingleton(static sp =>
-{
-  var options = sp.GetRequiredService<IOptions<DiscordClientOptions>>().Value;
-  return options;
-});
+builder.Services.AddSingleton(
+  static sp => sp.GetRequiredService<IOptions<DiscordClientOptions>>().Value
+);
 
 builder.Services.AddDiscordRestClient();
 
@@ -66,6 +62,7 @@ if (app.Environment.IsDevelopment())
 }
 
 const string ytCallback = "yt-callback";
+
 app.MapGet(ytCallback, VerifySubscriptionHandler.HandleAsync);
 app.MapPost(ytCallback, NotificationHandler.HandleAsync);
 
diff --git a/src/src/StevesBot.Webhook/Usings.cs b/src/src/StevesBot.Webhook/Usings.cs
index 5f3aeea..5bd5405 100644
--- a/src/src/StevesBot.Webhook/Usings.cs
+++ b/src/src/StevesBot.Webhook/Usings.cs
@@ -1,13 +1,18 @@
 global using System.Collections.Concurrent;
 global using System.ComponentModel.DataAnnotations;
+global using System.Globalization;
 global using System.Text.Json.Serialization;
 global using System.Text.RegularExpressions;
 
 global using Microsoft.AspNetCore.Mvc;
+global using Microsoft.AspNetCore.WebUtilities;
 global using Microsoft.Extensions.Options;
 
 global using StevesBot.Library.Discord;
-global using StevesBot.Webhook.Handlers;
+global using StevesBot.Library.Discord.Common;
+global using StevesBot.Library.Discord.Rest;
+global using StevesBot.Library.Discord.Rest.Requests;
 global using StevesBot.Webhook.YouTube;
 global using StevesBot.Webhook.YouTube.Data;
+global using StevesBot.Webhook.YouTube.Handlers;
 global using StevesBot.Webhook.YouTube.Tasks;
\ No newline at end of file
diff --git a/src/src/StevesBot.Webhook/YouTube/Data/YouTubeDataApiClient.cs b/src/src/StevesBot.Webhook/YouTube/Data/YouTubeDataApiClient.cs
index dad7469..78ee387 100644
--- a/src/src/StevesBot.Webhook/YouTube/Data/YouTubeDataApiClient.cs
+++ b/src/src/StevesBot.Webhook/YouTube/Data/YouTubeDataApiClient.cs
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.WebUtilities;
-
 namespace StevesBot.Webhook.YouTube.Data;
 
 internal sealed class YouTubeDataApiClient(
diff --git a/src/src/StevesBot.Webhook/YouTube/Data/YouTubeLiveStreamingDetails.cs b/src/src/StevesBot.Webhook/YouTube/Data/YouTubeLiveStreamingDetails.cs
index ffc8717..b4781a1 100644
--- a/src/src/StevesBot.Webhook/YouTube/Data/YouTubeLiveStreamingDetails.cs
+++ b/src/src/StevesBot.Webhook/YouTube/Data/YouTubeLiveStreamingDetails.cs
@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 namespace StevesBot.Webhook.YouTube.Data;
 
 internal sealed record YouTubeLiveStreamingDetails
diff --git a/src/src/StevesBot.Webhook/YouTube/Data/YouTubePageInfo.cs b/src/src/StevesBot.Webhook/YouTube/Data/YouTubePageInfo.cs
index ea51800..717ee98 100644
--- a/src/src/StevesBot.Webhook/YouTube/Data/YouTubePageInfo.cs
+++ b/src/src/StevesBot.Webhook/YouTube/Data/YouTubePageInfo.cs
@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 namespace StevesBot.Webhook.YouTube.Data;
 
 internal sealed record YouTubePageInfo
diff --git a/src/src/StevesBot.Webhook/YouTube/Data/YouTubeVideoListResponse.cs b/src/src/StevesBot.Webhook/YouTube/Data/YouTubeVideoListResponse.cs
index 04d744e..2c259f7 100644
--- a/src/src/StevesBot.Webhook/YouTube/Data/YouTubeVideoListResponse.cs
+++ b/src/src/StevesBot.Webhook/YouTube/Data/YouTubeVideoListResponse.cs
@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 namespace StevesBot.Webhook.YouTube.Data;
 
 internal sealed record YouTubeVideoListResponse