Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-07-19 11:41:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix level publishing

Browse source
This commit is contained in:
Slendy 2023-03-28 14:26:09 -05:00
parent deac39ef97
commit 90f79d67c4
No known key found for this signature in database
GPG key ID: 7288D68361B91428
3 changed files with 39 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

53
ProjectLighthouse.Servers.GameServer/Controllers/Slots/PublishController.cs
View file

@ -1,4 +1,5 @@
#nullable enable #nullable enable
using System.Diagnostics;
using LBPUnion.ProjectLighthouse.Configuration; using LBPUnion.ProjectLighthouse.Configuration;
using LBPUnion.ProjectLighthouse.Database; using LBPUnion.ProjectLighthouse.Database;
using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Extensions;
@ -55,9 +56,9 @@ public class PublishController : ControllerBase
return this.BadRequest(); return this.BadRequest();
} }
if (slot.Resources?.Length == 0) slot.Resources = new[]{slot.RootLevel,}; if (slot.ResourceList?.Length == 0) slot.ResourceList = new[]{slot.RootLevel,};
if (slot.Resources == null) if (slot.ResourceList == null)
{ {
Logger.Warn("Rejecting level upload, resource list is null", LogArea.Publish); Logger.Warn("Rejecting level upload, resource list is null", LogArea.Publish);
return this.BadRequest(); return this.BadRequest();
@ -85,7 +86,7 @@ public class PublishController : ControllerBase
return this.Forbid(); return this.Forbid();
} }
HashSet<string> resources = new(slot.Resources) HashSet<string> resources = new(slot.ResourceList)
{ {
slot.IconHash, slot.IconHash,
}; };
@ -113,11 +114,19 @@ public class PublishController : ControllerBase
return this.BadRequest(); return this.BadRequest();
} }
if (slot.Resources == null) if (slot.ResourceList?.Length == 0)
{ {
Logger.Warn("Rejecting level upload, resource list is null", LogArea.Publish); Logger.Warn("Rejecting level upload, resource list is null", LogArea.Publish);
return this.BadRequest(); return this.BadRequest();
} }
// Yes Rider, this isn't null
Debug.Assert(slot.ResourceList != null, "slot.ResourceList != null");
if (string.IsNullOrWhiteSpace(slot.BackgroundHash))
{
Logger.Warn("Rejecting level upload, background is null", LogArea.Publish);
return this.BadRequest();
}
slot.Description = CensorHelper.FilterMessage(slot.Description); slot.Description = CensorHelper.FilterMessage(slot.Description);
@ -135,7 +144,7 @@ public class PublishController : ControllerBase
return this.BadRequest(); return this.BadRequest();
} }
if (slot.Resources != null && slot.Resources.Any(resource => !FileHelper.ResourceExists(resource))) if (slot.ResourceList.Any(resource => !FileHelper.ResourceExists(resource)))
{ {
Logger.Warn("Rejecting level upload, missing resource(s)", LogArea.Publish); Logger.Warn("Rejecting level upload, missing resource(s)", LogArea.Publish);
return this.BadRequest(); return this.BadRequest();
@ -173,6 +182,11 @@ public class PublishController : ControllerBase
slot.AuthorLabels = LabelHelper.RemoveInvalidLabels(slot.AuthorLabels); slot.AuthorLabels = LabelHelper.RemoveInvalidLabels(slot.AuthorLabels);
if (!slot.ResourceList.Contains(slot.RootLevel))
slot.ResourceList = slot.ResourceList.Append(rootLevel.Hash).ToArray();
string resourceCollection = string.Join(",", slot.ResourceList);
// Republish logic // Republish logic
if (slot.SlotId != 0) if (slot.SlotId != 0)
{ {
@ -197,12 +211,13 @@ public class PublishController : ControllerBase
{ {
// Delete the useless rootLevel that lbp3 just uploaded // Delete the useless rootLevel that lbp3 just uploaded
if (slotVersion == GameVersion.LittleBigPlanet3) if (slotVersion == GameVersion.LittleBigPlanet3)
FileHelper.DeleteResource(slot.RootLevel); FileHelper.DeleteResource(rootLevel.Hash);
else else
// Only change the rootLevel and gameversion if it's not lbp3
{ {
oldSlot.GameVersion = slot.GameVersion; oldSlot.GameVersion = slot.GameVersion;
oldSlot.RootLevel = slot.RootLevel; oldSlot.RootLevel = rootLevel.Hash;
oldSlot.Resources = slot.Resources; oldSlot.ResourceCollection = resourceCollection;
} }
} }
} }
@ -247,19 +262,19 @@ public class PublishController : ControllerBase
} }
SlotEntity slotEntity = SlotBase.ConvertToEntity(slot); SlotEntity slotEntity = SlotBase.ConvertToEntity(slot);
slotEntity.CreatorId = user.UserId;
slotEntity.FirstUploaded = TimeHelper.TimestampMillis;
slotEntity.LastUpdated = TimeHelper.TimestampMillis;
slotEntity.ResourceCollection = resourceCollection;
slot.CreatorId = user.UserId; if (slotEntity.MinimumPlayers == 0 || slot.MaximumPlayers == 0)
slot.FirstUploaded = TimeHelper.TimestampMillis;
slot.LastUpdated = TimeHelper.TimestampMillis;
if (slot.MinimumPlayers == 0 || slot.MaximumPlayers == 0)
{ {
slot.MinimumPlayers = 1; slotEntity.MinimumPlayers = 1;
slot.MaximumPlayers = 4; slotEntity.MaximumPlayers = 4;
} }
slot.MinimumPlayers = Math.Clamp(slot.MinimumPlayers, 1, 4); slotEntity.MinimumPlayers = Math.Clamp(slotEntity.MinimumPlayers, 1, 4);
slot.MaximumPlayers = Math.Clamp(slot.MaximumPlayers, 1, 4); slotEntity.MaximumPlayers = Math.Clamp(slotEntity.MaximumPlayers, 1, 4);
this.database.Slots.Add(slotEntity); this.database.Slots.Add(slotEntity);
await this.database.SaveChangesAsync(); await this.database.SaveChangesAsync();
@ -267,10 +282,10 @@ public class PublishController : ControllerBase
if (user.LevelVisibility == PrivacyType.All) if (user.LevelVisibility == PrivacyType.All)
{ {
await WebhookHelper.SendWebhook("New level published!", await WebhookHelper.SendWebhook("New level published!",
$"**{user.Username}** just published a new level: [**{slot.Name}**]({ServerConfiguration.Instance.ExternalUrl}/slot/{slot.SlotId})\n{slot.Description}"); $"**{user.Username}** just published a new level: [**{slotEntity.Name}**]({ServerConfiguration.Instance.ExternalUrl}/slot/{slotEntity.SlotId})\n{slotEntity.Description}");
} }
Logger.Success($"Successfully published level {slot.Name} (id: {slot.SlotId}) by {user.Username} (id: {user.UserId})", LogArea.Publish); Logger.Success($"Successfully published level {slotEntity.Name} (id: {slotEntity.SlotId}) by {user.Username} (id: {user.UserId})", LogArea.Publish);
return this.Ok(SlotBase.CreateFromEntity(slotEntity, token)); return this.Ok(SlotBase.CreateFromEntity(slotEntity, token));
} }

3
ProjectLighthouse/Types/Resources/LbpFile.cs
View file

@ -28,8 +28,9 @@ public class LbpFile
this.Hash = CryptoHelper.Sha1Hash(this.Data).ToLower(); this.Hash = CryptoHelper.Sha1Hash(this.Data).ToLower();
} }
public static LbpFile? FromHash(string hash) public static LbpFile? FromHash(string? hash)
{ {
if (hash == null) return null;
string path = FileHelper.GetResourcePath(hash); string path = FileHelper.GetResourcePath(hash);
if (!File.Exists(path)) return null; if (!File.Exists(path)) return null;

6
ProjectLighthouse/Types/Serialization/SlotBase.cs
View file

@ -1,5 +1,4 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using LBPUnion.ProjectLighthouse.Serialization;
using LBPUnion.ProjectLighthouse.Types.Entities.Level; using LBPUnion.ProjectLighthouse.Types.Entities.Level;
using LBPUnion.ProjectLighthouse.Types.Entities.Token; using LBPUnion.ProjectLighthouse.Types.Entities.Token;
using LBPUnion.ProjectLighthouse.Types.Levels; using LBPUnion.ProjectLighthouse.Types.Levels;
@ -28,8 +27,9 @@ public abstract class SlotBase : ILbpSerializable
Description = slot.Description, Description = slot.Description,
Location = slot.Location, Location = slot.Location,
IconHash = slot.IconHash, IconHash = slot.IconHash,
BackgroundHash = slot.BackgroundHash, BackgroundHash = slot.BackgroundHash ?? "",
AuthorLabels = slot.AuthorLabels, AuthorLabels = slot.AuthorLabels,
GameVersion = slot.GameVersion,
Shareable = slot.IsShareable, Shareable = slot.IsShareable,
Resources = slot.Resources, Resources = slot.Resources,
InitiallyLocked = slot.InitiallyLocked, InitiallyLocked = slot.InitiallyLocked,
@ -40,7 +40,7 @@ public abstract class SlotBase : ILbpSerializable
IsAdventurePlanet = slot.IsAdventurePlanet, IsAdventurePlanet = slot.IsAdventurePlanet,
LevelType = slot.LevelType, LevelType = slot.LevelType,
SubLevel = slot.IsSubLevel, SubLevel = slot.IsSubLevel,
RootLevel = slot.RootLevel, RootLevel = slot.RootLevel ?? "",
MoveRequired = slot.IsMoveRequired, MoveRequired = slot.IsMoveRequired,
CrossControllerRequired = slot.IsCrossControlRequired, CrossControllerRequired = slot.IsCrossControlRequired,
}; };