Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-05-15 06:02:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Changes from self review

Browse source
This commit is contained in:
Slendy 2022-09-24 19:24:38 -05:00
parent fbe203d84a
commit af0e5bd424
No known key found for this signature in database
GPG key ID: 7288D68361B91428
2 changed files with 25 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

42
ProjectLighthouse.Servers.GameServer/Controllers/Slots/CollectionController.cs
View file

@ -25,7 +25,6 @@ public class CollectionController : ControllerBase
this.database = database;
}
[HttpGet("playlists/{playlistId:int}/slots")]
public async Task<IActionResult> GetPlaylistSlots(int playlistId)
{
@ -67,13 +66,7 @@ public class CollectionController : ControllerBase
return this.Ok(this.GetUserPlaylists(token.UserId));
}
this.Request.Body.Position = 0;
string bodyString = await new StreamReader(this.Request.Body).ReadToEndAsync();
string rootElement = bodyString.Contains("levels") ? "levels" : "playlist"; // I hate lbp3
XmlSerializer serializer = new(typeof(Playlist), new XmlRootAttribute(rootElement));
Playlist? newPlaylist = (Playlist?)serializer.Deserialize(new StringReader(bodyString));
Playlist? newPlaylist = await this.getPlaylistFromBody();
if (newPlaylist == null) return this.BadRequest();
@ -96,15 +89,9 @@ public class CollectionController : ControllerBase
}
}
if (!string.IsNullOrWhiteSpace(newPlaylist.Name))
{
targetPlaylist.Name = newPlaylist.Name;
}
if (!string.IsNullOrWhiteSpace(newPlaylist.Name)) targetPlaylist.Name = newPlaylist.Name;
if (!string.IsNullOrWhiteSpace(newPlaylist.Description))
{
targetPlaylist.Description = newPlaylist.Description;
}
if (!string.IsNullOrWhiteSpace(newPlaylist.Description)) targetPlaylist.Description = newPlaylist.Description;
await this.database.SaveChangesAsync();
@ -136,18 +123,12 @@ public class CollectionController : ControllerBase
if (playlistCount > ServerConfiguration.Instance.UserGeneratedContentLimits.ListsQuota) return this.BadRequest();
this.Request.Body.Position = 0;
string bodyString = await new StreamReader(this.Request.Body).ReadToEndAsync();
XmlSerializer serializer = new(typeof(Playlist), new XmlRootAttribute("playlist"));
Playlist? playlist = (Playlist?)serializer.Deserialize(new StringReader(bodyString));
Playlist? playlist = await this.getPlaylistFromBody();
if (playlist == null) return this.BadRequest();
playlist.CreatorId = token.UserId;
SanitizationHelper.SanitizeStringsInClass(playlist);
this.database.Playlists.Add(playlist);
await this.database.SaveChangesAsync();
@ -262,4 +243,19 @@ public class CollectionController : ControllerBase
)
);
}
private async Task<Playlist?> getPlaylistFromBody()
{
this.Request.Body.Position = 0;
string bodyString = await new StreamReader(this.Request.Body).ReadToEndAsync();
string rootElement = bodyString.Contains("levels") ? "levels" : "playlist";
XmlSerializer serializer = new(typeof(Playlist), new XmlRootAttribute(rootElement));
Playlist? playlist = (Playlist?)serializer.Deserialize(new StringReader(bodyString));
SanitizationHelper.SanitizeStringsInClass(playlist);
return playlist;
}
}

13
ProjectLighthouse.Servers.GameServer/Controllers/Slots/ListController.cs
View file

@ -207,10 +207,10 @@ public class ListController : ControllerBase
if (pageSize <= 0) return this.BadRequest();
User? targetUser = await this.database.Users.FirstOrDefaultAsync(u => u.Username == username);
if (targetUser == null) return this.StatusCode(403, "");
int targetUserId = await this.database.Users.Where(u => u.Username == username).Select(u => u.UserId).FirstOrDefaultAsync();
if (targetUserId == 0) return this.StatusCode(403, "");
IEnumerable<Playlist> heartedPlaylists = this.database.Playlists.Where(p => p.CreatorId == targetUser.UserId)
IEnumerable<Playlist> heartedPlaylists = this.database.Playlists.Where(p => p.CreatorId == targetUserId)
.Skip(Math.Max(0, pageStart - 1))
.Take(Math.Min(pageSize, 30))
.AsEnumerable();
@ -221,7 +221,7 @@ public class ListController : ControllerBase
(
LbpSerializer.TaggedStringElement("favouritePlaylists", response, new Dictionary<string, object>
{
{ "total", this.database.HeartedPlaylists.Count(p => p.UserId == targetUser.UserId) },
{ "total", this.database.HeartedPlaylists.Count(p => p.UserId == targetUserId) },
{ "hint_start", pageStart + Math.Min(pageSize, 30) },
})
);
@ -233,15 +233,14 @@ public class ListController : ControllerBase
GameToken? token = await this.database.GameTokenFromRequest(this.Request);
if (token == null) return this.StatusCode(403, "");
User? user = await this.database.Users.FirstOrDefaultAsync(u => u.UserId == token.UserId);
if (user == null) return this.BadRequest();
string username = await this.database.UsernameFromGameToken(token);
Playlist? playlist = await this.database.Playlists.FirstOrDefaultAsync(s => s.PlaylistId == playlistId);
if (playlist == null) return this.NotFound();
await this.database.HeartPlaylist(token.UserId, playlist);
return await this.GetFavouritePlaylists(user.Username, 1, 30);
return await this.GetFavouritePlaylists(username, 1, 30);
}
[HttpPost("unfavourite/slot/{playlistId:int}")]