update request paths, add payload validations and update midori

flustix · flustix · commit 34fe8f292861 · 2026-05-12T03:51:45.000+02:00
diff --git a/fluXis.sln b/fluXis.sln
@@ -32,8 +32,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.Android", "Fr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LuaDefinitionMaker", "LuaDefinitionMaker\LuaDefinitionMaker.csproj", "{AE7A49FF-10A5-4E87-9C10-85EFDDC49B4F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Midori", "..\..\flustix\Midori\Midori\Midori.csproj", "{DC435D54-56FB-435F-8C9A-F65232AEAFE3}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/fluXis/Online/API/APIRequest.cs b/fluXis/Online/API/APIRequest.cs
@@ -65,6 +65,7 @@ public abstract class APIRequest
     protected abstract string Path { get; }
     protected virtual HttpMethod Method => HttpMethod.Get;
     protected virtual string RootUrl => APIClient.Endpoint.APIUrl;
+    protected virtual string ContentType => "application/json";
 
     protected FluxelClient APIClient { get; private set; }
     protected WebRequest Request { get; private set; }
@@ -95,7 +96,7 @@ public void Perform(IAPIClient client)
         APIClient = fluxel;
 
         Request = CreateWebRequest($"{RootUrl}{Path}");
-        Request.ContentType = "application/json";
+        Request.ContentType = ContentType;
         Request.Method = Method;
         Request.AllowRetryOnTimeout = false;
 
diff --git a/fluXis/Online/API/Payloads/Chat/ChatCreateChannelPayload.cs b/fluXis/Online/API/Payloads/Chat/ChatCreateChannelPayload.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.ComponentModel.DataAnnotations;
 using fluXis.Utils;
 using Newtonsoft.Json;
 
@@ -9,6 +10,7 @@ namespace fluXis.Online.API.Payloads.Chat;
 public class ChatCreateChannelPayload
 {
     [JsonProperty("target")]
+    [Required]
     public long? TargetID { get; set; }
 
     public ChatCreateChannelPayload(long target)
diff --git a/fluXis/Online/API/Payloads/Clubs/CreateClubPayload.cs b/fluXis/Online/API/Payloads/Clubs/CreateClubPayload.cs
@@ -1,32 +1,35 @@
-﻿using fluXis.Online.API.Models.Clubs;
+﻿using System.ComponentModel.DataAnnotations;
+using fluXis.Online.API.Models.Clubs;
+using fluXis.Utils;
 using Newtonsoft.Json;
 
 namespace fluXis.Online.API.Payloads.Clubs;
 
 public class CreateClubPayload
 {
-    /// <summary>
-    /// 3-16 characters. has to be unique
-    /// </summary>
     [JsonProperty("name")]
+    [Required, StringLength(24, MinimumLength = 3)]
     public string Name { get; set; } = null!;
 
     /// <summary>
     /// 3-5 characters. has to be unique
     /// </summary>
     [JsonProperty("tag")]
+    [Required, RegularExpression("^[A-Z0-9]{3,5}$")]
     public string Tag { get; set; } = null!;
 
     /// <summary>
     /// B64-encoded image
     /// </summary>
     [JsonProperty("icon")]
+    [Base64String]
     public string Icon { get; set; } = null!;
 
     /// <summary>
     /// B64-encoded image
     /// </summary>
     [JsonProperty("banner")]
+    [Base64String]
     public string Banner { get; set; } = null!;
 
     /// <summary>
@@ -39,11 +42,13 @@ public class CreateClubPayload
     /// Hex color code
     /// </summary>
     [JsonProperty("color-start")]
+    [Required, RegularExpression(Validate.REGEX_HEX_COLOR)]
     public string ColorStart { get; set; } = null!;
 
     /// <summary>
     /// Hex color code
     /// </summary>
     [JsonProperty("color-end")]
+    [Required, RegularExpression(Validate.REGEX_HEX_COLOR)]
     public string ColorEnd { get; set; } = null!;
 }
diff --git a/fluXis/Online/API/Payloads/Users/UserProfileUpdatePayload.cs b/fluXis/Online/API/Payloads/Users/UserProfileUpdatePayload.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Newtonsoft.Json;
 
 namespace fluXis.Online.API.Payloads.Users;
@@ -10,32 +11,41 @@ public class UserProfileUpdatePayload
     /// base64 encoded image
     /// </summary>
     [JsonProperty("avatar")]
+    [Base64String]
     public string? Avatar { get; set; }
 
     /// <summary>
     /// base64 encoded image
     /// </summary>
     [JsonProperty("banner")]
+    [Base64String]
     public string? Banner { get; set; }
 
     [JsonProperty("nick")]
+    [RegularExpression("^.{2,24}$", ErrorMessage = "Display name must be between 2-24 characters.")]
     public string? DisplayName { get; set; }
 
     [JsonProperty("about")]
+    [MaxLength(256, ErrorMessage = "AboutMe must be shorter than 256 characters.")]
     public string? AboutMe { get; set; }
 
     [JsonProperty("twitter")]
+    [RegularExpression("^.{1,15}$", ErrorMessage = "Twitter handle must be between 1-15 characters.")]
     public string? Twitter { get; set; }
 
     [JsonProperty("discord")]
+    [RegularExpression("^.{2,32}$", ErrorMessage = "Discord handle must be between 2-32 characters.")]
     public string? Discord { get; set; }
 
     [JsonProperty("twitch")]
+    [RegularExpression("^.{4,25}$", ErrorMessage = "Twitch handle must be between 4-25 characters.")]
     public string? Twitch { get; set; }
 
     [JsonProperty("youtube")]
+    [RegularExpression("^.{1,30}$", ErrorMessage = "YouTube handle must be between 1-30 characters.")]
     public string? YouTube { get; set; }
 
     [JsonProperty("pronouns")]
+    [MaxLength(16, ErrorMessage = "Pronouns must be shorter than 16 characters.")]
     public string? Pronouns { get; set; }
 }
diff --git a/fluXis/Online/API/Requests/Clubs/ClubRequest.cs b/fluXis/Online/API/Requests/Clubs/ClubRequest.cs
@@ -4,7 +4,7 @@ namespace fluXis.Online.API.Requests.Clubs;
 
 public class ClubRequest : APIRequest<APIClub>
 {
-    protected override string Path => $"/club/{id}";
+    protected override string Path => $"/clubs/{id}";
 
     private long id { get; }
 
diff --git a/fluXis/Online/API/Requests/Clubs/EditClubRequest.cs b/fluXis/Online/API/Requests/Clubs/EditClubRequest.cs
@@ -8,7 +8,7 @@ namespace fluXis.Online.API.Requests.Clubs;
 
 public class EditClubRequest : APIRequest<APIClub>
 {
-    protected override string Path => $"/club/{id}";
+    protected override string Path => $"/clubs/{id}";
     protected override HttpMethod Method => HttpMethod.Patch;
 
     private long id { get; }
diff --git a/fluXis/Online/API/Requests/Leaderboards/OverallRatingLeaderboardRequest.cs b/fluXis/Online/API/Requests/Leaderboards/OverallRatingLeaderboardRequest.cs
@@ -5,5 +5,5 @@ namespace fluXis.Online.API.Requests.Leaderboards;
 
 public class OverallRatingLeaderboardRequest : APIRequest<List<APIUser>>
 {
-    protected override string Path => "/leaderboards/overall";
+    protected override string Path => "/leaderboards/users/overall";
 }
diff --git a/fluXis/Online/API/Requests/MapSets/Favorite/MapFavoriteRequest.cs b/fluXis/Online/API/Requests/MapSets/Favorite/MapFavoriteRequest.cs
@@ -4,7 +4,7 @@ namespace fluXis.Online.API.Requests.MapSets.Favorite;
 
 public class MapFavoriteRequest : APIRequest<APIMapSetFavoriteState>
 {
-    protected override string Path => $"/mapset/{id}/favorite";
+    protected override string Path => $"/mapsets/{id}/favorite";
 
     private long id { get; }
 
diff --git a/fluXis/Online/API/Requests/MapSets/Favorite/MapFavoriteUpdateRequest.cs b/fluXis/Online/API/Requests/MapSets/Favorite/MapFavoriteUpdateRequest.cs
@@ -7,7 +7,7 @@ namespace fluXis.Online.API.Requests.MapSets.Favorite;
 
 public class MapFavoriteUpdateRequest : APIRequest<APIMapSetFavoriteState>
 {
-    protected override string Path => $"/mapset/{id}/favorite";
+    protected override string Path => $"/mapsets/{id}/favorite";
     protected override HttpMethod Method => HttpMethod.Patch;
 
     private long id { get; }
diff --git a/fluXis/Online/API/Requests/MapSets/Favorite/MapSetModdingRequest.cs b/fluXis/Online/API/Requests/MapSets/Favorite/MapSetModdingRequest.cs
@@ -6,7 +6,7 @@ namespace fluXis.Online.API.Requests.MapSets.Favorite;
 
 public class MapSetModdingRequest : APIRequest<List<APIModdingAction>>
 {
-    protected override string Path => $"/mapset/{id}/modding";
+    protected override string Path => $"/mapsets/{id}/modding";
     private long id { get; }
 
     public MapSetModdingRequest(long id)
diff --git a/fluXis/Online/API/Requests/MapSets/MapSetDeleteRequest.cs b/fluXis/Online/API/Requests/MapSets/MapSetDeleteRequest.cs
@@ -4,7 +4,7 @@ namespace fluXis.Online.API.Requests.MapSets;
 
 public class MapSetDeleteRequest : APIRequest<object>
 {
-    protected override string Path => $"/mapset/{id}";
+    protected override string Path => $"/mapsets/{id}";
     protected override HttpMethod Method => HttpMethod.Delete;
 
     private long id { get; }
diff --git a/fluXis/Online/API/Requests/MapSets/MapSetDownloadRequest.cs b/fluXis/Online/API/Requests/MapSets/MapSetDownloadRequest.cs
@@ -4,7 +4,7 @@ namespace fluXis.Online.API.Requests.MapSets;
 
 public class MapSetDownloadRequest : APIRequest
 {
-    protected override string Path => $"/mapset/{id}/download";
+    protected override string Path => $"/mapsets/{id}/download";
 
     public MemoryStream ResponseStream { get; private set; }
 
diff --git a/fluXis/Online/API/Requests/MapSets/MapSetRequest.cs b/fluXis/Online/API/Requests/MapSets/MapSetRequest.cs
@@ -4,7 +4,7 @@ namespace fluXis.Online.API.Requests.MapSets;
 
 public class MapSetRequest : APIRequest<APIMapSet>
 {
-    protected override string Path => $"/mapset/{id}";
+    protected override string Path => $"/mapsets/{id}";
 
     private long id { get; }
 
diff --git a/fluXis/Online/API/Requests/MapSets/MapSetSubmitQueueRequest.cs b/fluXis/Online/API/Requests/MapSets/MapSetSubmitQueueRequest.cs
@@ -5,7 +5,7 @@ namespace fluXis.Online.API.Requests.MapSets;
 
 public class MapSetSubmitQueueRequest : APIRequest<dynamic>
 {
-    protected override string Path => $"/mapset/{id}/submit";
+    protected override string Path => $"/mapsets/{id}/submit";
     protected override HttpMethod Method => HttpMethod.Post;
 
     private long id { get; }
diff --git a/fluXis/Online/API/Requests/MapSets/MapSetUploadRequest.cs b/fluXis/Online/API/Requests/MapSets/MapSetUploadRequest.cs
@@ -6,8 +6,9 @@ namespace fluXis.Online.API.Requests.MapSets;
 
 public class MapSetUploadRequest : APIRequest<APIMapSet>
 {
-    protected override string Path => update ? $"/mapset/{mapID}" : "/mapsets";
+    protected override string Path => update ? $"/mapsets/{mapID}" : "/mapsets";
     protected override HttpMethod Method => update ? HttpMethod.Patch : HttpMethod.Post;
+    protected override string ContentType => string.Empty;
 
     private bool update => mapID != -1;
 
diff --git a/fluXis/Online/API/Requests/MapSets/Votes/MapVotesRequest.cs b/fluXis/Online/API/Requests/MapSets/Votes/MapVotesRequest.cs
@@ -4,7 +4,7 @@ namespace fluXis.Online.API.Requests.MapSets.Votes;
 
 public class MapVotesRequest : APIRequest<APIMapVotes>
 {
-    protected override string Path => $"/mapset/{id}/votes";
+    protected override string Path => $"/mapsets/{id}/votes";
 
     private long id { get; }
 
diff --git a/fluXis/Online/API/Requests/MapSets/Votes/MapVotesUpdateRequest.cs b/fluXis/Online/API/Requests/MapSets/Votes/MapVotesUpdateRequest.cs
@@ -8,7 +8,7 @@ namespace fluXis.Online.API.Requests.MapSets.Votes;
 
 public class MapVotesUpdateRequest : APIRequest<APIMapVotes>
 {
-    protected override string Path => $"/mapset/{id}/votes";
+    protected override string Path => $"/mapsets/{id}/votes";
     protected override HttpMethod Method => HttpMethod.Post;
 
     private long id { get; }
diff --git a/fluXis/Online/API/Requests/Maps/MapLeaderboardRequest.cs b/fluXis/Online/API/Requests/Maps/MapLeaderboardRequest.cs
@@ -6,7 +6,7 @@ namespace fluXis.Online.API.Requests.Maps;
 
 public class MapLeaderboardRequest : APIRequest<MapLeaderboard>
 {
-    protected override string Path => $"/map/{id}/scores";
+    protected override string Path => $"/maps/{id}/scores";
 
     private ScoreListType type { get; }
     private long id { get; }
diff --git a/fluXis/Online/API/Requests/Users/UserConnectionCreateRequest.cs b/fluXis/Online/API/Requests/Users/UserConnectionCreateRequest.cs
@@ -8,8 +8,8 @@ namespace fluXis.Online.API.Requests.Users;
 
 public class UserConnectionCreateRequest : APIRequest<JToken>
 {
-    protected override string Path => $"/user/{id}/connections";
-    protected override HttpMethod Method => HttpMethod.Post;
+    protected override string Path => $"/users/{id}/connections/{provider}";
+    protected override HttpMethod Method => HttpMethod.Put;
 
     private long id { get; }
     private string provider { get; }
diff --git a/fluXis/Online/API/Requests/Users/UserFollowRequest.cs b/fluXis/Online/API/Requests/Users/UserFollowRequest.cs
@@ -4,8 +4,8 @@ namespace fluXis.Online.API.Requests.Users;
 
 public class UserFollowRequest : APIRequest<dynamic>
 {
-    protected override string Path => $"/user/{id}/follow";
-    protected override HttpMethod Method => unfollow ? HttpMethod.Delete : HttpMethod.Patch;
+    protected override string Path => $"/users/{id}/follow";
+    protected override HttpMethod Method => unfollow ? HttpMethod.Delete : HttpMethod.Put;
 
     private long id { get; }
     private bool unfollow { get; }
diff --git a/fluXis/Online/API/Requests/Users/UserFollowersRequest.cs b/fluXis/Online/API/Requests/Users/UserFollowersRequest.cs
@@ -5,7 +5,7 @@ namespace fluXis.Online.API.Requests.Users;
 
 public class UserFollowersRequest : APIRequest<List<APIUser>>
 {
-    protected override string Path => $"/user/{id}/followers";
+    protected override string Path => $"/users/{id}/followers";
 
     private long id { get; }
 
diff --git a/fluXis/Online/API/Requests/Users/UserMapsRequest.cs b/fluXis/Online/API/Requests/Users/UserMapsRequest.cs
@@ -4,7 +4,7 @@ namespace fluXis.Online.API.Requests.Users;
 
 public class UserMapsRequest : APIRequest<APIUserMaps>
 {
-    protected override string Path => $"/user/{id}/maps";
+    protected override string Path => $"/users/{id}/maps";
 
     private long id { get; }
 
diff --git a/fluXis/Online/API/Requests/Users/UserProfileUpdateRequest.cs b/fluXis/Online/API/Requests/Users/UserProfileUpdateRequest.cs
@@ -8,7 +8,7 @@ namespace fluXis.Online.API.Requests.Users;
 
 public class UserProfileUpdateRequest : APIRequest<APIUser>
 {
-    protected override string Path => $"/user/{uid}";
+    protected override string Path => $"/users/{uid}";
     protected override HttpMethod Method => HttpMethod.Patch;
 
     private long uid { get; }
diff --git a/fluXis/Online/API/Requests/Users/UserRequest.cs b/fluXis/Online/API/Requests/Users/UserRequest.cs
@@ -4,7 +4,7 @@ namespace fluXis.Online.API.Requests.Users;
 
 public class UserRequest : APIRequest<APIUser>
 {
-    protected override string Path => $"/user/{id}";
+    protected override string Path => $"/users/{id}";
 
     private long id { get; }
 
diff --git a/fluXis/Online/API/Requests/Users/UserScoresRequest.cs b/fluXis/Online/API/Requests/Users/UserScoresRequest.cs
@@ -4,7 +4,7 @@ namespace fluXis.Online.API.Requests.Users;
 
 public class UserScoresRequest : APIRequest<APIUserScores>
 {
-    protected override string Path => $"/user/{id}/scores";
+    protected override string Path => $"/users/{id}/scores";
 
     private long id { get; }
 
diff --git a/fluXis/Utils/Validate.cs b/fluXis/Utils/Validate.cs
@@ -0,0 +1,15 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Text.RegularExpressions;
+
+namespace fluXis.Utils;
+
+public static class Validate
+{
+    [StringSyntax(StringSyntaxAttribute.Regex)]
+    public const string REGEX_HEX_COLOR = "^#(?:[0-9a-fA-F]{3}){1,2}$";
+
+    [StringSyntax(StringSyntaxAttribute.Regex)]
+    public const string USERNAME = "^[a-zA-Z0-9_]{3,16}$";
+
+    public static bool Matches(this string input, string regex) => Regex.IsMatch(input, regex);
+}
diff --git a/fluXis/fluXis.csproj b/fluXis/fluXis.csproj
@@ -8,12 +8,12 @@
     <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\flustix\Midori\Midori\Midori.csproj" />
     <ProjectReference Include="..\fluXis.Resources\fluXis.Resources.csproj" />
     <ProjectReference Include="..\Framework\osu.Framework\osu.Framework.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="16.1.1" />
+    <PackageReference Include="flustix.Midori" Version="2026.512.0" />
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
     <PackageReference Include="K4os.Compression.LZ4" Version="1.3.8" />
     <PackageReference Include="NLua" Version="1.7.5" />

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace fluXis.Online.API.Requests.Clubs;`
`4`	`4`
`5`	`5`	`public class ClubRequest : APIRequest<APIClub>`
`6`	`6`	`{`
`7`		`- protected override string Path => $"/club/{id}";`
	`7`	`+ protected override string Path => $"/clubs/{id}";`
`8`	`8`
`9`	`9`	`private long id { get; }`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace fluXis.Online.API.Requests.Clubs;`
`8`	`8`
`9`	`9`	`public class EditClubRequest : APIRequest<APIClub>`
`10`	`10`	`{`
`11`		`- protected override string Path => $"/club/{id}";`
	`11`	`+ protected override string Path => $"/clubs/{id}";`
`12`	`12`	`protected override HttpMethod Method => HttpMethod.Patch;`
`13`	`13`
`14`	`14`	`private long id { get; }`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ namespace fluXis.Online.API.Requests.Leaderboards;`
`5`	`5`
`6`	`6`	`public class OverallRatingLeaderboardRequest : APIRequest<List<APIUser>>`
`7`	`7`	`{`
`8`		`- protected override string Path => "/leaderboards/overall";`
	`8`	`+ protected override string Path => "/leaderboards/users/overall";`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace fluXis.Online.API.Requests.MapSets.Favorite;`
`4`	`4`
`5`	`5`	`public class MapFavoriteRequest : APIRequest<APIMapSetFavoriteState>`
`6`	`6`	`{`
`7`		`- protected override string Path => $"/mapset/{id}/favorite";`
	`7`	`+ protected override string Path => $"/mapsets/{id}/favorite";`
`8`	`8`
`9`	`9`	`private long id { get; }`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace fluXis.Online.API.Requests.MapSets.Favorite;`
`7`	`7`
`8`	`8`	`public class MapFavoriteUpdateRequest : APIRequest<APIMapSetFavoriteState>`
`9`	`9`	`{`
`10`		`- protected override string Path => $"/mapset/{id}/favorite";`
	`10`	`+ protected override string Path => $"/mapsets/{id}/favorite";`
`11`	`11`	`protected override HttpMethod Method => HttpMethod.Patch;`
`12`	`12`
`13`	`13`	`private long id { get; }`