Cyber/MyMcRealms
1
0
Fork 0
mirror of https://github.com/CyberL1/MyMcRealms.git synced 2024-09-16 15:02:53 -04:00
Code Issues

chore: more cleanup

Browse Source
This commit is contained in:
CyberL1 2024-05-15 10:16:15 +02:00
parent 152ad2c0dc
commit d502f2d0f4
7 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MyMcRealms/Controllers/InvitesController.cs
View File

@ -24,18 +24,18 @@ namespace MyMcRealms.Controllers
if (world == null) return NotFound("World not found");
// Get player name
var playerInfo = await new HttpClient().GetFromJsonAsync<MinecraftPlayerInfo>($"https://api.mojang.com/users/profiles/minecraft/{body.Name}");
var playerInfo = await new HttpClient().GetFromJsonAsync<MinecraftPlayerResponse>($"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<Player> whitelistedPlayers = [];
List<PlayerResponse> 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<MinecraftPlayerInfo>($"https://sessionserver.mojang.com/session/minecraft/profile/{uuid}");
var playerInfo = await new HttpClient().GetFromJsonAsync<MinecraftPlayerResponse>($"https://sessionserver.mojang.com/session/minecraft/profile/{uuid}");
if (!world.Whitelist.Any(p => p.Uuid.Replace("-", "") == uuid)) return BadRequest("Player not whitelisted");

4
MyMcRealms/Controllers/WorldsController.cs
View File

@ -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<Player> whitelistedPlayers = [];
List<PlayerResponse> whitelistedPlayers = [];
foreach (var player in world.Whitelist)
{
Player whitelistedPlayer = new()
PlayerResponse whitelistedPlayer = new()
{
Name = player.Name,
Uuid = player.Uuid,

6
MyMcRealms/Requests/PlayerRequest.cs
View File

@ -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";
}
}

8
MyMcRealms/Requests/WorldCreateRequest.cs
View File

@ -1,8 +0,0 @@
namespace MyMcRealms.Requests
{
public class WorldCreateRequest
{
public string? Name { get; set; }
public string? Description { get; set; }
}
}

2
MyMcRealms/Responses/MinecraftPlayerInfo.cs → MyMcRealms/Responses/MinecraftPlayerResponse.cs
View File

@ -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;

12
MyMcRealms/Responses/PlayerResponse.cs Normal file
View File

@ -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";
}
}

12
MyMcRealms/Responses/WorldResponse.cs
View File

@ -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<Player> Players { get; set; } = [];
public List<PlayerResponse> 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";
}
}