From d502f2d0f4dd04e66f970a0f06c70f727ea8719c Mon Sep 17 00:00:00 2001 From: CyberL1 Date: Wed, 15 May 2024 10:16:15 +0200 Subject: [PATCH] chore: more cleanup --- MyMcRealms/Controllers/InvitesController.cs | 10 +++++----- MyMcRealms/Controllers/WorldsController.cs | 4 ++-- MyMcRealms/Requests/PlayerRequest.cs | 6 ------ MyMcRealms/Requests/WorldCreateRequest.cs | 8 -------- ...craftPlayerInfo.cs => MinecraftPlayerResponse.cs} | 2 +- MyMcRealms/Responses/PlayerResponse.cs | 12 ++++++++++++ MyMcRealms/Responses/WorldResponse.cs | 12 +----------- 7 files changed, 21 insertions(+), 33 deletions(-) delete mode 100644 MyMcRealms/Requests/WorldCreateRequest.cs rename MyMcRealms/Responses/{MinecraftPlayerInfo.cs => MinecraftPlayerResponse.cs} (79%) create mode 100644 MyMcRealms/Responses/PlayerResponse.cs diff --git a/MyMcRealms/Controllers/InvitesController.cs b/MyMcRealms/Controllers/InvitesController.cs index 82fb2e9..83497f1 100644 --- a/MyMcRealms/Controllers/InvitesController.cs +++ b/MyMcRealms/Controllers/InvitesController.cs @@ -24,18 +24,18 @@ namespace MyMcRealms.Controllers if (world == null) return NotFound("World not found"); // Get player name - var playerInfo = await new HttpClient().GetFromJsonAsync($"https://api.mojang.com/users/profiles/minecraft/{body.Name}"); + var playerInfo = await new HttpClient().GetFromJsonAsync($"https://api.mojang.com/users/profiles/minecraft/{body.Name}"); if (world.Whitelist.Any(p => p.Name == body.Name)) return BadRequest("Player already whitelisted"); var api = new MyMcAPI.Wrapper(world.OwnersToken); api.ExecuteCommand($"whitelist add {body.Name}"); - List whitelistedPlayers = []; + List whitelistedPlayers = []; foreach (var player in world.Whitelist) { - Player whitelistedPlayer = new() + PlayerResponse whitelistedPlayer = new() { Name = player.Name, Uuid = player.Uuid, @@ -48,7 +48,7 @@ namespace MyMcRealms.Controllers whitelistedPlayers.Add(whitelistedPlayer); } - Player npl = new() + PlayerResponse npl = new() { Name = body.Name, Uuid = playerInfo.Id, @@ -96,7 +96,7 @@ namespace MyMcRealms.Controllers var player = world.Whitelist.Find(p => p.Uuid.Replace("-", "") == uuid); // Get player name - var playerInfo = await new HttpClient().GetFromJsonAsync($"https://sessionserver.mojang.com/session/minecraft/profile/{uuid}"); + var playerInfo = await new HttpClient().GetFromJsonAsync($"https://sessionserver.mojang.com/session/minecraft/profile/{uuid}"); if (!world.Whitelist.Any(p => p.Uuid.Replace("-", "") == uuid)) return BadRequest("Player not whitelisted"); diff --git a/MyMcRealms/Controllers/WorldsController.cs b/MyMcRealms/Controllers/WorldsController.cs index 8a47c24..54a430d 100644 --- a/MyMcRealms/Controllers/WorldsController.cs +++ b/MyMcRealms/Controllers/WorldsController.cs @@ -89,11 +89,11 @@ namespace MyMcRealms.Controllers string worldOwnerName = world.Ops.ToArray().Length == 0 ? "Owner" : world.Ops[0].Name; string worldOwnerUuid = world.Ops.ToArray().Length == 0 ? "069a79f444e94726a5befca90e38aaf5" : world.Ops[0].Uuid; string worldName = world.Ops.ToArray().Length == 0 ? world.ServerName : $"{world.Ops[0].Name}'s server"; - List whitelistedPlayers = []; + List whitelistedPlayers = []; foreach (var player in world.Whitelist) { - Player whitelistedPlayer = new() + PlayerResponse whitelistedPlayer = new() { Name = player.Name, Uuid = player.Uuid, diff --git a/MyMcRealms/Requests/PlayerRequest.cs b/MyMcRealms/Requests/PlayerRequest.cs index b85bdf7..50bbff1 100644 --- a/MyMcRealms/Requests/PlayerRequest.cs +++ b/MyMcRealms/Requests/PlayerRequest.cs @@ -2,12 +2,6 @@ { public class PlayerRequest { - public int Id { get; set; } public string Name { get; set; } = string.Empty; - public string Uuid { get; set; } = string.Empty; - public bool Operator { get; set; } - public bool Accepted { get; set; } - public bool Online { get; set; } - public string Permission { get; set; } = "MEMBER"; } } diff --git a/MyMcRealms/Requests/WorldCreateRequest.cs b/MyMcRealms/Requests/WorldCreateRequest.cs deleted file mode 100644 index a86a700..0000000 --- a/MyMcRealms/Requests/WorldCreateRequest.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace MyMcRealms.Requests -{ - public class WorldCreateRequest - { - public string? Name { get; set; } - public string? Description { get; set; } - } -} \ No newline at end of file diff --git a/MyMcRealms/Responses/MinecraftPlayerInfo.cs b/MyMcRealms/Responses/MinecraftPlayerResponse.cs similarity index 79% rename from MyMcRealms/Responses/MinecraftPlayerInfo.cs rename to MyMcRealms/Responses/MinecraftPlayerResponse.cs index d8e2d07..01d7565 100644 --- a/MyMcRealms/Responses/MinecraftPlayerInfo.cs +++ b/MyMcRealms/Responses/MinecraftPlayerResponse.cs @@ -1,6 +1,6 @@ namespace MyMcRealms.Responses { - public class MinecraftPlayerInfo + public class MinecraftPlayerResponse { public string Id { get; set; } = string.Empty; public string Name { get; set; } = string.Empty; diff --git a/MyMcRealms/Responses/PlayerResponse.cs b/MyMcRealms/Responses/PlayerResponse.cs new file mode 100644 index 0000000..a9e2f26 --- /dev/null +++ b/MyMcRealms/Responses/PlayerResponse.cs @@ -0,0 +1,12 @@ +namespace MyMcRealms.Responses +{ + public class PlayerResponse + { + public string Name { get; set; } = string.Empty; + public string Uuid { get; set; } = string.Empty; + public bool Operator { get; set; } + public bool Accepted { get; set; } + public bool Online { get; set; } + public string Permission { get; set; } = "MEMBER"; + } +} \ No newline at end of file diff --git a/MyMcRealms/Responses/WorldResponse.cs b/MyMcRealms/Responses/WorldResponse.cs index 728694d..5bd793f 100644 --- a/MyMcRealms/Responses/WorldResponse.cs +++ b/MyMcRealms/Responses/WorldResponse.cs @@ -12,7 +12,7 @@ namespace MyMcRealms.Responses public string? Motd { get; set; } public string State { get; set; } = "OPEN"; public string WorldType { get; set; } = "NORMAL"; - public List Players { get; set; } = []; + public List Players { get; set; } = []; public int MaxPlayers { get; set; } = 10; public string? MinigameName { get; set; } public int? MinigameId { get; set; } @@ -27,14 +27,4 @@ namespace MyMcRealms.Responses public string Compatibility { get; set; } = string.Empty; public string ActiveVersion { get; set; } = string.Empty; } - - public class Player - { - public string Name { get; set; } = string.Empty; - public string Uuid { get; set; } = string.Empty; - public bool Operator { get; set; } - public bool Accepted { get; set; } - public bool Online { get; set; } - public string Permission { get; set; } = "MEMBER"; - } } \ No newline at end of file