EditClubActivityAsync return ClubActivity

BigBang1112 · Jun 24, 2024 · c909666 · c909666
1 parent 41c27a2
commit c909666
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Src/ManiaAPI.NadeoAPI/NadeoAPI.cs b/Src/ManiaAPI.NadeoAPI/NadeoAPI.cs
@@ -26,6 +26,7 @@ public interface INadeoAPI : IDisposable
     /// <exception cref="NadeoAPIResponseException"></exception>
     Task<HttpResponseMessage> SendAsync(HttpMethod method, string? endpoint, HttpContent? content = null, CancellationToken cancellationToken = default);
     Task<T> GetJsonAsync<T>(string? endpoint, JsonTypeInfo<T> jsonTypeInfo, CancellationToken cancellationToken = default);
+    Task<T> PostJsonAsync<T>(string? endpoint, JsonContent content, JsonTypeInfo<T> jsonTypeInfo, CancellationToken cancellationToken = default);
 }
 
 public abstract class NadeoAPI : INadeoAPI
@@ -94,7 +95,7 @@ public virtual async Task AuthorizeAsync(string login, string password, Authoriz
         }
 
         var payload = new AuthorizationBody(Audience);
-        var content = new StringContent(JsonSerializer.Serialize(payload, NadeoAPIJsonContext.Default.AuthorizationBody), Encoding.UTF8, "application/json");
+        var content = JsonContent.Create(payload, NadeoAPIJsonContext.Default.AuthorizationBody);
 
         var authRequest = method switch
         {
@@ -237,6 +238,12 @@ public async Task<T> GetJsonAsync<T>(string? endpoint, JsonTypeInfo<T> jsonTypeI
         return await response.Content.ReadFromJsonAsync(jsonTypeInfo, cancellationToken) ?? throw new Exception("This shouldn't be null.");
     }
 
+    public async Task<T> PostJsonAsync<T>(string? endpoint, JsonContent content, JsonTypeInfo<T> jsonTypeInfo, CancellationToken cancellationToken = default)
+    {
+        using var response = await SendAsync(HttpMethod.Post, endpoint, content, cancellationToken: cancellationToken);
+        return await response.Content.ReadFromJsonAsync(jsonTypeInfo, cancellationToken) ?? throw new Exception("This shouldn't be null.");
+    }
+
 #if DEBUG
     protected async Task<string> GetAsync(string? endpoint, CancellationToken cancellationToken)
     {

diff --git a/Src/ManiaAPI.NadeoAPI/NadeoLiveServices.cs b/Src/ManiaAPI.NadeoAPI/NadeoLiveServices.cs
@@ -36,7 +36,7 @@ public interface INadeoLiveServices : INadeoAPI
     Task<ClubCollection> GetClubsAsync(int length, int offset = 0, string? name = null, CancellationToken cancellationToken = default);
     Task<ClubPlayerInfo> GetClubPlayerInfoAsync(CancellationToken cancellationToken = default);
     Task<ClubCollection> GetMyClubsAsync(int length, int offset = 0, CancellationToken cancellationToken = default);
-    Task EditClubActivityAsync(int clubId, int activityId, ClubActivityEdition edition, CancellationToken cancellationToken = default);
+    Task<ClubActivity> EditClubActivityAsync(int clubId, int activityId, ClubActivityEdition edition, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Requests the daily channel join link. It can vary based on server occupancy.
@@ -240,9 +240,10 @@ public virtual async Task<ClubCollection> GetMyClubsAsync(int length, int offset
             NadeoAPIJsonContext.Default.ClubCollection, cancellationToken);
     }
 
-    public virtual async Task EditClubActivityAsync(int clubId, int activityId, ClubActivityEdition edition, CancellationToken cancellationToken = default)
+    public virtual async Task<ClubActivity> EditClubActivityAsync(int clubId, int activityId, ClubActivityEdition edition, CancellationToken cancellationToken = default)
     {
         var jsonContent = JsonContent.Create(edition, NadeoAPIJsonContext.Default.ClubActivityEdition);
-        await SendAsync(HttpMethod.Post, $"token/club/{clubId}/activity/{activityId}/edit", jsonContent, cancellationToken);
+        return await PostJsonAsync($"token/club/{clubId}/activity/{activityId}/edit",
+            jsonContent, NadeoAPIJsonContext.Default.ClubActivity, cancellationToken);
     }
 }