Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-08-05 19:38:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Allow amount of allowed levels to be configured

Browse source 
Closes #67
This commit is contained in:
jvyden 2021-11-26 17:21:01 -05:00
commit f671267ed8
No known key found for this signature in database
GPG key ID: 18BCF2BE0262B278
5 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ProjectLighthouse/Controllers/SlotsController.cs
View file

@ -41,7 +41,7 @@ namespace LBPUnion.ProjectLighthouse.Controllers
.Include(s => s.Location) .Include(s => s.Location)
.Where(s => s.Creator!.Username == user.Username) .Where(s => s.Creator!.Username == user.Username)
.Skip(pageStart - 1) .Skip(pageStart - 1)
.Take(Math.Min(pageSize, ServerStatics.EntitledSlots)), .Take(Math.Min(pageSize, ServerSettings.Instance.EntitledSlots)),
string.Empty, string.Empty,
(current, slot) => current + slot.Serialize() (current, slot) => current + slot.Serialize()
); );
@ -55,7 +55,7 @@ namespace LBPUnion.ProjectLighthouse.Controllers
new Dictionary<string, object> new Dictionary<string, object>
{ {
{ {
"hint_start", pageStart + Math.Min(pageSize, ServerStatics.EntitledSlots) "hint_start", pageStart + Math.Min(pageSize, ServerSettings.Instance.EntitledSlots)
}, },
{ {
"total", user.UsedSlots "total", user.UsedSlots

2
ProjectLighthouse/Pages/UserPage.cshtml
View file

@ -17,7 +17,7 @@
<div class="userStats"> <div class="userStats">
<i class="pink heart icon" title="Hearts"></i> <span>@Model.ProfileUser.Hearts</span> <i class="pink heart icon" title="Hearts"></i> <span>@Model.ProfileUser.Hearts</span>
<i class="blue comment icon" title="Comments"></i> <span>@Model.ProfileUser.Comments</span> <i class="blue comment icon" title="Comments"></i> <span>@Model.ProfileUser.Comments</span>
<i class="green upload icon" title="Uploaded Levels"></i><span>@Model.ProfileUser.UsedSlots / @ServerStatics.EntitledSlots</span> <i class="green upload icon" title="Uploaded Levels"></i><span>@Model.ProfileUser.UsedSlots / @ServerSettings.Instance.EntitledSlots</span>
<i class="purple camera icon" title="Uploaded Photos"></i><span>@Model.ProfileUser.PhotosByMe</span> <i class="purple camera icon" title="Uploaded Photos"></i><span>@Model.ProfileUser.PhotosByMe</span>
</div> </div>
</div> </div>

9
ProjectLighthouse/Types/Settings/ServerSettings.cs
View file

@ -63,7 +63,7 @@ namespace LBPUnion.ProjectLighthouse.Types.Settings
} }
} }
public const int CurrentConfigVersion = 9; // MUST BE INCREMENTED FOR EVERY CONFIG CHANGE! public const int CurrentConfigVersion = 10; // MUST BE INCREMENTED FOR EVERY CONFIG CHANGE!
#region Meta #region Meta
@ -95,5 +95,12 @@ namespace LBPUnion.ProjectLighthouse.Types.Settings
public bool CheckForUnsafeFiles { get; set; } = true; public bool CheckForUnsafeFiles { get; set; } = true;
public bool RegistrationEnabled { get; set; } = true; public bool RegistrationEnabled { get; set; } = true;
/// <summary>
/// The maximum amount of slots allowed on users' earth
/// </summary>
public int EntitledSlots { get; set; } = 50;
public int ListsQuota { get; set; } = 50;
} }
} }

7
ProjectLighthouse/Types/Settings/ServerStatics.cs
View file

@ -8,13 +8,6 @@ namespace LBPUnion.ProjectLighthouse.Types.Settings
{ {
public static class ServerStatics public static class ServerStatics
{ {
/// <summary>
/// The maximum amount of slots allowed on users' earth
/// </summary>
public const int EntitledSlots = 50;
public const int ListsQuota = 50;
public const string ServerName = "ProjectLighthouse"; public const string ServerName = "ProjectLighthouse";
public static bool DbConnected { public static bool DbConnected {

9
ProjectLighthouse/Types/User.cs
View file

@ -120,7 +120,8 @@ namespace LBPUnion.ProjectLighthouse.Types
LbpSerializer.StringElement("game", this.Game) + LbpSerializer.StringElement("game", this.Game) +
this.SerializeSlots(gameVersion == GameVersion.LittleBigPlanetVita) + this.SerializeSlots(gameVersion == GameVersion.LittleBigPlanetVita) +
LbpSerializer.StringElement("lists", this.Lists) + LbpSerializer.StringElement("lists", this.Lists) +
LbpSerializer.StringElement("lists_quota", ServerStatics.ListsQuota) + // technically not a part of the user but LBP expects it LbpSerializer.StringElement
("lists_quota", ServerSettings.Instance.ListsQuota) + // technically not a part of the user but LBP expects it
LbpSerializer.StringElement("biography", this.Biography) + LbpSerializer.StringElement("biography", this.Biography) +
LbpSerializer.StringElement("reviewCount", this.Reviews) + LbpSerializer.StringElement("reviewCount", this.Reviews) +
LbpSerializer.StringElement("commentCount", this.Comments) + LbpSerializer.StringElement("commentCount", this.Comments) +
@ -162,7 +163,7 @@ namespace LBPUnion.ProjectLighthouse.Types
/// <summary> /// <summary>
/// The number of slots remaining on the earth /// The number of slots remaining on the earth
/// </summary> /// </summary>
public int FreeSlots => ServerStatics.EntitledSlots - this.UsedSlots; public int FreeSlots => ServerSettings.Instance.EntitledSlots - this.UsedSlots;
private static readonly string[] slotTypes = private static readonly string[] slotTypes =
{ {
@ -192,12 +193,12 @@ namespace LBPUnion.ProjectLighthouse.Types
slotTypesLocal = slotTypes; slotTypesLocal = slotTypes;
} }
slots += LbpSerializer.StringElement("entitledSlots", ServerStatics.EntitledSlots); slots += LbpSerializer.StringElement("entitledSlots", ServerSettings.Instance.EntitledSlots);
slots += LbpSerializer.StringElement("freeSlots", this.FreeSlots); slots += LbpSerializer.StringElement("freeSlots", this.FreeSlots);
foreach (string slotType in slotTypesLocal) foreach (string slotType in slotTypesLocal)
{ {
slots += LbpSerializer.StringElement(slotType + "EntitledSlots", ServerStatics.EntitledSlots); slots += LbpSerializer.StringElement(slotType + "EntitledSlots", ServerSettings.Instance.EntitledSlots);
// ReSharper disable once StringLiteralTypo // ReSharper disable once StringLiteralTypo
slots += LbpSerializer.StringElement(slotType + slotType == "crossControl" ? "PurchsedSlots" : "PurchasedSlots", 0); slots += LbpSerializer.StringElement(slotType + slotType == "crossControl" ? "PurchsedSlots" : "PurchasedSlots", 0);
slots += LbpSerializer.StringElement(slotType + "FreeSlots", this.FreeSlots); slots += LbpSerializer.StringElement(slotType + "FreeSlots", this.FreeSlots);