From 50dba77abbafb388a7c519068242becb176c017c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=E2=96=88=E2=96=88=E2=96=88=E2=96=88=E2=96=88?=
 <dev.nullinside@gmail.com>
Date: Mon, 21 Jul 2025 22:13:22 -0400
Subject: [PATCH] feat: providing more user information

---
 src/Nullinside.Api.Common/Twitch/ITwitchApiProxy.cs | 3 ++-
 src/Nullinside.Api.Common/Twitch/TwitchApiProxy.cs  | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Nullinside.Api.Common/Twitch/ITwitchApiProxy.cs b/src/Nullinside.Api.Common/Twitch/ITwitchApiProxy.cs
index 1d49d3a..08b21b1 100644
--- a/src/Nullinside.Api.Common/Twitch/ITwitchApiProxy.cs
+++ b/src/Nullinside.Api.Common/Twitch/ITwitchApiProxy.cs
@@ -3,6 +3,7 @@
 using TwitchLib.Api.Helix.Models.Chat.GetChatters;
 using TwitchLib.Api.Helix.Models.Moderation.BanUser;
 using TwitchLib.Api.Helix.Models.Moderation.GetModerators;
+using TwitchLib.Api.Helix.Models.Users.GetUsers;
 
 namespace Nullinside.Api.Common.Twitch;
 
@@ -49,7 +50,7 @@ public interface ITwitchApiProxy {
   /// </summary>
   /// <param name="token">The cancellation token.</param>
   /// <returns>The twitch user information if successful, null otherwise.</returns>
-  Task<(string? id, string? username)> GetUser(CancellationToken token = new());
+  Task<User?> GetUser(CancellationToken token = new());
 
   /// <summary>
   ///   Gets the twitch id and username of the username provided.
diff --git a/src/Nullinside.Api.Common/Twitch/TwitchApiProxy.cs b/src/Nullinside.Api.Common/Twitch/TwitchApiProxy.cs
index f441760..7b8dc83 100644
--- a/src/Nullinside.Api.Common/Twitch/TwitchApiProxy.cs
+++ b/src/Nullinside.Api.Common/Twitch/TwitchApiProxy.cs
@@ -129,7 +129,7 @@ public TwitchApiProxy(string token, string refreshToken, DateTime tokenExpires,
   /// <inheritdoc />
   public async Task<bool> GetAccessTokenIsValid(CancellationToken token = new()) {
     try {
-      return !string.IsNullOrWhiteSpace((await GetUser(token)).id);
+      return !string.IsNullOrWhiteSpace((await GetUser(token))?.Id);
     }
     catch {
       return false;
@@ -137,16 +137,15 @@ public TwitchApiProxy(string token, string refreshToken, DateTime tokenExpires,
   }
 
   /// <inheritdoc />
-  public virtual async Task<(string? id, string? username)> GetUser(CancellationToken token = new()) {
+  public virtual async Task<User?> GetUser(CancellationToken token = new()) {
     return await Retry.Execute(async () => {
       ITwitchAPI api = GetApi();
       GetUsersResponse? response = await api.Helix.Users.GetUsersAsync();
       if (null == response) {
-        return (null, null);
+        return null;
       }
 
-      User? user = response.Users.FirstOrDefault();
-      return (user?.Id, user?.Login);
+      return response.Users.FirstOrDefault();
     }, Retries, token);
   }