@@ -165,10 +173,10 @@
diff --git a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs
index 93259557..1429e093 100644
--- a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs
@@ -52,6 +52,8 @@ public class BaseLayout : PageModel
{
if (ServerStatics.IsUnitTesting) return LocalizationManager.DefaultLang;
if (this.language != null) return this.language;
+
+ if (this.User?.IsAPirate ?? false) return "en-PT";
IRequestCultureFeature? requestCulture = Request.HttpContext.Features.Get();
if (requestCulture == null) return this.language = LocalizationManager.DefaultLang;
diff --git a/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml.cs
index 9d766bb5..c751290e 100644
--- a/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml.cs
@@ -3,6 +3,7 @@ using JetBrains.Annotations;
using LBPUnion.ProjectLighthouse.Configuration;
using LBPUnion.ProjectLighthouse.Extensions;
using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Localization.StringLists;
using LBPUnion.ProjectLighthouse.Logging;
using LBPUnion.ProjectLighthouse.PlayerData;
using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
@@ -26,19 +27,19 @@ public class LoginForm : BaseLayout
{
if (string.IsNullOrWhiteSpace(username))
{
- this.Error = "The username field is required.";
+ this.Error = this.Translate(ErrorStrings.UsernameInvalid);
return this.Page();
}
if (string.IsNullOrWhiteSpace(password))
{
- this.Error = "The password field is required.";
+ this.Error = this.Translate(ErrorStrings.PasswordInvalid);
return this.Page();
}
if (!await this.Request.CheckCaptchaValidity())
{
- this.Error = "You must complete the captcha correctly.";
+ this.Error = this.Translate(ErrorStrings.CaptchaFailed);
return this.Page();
}
@@ -60,7 +61,7 @@ public class LoginForm : BaseLayout
if (user.IsBanned)
{
Logger.Warn($"User {user.Username} (id: {user.UserId}) failed to login on web due to being banned", LogArea.Login);
- this.Error = "You have been banned. Please contact an administrator for more information.\nReason: " + user.BannedReason;
+ this.Error = this.Translate(ErrorStrings.UserIsBanned, user.BannedReason);
return this.Page();
}
@@ -73,6 +74,7 @@ public class LoginForm : BaseLayout
UserId = user.UserId,
User = user,
EmailToken = CryptoHelper.GenerateAuthToken(),
+ ExpiresAt = DateTime.Now + TimeSpan.FromHours(6),
};
this.Database.EmailSetTokens.Add(emailSetToken);
@@ -85,6 +87,7 @@ public class LoginForm : BaseLayout
{
UserId = user.UserId,
UserToken = CryptoHelper.GenerateAuthToken(),
+ ExpiresAt = DateTime.Now + TimeSpan.FromDays(7),
};
this.Database.WebTokens.Add(webToken);
diff --git a/ProjectLighthouse.Servers.Website/Pages/Partials/CommentsPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/CommentsPartial.cshtml
index c1b9b962..8998a477 100644
--- a/ProjectLighthouse.Servers.Website/Pages/Partials/CommentsPartial.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/Partials/CommentsPartial.cshtml
@@ -52,7 +52,7 @@
string style = "";
if (Model.User?.UserId == comment.PosterUserId)
{
- style = "visibility: hidden";
+ style = "pointer-events: none";
}
}
+@if (Model.Photos.Count != 0)
+{
+
-
Page generated by @VersionHelper.FullVersion.
+@Model.Translate(BaseLayoutStrings.GeneratedBy, VersionHelper.FullVersion)
@if (VersionHelper.IsDirty) { -This page was generated using a modified version of Project Lighthouse. Please make sure you are properly disclosing the source code to any users who may be using this instance.
+@Model.Translate(BaseLayoutStrings.GeneratedModified)
}
diff --git a/ProjectLighthouse.Servers.Website/Pages/Partials/PhotoPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/PhotoPartial.cshtml
index 66c8b0fa..da1a46b2 100644
--- a/ProjectLighthouse.Servers.Website/Pages/Partials/PhotoPartial.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/Partials/PhotoPartial.cshtml
@@ -1,5 +1,6 @@
+@using System.Globalization
+@using LBPUnion.ProjectLighthouse.Levels
@using LBPUnion.ProjectLighthouse.PlayerData
-@using LBPUnion.ProjectLighthouse.Types
@model LBPUnion.ProjectLighthouse.PlayerData.Photo
@@ -18,6 +19,27 @@
@Model.Creator?.Username
+ @if (Model.Slot != null)
+ {
+ switch (Model.Slot.Type)
+ {
+ case SlotType.User:
+
+ in level @Model.Slot.Name
+
+ break;
+ case SlotType.Developer:
+ in a story mode level
+ break;
+ case SlotType.Pod:
+ in the pod
+ break;
+ case SlotType.Local:
+ in a level on the moon
+ break;
+ }
+ }
+ at @DateTime.UnixEpoch.AddSeconds(Model.Timestamp).ToString(CultureInfo.CurrentCulture)
@@ -124,4 +146,4 @@
context.setTransform(1, 0, 0, 1, 0, 0);
})
}, false);
-
\ No newline at end of file
+
diff --git a/ProjectLighthouse.Servers.Website/Pages/PasswordResetPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/PasswordResetPage.cshtml
index 2f8a3ff3..bbc2a2ab 100644
--- a/ProjectLighthouse.Servers.Website/Pages/PasswordResetPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/PasswordResetPage.cshtml
@@ -1,4 +1,5 @@
@page "/passwordReset"
+@using LBPUnion.ProjectLighthouse.Localization.StringLists
@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.PasswordResetPage
@{
@@ -26,7 +27,7 @@
{
diff --git a/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequestForm.cshtml b/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequestForm.cshtml
index 22d590c2..53318893 100644
--- a/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequestForm.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequestForm.cshtml
@@ -1,4 +1,5 @@
@page "/passwordResetRequest"
+@using LBPUnion.ProjectLighthouse.Localization.StringLists
@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.PasswordResetRequestForm
@{
@@ -10,7 +11,7 @@
{
@@ -20,7 +21,7 @@
{
diff --git a/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml.cs
index b636205e..f2ce8fb0 100644
--- a/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml.cs
@@ -40,6 +40,7 @@ public class PhotosPage : BaseLayout
this.Photos = await this.Database.Photos.Include
(p => p.Creator)
+ .Include(p => p.Slot)
.Where(p => p.Creator!.Username.Contains(this.SearchValue) || p.PhotoSubjectCollection.Contains(this.SearchValue))
.OrderByDescending(p => p.Timestamp)
.Skip(pageNumber * ServerStatics.PageSize)
diff --git a/ProjectLighthouse.Servers.Website/Pages/PirateSignupPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/PirateSignupPage.cshtml
new file mode 100644
index 00000000..9d9b183e
--- /dev/null
+++ b/ProjectLighthouse.Servers.Website/Pages/PirateSignupPage.cshtml
@@ -0,0 +1,31 @@
+@page "/pirate"
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.PirateSignupPage
+
+@{
+ Layout = "Layouts/BaseLayout";
+ Model.Title = "ARRRRRRRRRR!";
+}
+
+
+@if (!Model.User!.IsAPirate)
+{
+ OnGet()
+ {
+ User? user = this.Database.UserFromWebRequest(this.Request);
+ if (user == null) return this.RedirectToPage("/login");
+
+ return this.Page();
+ }
+
+ public async Task OnPost()
+ {
+ User? user = this.Database.UserFromWebRequest(this.Request);
+ if (user == null) return this.Redirect("/login");
+
+ user.IsAPirate = !user.IsAPirate;
+ await this.Database.SaveChangesAsync();
+
+ return this.Redirect("/");
+ }
+}
\ No newline at end of file
diff --git a/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml b/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml
index 1a08875b..53a4c151 100644
--- a/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml
@@ -1,5 +1,6 @@
@page "/register"
@using LBPUnion.ProjectLighthouse.Configuration
+@using LBPUnion.ProjectLighthouse.Localization.StringLists
@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.RegisterForm
@{
@@ -26,12 +27,14 @@
{
}
+
So, ye wanna be a pirate? Well, ye came to the right place!
+Just click this 'ere button, and welcome aboard!
+If you ever wanna walk the plank, come back 'ere.
+ + +} +else +{ +Back so soon, aye?
+If you're gonna walk the plank, then do it!
+ + +} + diff --git a/ProjectLighthouse.Servers.Website/Pages/PirateSignupPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/PirateSignupPage.cshtml.cs new file mode 100644 index 00000000..445aed21 --- /dev/null +++ b/ProjectLighthouse.Servers.Website/Pages/PirateSignupPage.cshtml.cs @@ -0,0 +1,32 @@ +using LBPUnion.ProjectLighthouse.PlayerData.Profiles; +using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore.Metadata.Internal; + +namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages; + +public class PirateSignupPage : BaseLayout +{ + public PirateSignupPage(Database database) : base(database) + {} + + public async Task@Model.Translate(RegisterStrings.UsernameNotice)
+
+
+}
+
@if (Model.User != null && Model.User.IsModerator)
{
Most recent photos
+ +
+ @foreach (Photo photo in Model.Photos)
+ {
+
+
+ @await Html.PartialAsync("Partials/PhotoPartial", photo)
+
+ }
+
diff --git a/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml.cs
index 47d8f265..c870bfc1 100644
--- a/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml.cs
@@ -15,6 +15,7 @@ public class SlotPage : BaseLayout
{
public List Comments = new();
public List Reviews = new();
+ public List Photos = new();
public readonly bool CommentsEnabled = ServerConfiguration.Instance.UserGeneratedContentLimits.LevelCommentsEnabled;
public readonly bool ReviewsEnabled = ServerConfiguration.Instance.UserGeneratedContentLimits.LevelReviewsEnabled;
@@ -25,8 +26,34 @@ public class SlotPage : BaseLayout
public async Task OnGet([FromRoute] int id)
{
- Slot? slot = await this.Database.Slots.Include(s => s.Creator).FirstOrDefaultAsync(s => s.SlotId == id);
+ Slot? slot = await this.Database.Slots.Include
+ (s => s.Creator)
+ .Where(s => s.Type == SlotType.User)
+ .FirstOrDefaultAsync(s => s.SlotId == id);
if (slot == null) return this.NotFound();
+ System.Diagnostics.Debug.Assert(slot.Creator != null);
+
+ // Determine if user can view slot according to creator's privacy settings
+ if (this.User == null || !this.User.IsAdmin)
+ {
+ switch (slot.Creator.ProfileVisibility)
+ {
+ case PrivacyType.PSN:
+ {
+ if (this.User != null) return this.NotFound();
+
+ break;
+ }
+ case PrivacyType.Game:
+ {
+ if (slot.Creator != this.User) return this.NotFound();
+
+ break;
+ }
+ case PrivacyType.All: break;
+ default: throw new ArgumentOutOfRangeException();
+ }
+ }
this.Slot = slot;
@@ -57,6 +84,12 @@ public class SlotPage : BaseLayout
this.Reviews = new List();
}
+ this.Photos = await this.Database.Photos.Include(p => p.Creator)
+ .OrderByDescending(p => p.Timestamp)
+ .Where(r => r.SlotId == id)
+ .Take(10)
+ .ToListAsync();
+
if (this.User == null) return this.Page();
foreach (Comment c in this.Comments)
diff --git a/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml.cs
index 2bc11efa..e844102e 100644
--- a/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml.cs
@@ -3,6 +3,7 @@ using System.Text;
using LBPUnion.ProjectLighthouse.Configuration;
using LBPUnion.ProjectLighthouse.Levels;
using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
using LBPUnion.ProjectLighthouse.Types;
using Microsoft.AspNetCore.Mvc;
@@ -55,6 +56,7 @@ public class SlotsPage : BaseLayout
this.SearchValue = name.Trim();
this.SlotCount = await this.Database.Slots.Include(p => p.Creator)
+ .Where(p => p.Type == SlotType.User)
.Where(p => p.Name.Contains(finalSearch.ToString()))
.Where(p => p.Creator != null && (targetAuthor == null || string.Equals(p.Creator.Username.ToLower(), targetAuthor.ToLower())))
.Where(p => targetGame == null || p.GameVersion == targetGame)
@@ -66,8 +68,10 @@ public class SlotsPage : BaseLayout
if (this.PageNumber < 0 || this.PageNumber >= this.PageAmount) return this.Redirect($"/slots/{Math.Clamp(this.PageNumber, 0, this.PageAmount - 1)}");
this.Slots = await this.Database.Slots.Include(p => p.Creator)
+ .Where(p => p.Type == SlotType.User)
.Where(p => p.Name.Contains(finalSearch.ToString()))
.Where(p => p.Creator != null && (targetAuthor == null || string.Equals(p.Creator.Username.ToLower(), targetAuthor.ToLower())))
+ .Where(p => p.Creator!.LevelVisibility == PrivacyType.All) // TODO: change check for when user is logged in
.Where(p => targetGame == null || p.GameVersion == targetGame)
.OrderByDescending(p => p.FirstUploaded)
.Skip(pageNumber * ServerStatics.PageSize)
diff --git a/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml
index 3050ef8d..c0013525 100644
--- a/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml
@@ -1,6 +1,7 @@
@page "/user/{userId:int}"
@using System.Web
@using LBPUnion.ProjectLighthouse.Extensions
+@using LBPUnion.ProjectLighthouse.Localization.StringLists
@using LBPUnion.ProjectLighthouse.PlayerData
@using LBPUnion.ProjectLighthouse.Types
@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.UserPage
@@ -9,7 +10,7 @@
Layout = "Layouts/BaseLayout";
Model.ShowTitleInPage = false;
- Model.Title = Model.ProfileUser!.Username + "'s user page";
+ Model.Title = Model.Translate(ProfileStrings.Title, Model.ProfileUser!.Username);
Model.Description = Model.ProfileUser!.Biography;
}
@@ -74,16 +75,16 @@
{
- Reset Password
+ @Model.Translate(GeneralStrings.ResetPassword)
}
-
Biography
+@Model.Translate(ProfileStrings.Biography)
@if (string.IsNullOrWhiteSpace(Model.ProfileUser.Biography)) { -@Model.ProfileUser.Username hasn't introduced themselves yet
+@Model.Translate(ProfileStrings.NoBiography, Model.ProfileUser.Username)
} else { @@ -93,8 +94,8 @@
-
Recent Activity
-Coming soon?
+@Model.Translate(GeneralStrings.RecentActivity)
+@Model.Translate(GeneralStrings.Soon)
-
Most recent photos
+@Model.Translate(GeneralStrings.RecentPhotos)
@foreach (Photo photo in Model.Photos)
diff --git a/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml.cs
index 067ee0a2..4d6d941e 100644
--- a/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml.cs
@@ -28,7 +28,29 @@ public class UserPage : BaseLayout
this.ProfileUser = await this.Database.Users.FirstOrDefaultAsync(u => u.UserId == userId);
if (this.ProfileUser == null) return this.NotFound();
- this.Photos = await this.Database.Photos.OrderByDescending(p => p.Timestamp).Where(p => p.CreatorId == userId).Take(6).ToListAsync();
+ // Determine if user can view profile according to profileUser's privacy settings
+ if (this.User == null || !this.User.IsAdmin)
+ {
+ switch (this.ProfileUser.ProfileVisibility)
+ {
+ case PrivacyType.PSN:
+ {
+ if (this.User != null) return this.NotFound();
+
+ break;
+ }
+ case PrivacyType.Game:
+ {
+ if (this.ProfileUser != this.User) return this.NotFound();
+
+ break;
+ }
+ case PrivacyType.All: break;
+ default: throw new ArgumentOutOfRangeException();
+ }
+ }
+
+ this.Photos = await this.Database.Photos.Include(p => p.Slot).OrderByDescending(p => p.Timestamp).Where(p => p.CreatorId == userId).Take(6).ToListAsync();
if (this.CommentsEnabled)
{
this.Comments = await this.Database.Comments.Include(p => p.Poster)
diff --git a/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml.cs
index 63ef9bbf..6ebf1e7e 100644
--- a/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml.cs
@@ -38,6 +38,7 @@ public class UsersPage : BaseLayout
if (this.PageNumber < 0 || this.PageNumber >= this.PageAmount) return this.Redirect($"/users/{Math.Clamp(this.PageNumber, 0, this.PageAmount - 1)}");
this.Users = await this.Database.Users.Where(u => u.PermissionLevel != PermissionLevel.Banned && u.Username.Contains(this.SearchValue))
+ .Where(u => u.ProfileVisibility == PrivacyType.All) // TODO: change check for when user is logged in
.OrderByDescending(b => b.UserId)
.Skip(pageNumber * ServerStatics.PageSize)
.Take(ServerStatics.PageSize)
diff --git a/ProjectLighthouse.Servers.Website/Startup/WebsiteStartup.cs b/ProjectLighthouse.Servers.Website/Startup/WebsiteStartup.cs
index f1f80025..14e48f97 100644
--- a/ProjectLighthouse.Servers.Website/Startup/WebsiteStartup.cs
+++ b/ProjectLighthouse.Servers.Website/Startup/WebsiteStartup.cs
@@ -45,7 +45,7 @@ public class WebsiteStartup
{
List languages = LocalizationManager.GetAvailableLanguages().Select(l => new CultureInfo(LocalizationManager.MapLanguage(l))).ToList();
- config.DefaultRequestCulture = new RequestCulture(new CultureInfo("en-US"));
+ config.DefaultRequestCulture = new RequestCulture(new CultureInfo("en"));
config.SupportedCultures = languages;
config.SupportedUICultures = languages;
@@ -81,4 +81,4 @@ public class WebsiteStartup
app.UseEndpoints(endpoints => endpoints.MapControllers());
app.UseEndpoints(endpoints => endpoints.MapRazorPages());
}
-}
\ No newline at end of file
+}
diff --git a/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj b/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj
index a1a4cfad..d18791bd 100644
--- a/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj
+++ b/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj
@@ -15,7 +15,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
runtime; build; native; contentfiles; analyzers; buildtransitive
all
@@ -27,6 +27,7 @@
+
diff --git a/ProjectLighthouse.Tests.GameApiTests/Tests/AuthenticationTests.cs b/ProjectLighthouse.Tests.GameApiTests/Tests/AuthenticationTests.cs
index 70fcf8bc..b81102d5 100644
--- a/ProjectLighthouse.Tests.GameApiTests/Tests/AuthenticationTests.cs
+++ b/ProjectLighthouse.Tests.GameApiTests/Tests/AuthenticationTests.cs
@@ -4,12 +4,13 @@ using System.Threading.Tasks;
using LBPUnion.ProjectLighthouse.Configuration;
using LBPUnion.ProjectLighthouse.Helpers;
using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
using LBPUnion.ProjectLighthouse.Tests;
using Xunit;
namespace ProjectLighthouse.Tests.GameApiTests.Tests;
-public class AuthenticationTests : LighthouseServerTest
+public class AuthenticationTests : LighthouseServerTest
{
[Fact]
public async Task ShouldReturnErrorOnNoPostData()
diff --git a/ProjectLighthouse.Tests.GameApiTests/Tests/DatabaseTests.cs b/ProjectLighthouse.Tests.GameApiTests/Tests/DatabaseTests.cs
index ef3fd8dd..7959c255 100644
--- a/ProjectLighthouse.Tests.GameApiTests/Tests/DatabaseTests.cs
+++ b/ProjectLighthouse.Tests.GameApiTests/Tests/DatabaseTests.cs
@@ -3,12 +3,13 @@ using System.Threading.Tasks;
using LBPUnion.ProjectLighthouse;
using LBPUnion.ProjectLighthouse.Helpers;
using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
+using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
using LBPUnion.ProjectLighthouse.Tests;
using Xunit;
namespace ProjectLighthouse.Tests.GameApiTests.Tests;
-public class DatabaseTests : LighthouseServerTest
+public class DatabaseTests : LighthouseServerTest
{
[DatabaseFact]
public async Task CanCreateUserTwice()
diff --git a/ProjectLighthouse.Tests.GameApiTests/Tests/MatchTests.cs b/ProjectLighthouse.Tests.GameApiTests/Tests/MatchTests.cs
index 4bcf3324..f79bf007 100644
--- a/ProjectLighthouse.Tests.GameApiTests/Tests/MatchTests.cs
+++ b/ProjectLighthouse.Tests.GameApiTests/Tests/MatchTests.cs
@@ -5,12 +5,13 @@ using System.Threading;
using System.Threading.Tasks;
using LBPUnion.ProjectLighthouse.Helpers;
using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
using LBPUnion.ProjectLighthouse.Tests;
using Xunit;
namespace ProjectLighthouse.Tests.GameApiTests.Tests;
-public class MatchTests : LighthouseServerTest
+public class MatchTests : LighthouseServerTest
{
private static readonly SemaphoreSlim semaphore = new(1, 1);
diff --git a/ProjectLighthouse.Tests.GameApiTests/Tests/SlotTests.cs b/ProjectLighthouse.Tests.GameApiTests/Tests/SlotTests.cs
index f9d96442..7ff8326d 100644
--- a/ProjectLighthouse.Tests.GameApiTests/Tests/SlotTests.cs
+++ b/ProjectLighthouse.Tests.GameApiTests/Tests/SlotTests.cs
@@ -6,12 +6,13 @@ using LBPUnion.ProjectLighthouse.Helpers;
using LBPUnion.ProjectLighthouse.Levels;
using LBPUnion.ProjectLighthouse.PlayerData;
using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
+using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
using LBPUnion.ProjectLighthouse.Tests;
using Xunit;
namespace ProjectLighthouse.Tests.GameApiTests.Tests;
-public class SlotTests : LighthouseServerTest
+public class SlotTests : LighthouseServerTest
{
[DatabaseFact]
public async Task ShouldOnlyShowUsersLevels()
diff --git a/ProjectLighthouse.Tests.GameApiTests/Tests/UploadTests.cs b/ProjectLighthouse.Tests.GameApiTests/Tests/UploadTests.cs
index ddfa5043..3c32ab52 100644
--- a/ProjectLighthouse.Tests.GameApiTests/Tests/UploadTests.cs
+++ b/ProjectLighthouse.Tests.GameApiTests/Tests/UploadTests.cs
@@ -4,12 +4,13 @@ using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
using LBPUnion.ProjectLighthouse.Tests;
using Xunit;
namespace ProjectLighthouse.Tests.GameApiTests.Tests;
-public class UploadTests : LighthouseServerTest
+public class UploadTests : LighthouseServerTest
{
public UploadTests()
{
@@ -17,7 +18,7 @@ public class UploadTests : LighthouseServerTest
if (Directory.Exists(assetsDirectory)) Directory.Delete(assetsDirectory, true);
}
- [Fact]
+ [DatabaseFact]
public async Task ShouldNotAcceptScript()
{
LoginResult loginResult = await this.Authenticate();
@@ -27,7 +28,7 @@ public class UploadTests : LighthouseServerTest
Assert.False(response.IsSuccessStatusCode);
}
- [Fact]
+ [DatabaseFact]
public async Task ShouldNotAcceptFarc()
{
LoginResult loginResult = await this.Authenticate();
@@ -37,7 +38,7 @@ public class UploadTests : LighthouseServerTest
Assert.False(response.IsSuccessStatusCode);
}
- [Fact]
+ [DatabaseFact]
public async Task ShouldNotAcceptGarbage()
{
LoginResult loginResult = await this.Authenticate();
@@ -47,7 +48,7 @@ public class UploadTests : LighthouseServerTest
Assert.False(response.IsSuccessStatusCode);
}
- [Fact]
+ [DatabaseFact]
public async Task ShouldAcceptTexture()
{
LoginResult loginResult = await this.Authenticate();
@@ -57,7 +58,7 @@ public class UploadTests : LighthouseServerTest
Assert.True(response.IsSuccessStatusCode);
}
- [Fact]
+ [DatabaseFact]
public async Task ShouldAcceptLevel()
{
LoginResult loginResult = await this.Authenticate();
diff --git a/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj b/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj
index be7ef808..51f575f5 100644
--- a/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj
+++ b/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj
@@ -17,7 +17,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
@@ -29,6 +29,7 @@
+
diff --git a/ProjectLighthouse.Tests.WebsiteTests/Tests/AdminTests.cs b/ProjectLighthouse.Tests.WebsiteTests/Tests/AdminTests.cs
index f654ed7e..bcafc867 100644
--- a/ProjectLighthouse.Tests.WebsiteTests/Tests/AdminTests.cs
+++ b/ProjectLighthouse.Tests.WebsiteTests/Tests/AdminTests.cs
@@ -26,6 +26,7 @@ public class AdminTests : LighthouseWebTest
{
UserId = user.UserId,
UserToken = CryptoHelper.GenerateAuthToken(),
+ ExpiresAt = DateTime.Now + TimeSpan.FromHours(1),
};
database.WebTokens.Add(webToken);
@@ -50,6 +51,7 @@ public class AdminTests : LighthouseWebTest
{
UserId = user.UserId,
UserToken = CryptoHelper.GenerateAuthToken(),
+ ExpiresAt = DateTime.Now + TimeSpan.FromHours(1),
};
database.WebTokens.Add(webToken);
diff --git a/ProjectLighthouse.Tests.WebsiteTests/Tests/AuthenticationTests.cs b/ProjectLighthouse.Tests.WebsiteTests/Tests/AuthenticationTests.cs
index af4c9af2..f85d0c99 100644
--- a/ProjectLighthouse.Tests.WebsiteTests/Tests/AuthenticationTests.cs
+++ b/ProjectLighthouse.Tests.WebsiteTests/Tests/AuthenticationTests.cs
@@ -88,6 +88,7 @@ public class AuthenticationTests : LighthouseWebTest
{
UserId = user.UserId,
UserToken = CryptoHelper.GenerateAuthToken(),
+ ExpiresAt = DateTime.Now + TimeSpan.FromHours(1),
};
database.WebTokens.Add(webToken);
diff --git a/ProjectLighthouse.Tests/ExampleFiles/TestScript.ff b/ProjectLighthouse.Tests/ExampleFiles/TestScript.ff
index ba1ce0e4..dfc876f9 100644
--- a/ProjectLighthouse.Tests/ExampleFiles/TestScript.ff
+++ b/ProjectLighthouse.Tests/ExampleFiles/TestScript.ff
@@ -1,3 +1,3 @@
-FSH
+FSHb
this is not my stuff to upload so its just gonna be a file like this for now :/
\ No newline at end of file
diff --git a/ProjectLighthouse.Tests/LighthouseServerTest.cs b/ProjectLighthouse.Tests/LighthouseServerTest.cs
index bd18d63d..cb3df9f1 100644
--- a/ProjectLighthouse.Tests/LighthouseServerTest.cs
+++ b/ProjectLighthouse.Tests/LighthouseServerTest.cs
@@ -7,8 +7,6 @@ using System.Xml.Serialization;
using LBPUnion.ProjectLighthouse.Helpers;
using LBPUnion.ProjectLighthouse.PlayerData;
using LBPUnion.ProjectLighthouse.Serialization;
-using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
-using LBPUnion.ProjectLighthouse.Types;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.TestHost;
using Microsoft.EntityFrameworkCore;
@@ -16,14 +14,14 @@ using Microsoft.EntityFrameworkCore;
namespace LBPUnion.ProjectLighthouse.Tests;
[SuppressMessage("ReSharper", "UnusedMember.Global")]
-public class LighthouseServerTest
+public class LighthouseServerTest where TStartup : class
{
public readonly HttpClient Client;
public readonly TestServer Server;
public LighthouseServerTest()
{
- this.Server = new TestServer(new WebHostBuilder().UseStartup());
+ this.Server = new TestServer(new WebHostBuilder().UseStartup());
this.Client = this.Server.CreateClient();
}
public async Task AuthenticateResponse(int number = -1, bool createUser = true)
diff --git a/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj b/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj
index 7b85a6a0..e03e490f 100644
--- a/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj
+++ b/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj
@@ -20,7 +20,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
runtime; build; native; contentfiles; analyzers; buildtransitive
all
@@ -35,9 +35,6 @@
PreserveNewest
- NP
PNG
PS
+ PSN
PSP
RPCS
SMTP
@@ -101,6 +102,7 @@
True
True
True
+ True
True
True
True
diff --git a/ProjectLighthouse/Administration/Maintenance/MigrationTasks/CleanupSlotVersionMismatchMigration.cs b/ProjectLighthouse/Administration/Maintenance/MigrationTasks/CleanupSlotVersionMismatchMigration.cs
new file mode 100644
index 00000000..0b48441d
--- /dev/null
+++ b/ProjectLighthouse/Administration/Maintenance/MigrationTasks/CleanupSlotVersionMismatchMigration.cs
@@ -0,0 +1,27 @@
+using System.Threading.Tasks;
+using LBPUnion.ProjectLighthouse.Files;
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.PlayerData;
+
+namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.MigrationTasks;
+
+public class CleanupSlotVersionMismatchMigration : IMigrationTask
+{
+ public string Name() => "Cleanup slot versions";
+
+ async Task IMigrationTask.Run(Database database)
+ {
+ foreach (Slot slot in database.Slots)
+ {
+ LbpFile rootLevel = LbpFile.FromHash(slot.RootLevel);
+ if (rootLevel == null) continue;
+
+ GameVersion slotVersion = FileHelper.ParseLevelVersion(rootLevel);
+
+ if (slotVersion != GameVersion.Unknown) slot.GameVersion = slotVersion;
+ }
+
+ await database.SaveChangesAsync();
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/ProjectLighthouse/Configuration/PrivacySettings.cs b/ProjectLighthouse/Configuration/PrivacySettings.cs
index 1bd96e1c..e5ec67ea 100644
--- a/ProjectLighthouse/Configuration/PrivacySettings.cs
+++ b/ProjectLighthouse/Configuration/PrivacySettings.cs
@@ -1,16 +1,26 @@
+#nullable enable
+using System;
+using System.Xml.Serialization;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
using LBPUnion.ProjectLighthouse.Serialization;
namespace LBPUnion.ProjectLighthouse.Configuration;
+[XmlRoot("privacySettings")]
+[XmlType("privacySettings")]
public class PrivacySettings
{
- public string LevelVisibility { get; set; }
- public string ProfileVisibility { get; set; }
+ [XmlElement("levelVisiblity")]
+ public string? LevelVisibility { get; set; }
+
+ [XmlElement("profileVisiblity")]
+ public string? ProfileVisibility { get; set; }
public string Serialize()
=> LbpSerializer.StringElement
(
"privacySettings",
- LbpSerializer.StringElement("levelVisibility", this.LevelVisibility) + LbpSerializer.StringElement("profileVisibility", this.ProfileVisibility)
+ LbpSerializer.StringElement("levelVisibility", this.LevelVisibility) +
+ LbpSerializer.StringElement("profileVisibility", this.ProfileVisibility)
);
}
\ No newline at end of file
diff --git a/ProjectLighthouse/Database.cs b/ProjectLighthouse/Database.cs
index 12fbe302..5e758490 100644
--- a/ProjectLighthouse/Database.cs
+++ b/ProjectLighthouse/Database.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using LBPUnion.ProjectLighthouse.Administration;
using LBPUnion.ProjectLighthouse.Administration.Reports;
using LBPUnion.ProjectLighthouse.Configuration;
+using LBPUnion.ProjectLighthouse.Extensions;
using LBPUnion.ProjectLighthouse.Helpers;
using LBPUnion.ProjectLighthouse.Levels;
using LBPUnion.ProjectLighthouse.Levels.Categories;
@@ -112,6 +113,8 @@ public class Database : DbContext
UserLocation = userLocation,
GameVersion = npTicket.GameVersion,
Platform = npTicket.Platform,
+ // we can get away with a low expiry here since LBP will just get a new token everytime it gets 403'd
+ ExpiresAt = DateTime.Now + TimeSpan.FromHours(1),
};
this.GameTokens.Add(gameToken);
@@ -290,6 +293,13 @@ public class Database : DbContext
if (token == null) return null;
if (!allowUnapproved && !token.Approved) return null;
+ if (DateTime.Now > token.ExpiresAt)
+ {
+ this.Remove(token);
+ await this.SaveChangesAsync();
+ return null;
+ }
+
return await this.Users.Include(u => u.Location).FirstOrDefaultAsync(u => u.UserId == token.UserId);
}
@@ -315,6 +325,13 @@ public class Database : DbContext
if (token == null) return null;
if (!allowUnapproved && !token.Approved) return null;
+ if (DateTime.Now > token.ExpiresAt)
+ {
+ this.Remove(token);
+ await this.SaveChangesAsync();
+ return null;
+ }
+
return token;
}
@@ -327,6 +344,13 @@ public class Database : DbContext
if (token == null) return null;
if (!allowUnapproved && !token.Approved) return null;
+ if (DateTime.Now > token.ExpiresAt)
+ {
+ this.Remove(token);
+ await this.SaveChangesAsync();
+ return null;
+ }
+
User? user = await this.UserFromGameToken(token);
if (user == null) return null;
@@ -343,6 +367,13 @@ public class Database : DbContext
WebToken? token = this.WebTokens.FirstOrDefault(t => t.UserToken == lighthouseToken);
if (token == null) return null;
+ if (DateTime.Now > token.ExpiresAt)
+ {
+ this.Remove(token);
+ this.SaveChanges();
+ return null;
+ }
+
return this.Users.Include(u => u.Location).FirstOrDefault(u => u.UserId == token.UserId);
}
@@ -357,12 +388,21 @@ public class Database : DbContext
{
if (!request.Cookies.TryGetValue("LighthouseToken", out string? lighthouseToken) || lighthouseToken == null) return null;
- return this.WebTokens.FirstOrDefault(t => t.UserToken == lighthouseToken);
+ WebToken? token = this.WebTokens.FirstOrDefault(t => t.UserToken == lighthouseToken);
+ if (token == null) return null;
+
+ if (DateTime.Now > token.ExpiresAt)
+ {
+ this.Remove(token);
+ this.SaveChanges();
+ return null;
+ }
+
+ return token;
}
public async Task UserFromPasswordResetToken(string resetToken)
{
-
PasswordResetToken? token = await this.PasswordResetTokens.FirstOrDefaultAsync(token => token.ResetToken == resetToken);
if (token == null)
{
@@ -372,8 +412,10 @@ public class Database : DbContext
if (token.Created < DateTime.Now.AddHours(-1)) // if token is expired
{
this.PasswordResetTokens.Remove(token);
+ await this.SaveChangesAsync();
return null;
}
+
return await this.Users.FirstOrDefaultAsync(user => user.UserId == token.UserId);
}
@@ -386,12 +428,23 @@ public class Database : DbContext
if (token.Created < DateTime.Now.AddDays(-7)) // if token is expired
{
this.RegistrationTokens.Remove(token);
+ this.SaveChanges();
return false;
}
return true;
}
+ public async Task RemoveExpiredTokens()
+ {
+ this.GameTokens.RemoveWhere(t => DateTime.Now > t.ExpiresAt);
+ this.WebTokens.RemoveWhere(t => DateTime.Now > t.ExpiresAt);
+ this.EmailVerificationTokens.RemoveWhere(t => DateTime.Now > t.ExpiresAt);
+ this.EmailSetTokens.RemoveWhere(t => DateTime.Now > t.ExpiresAt);
+
+ await this.SaveChangesAsync();
+ }
+
public async Task RemoveRegistrationToken(string tokenString)
{
RegistrationToken? token = await this.RegistrationTokens.FirstOrDefaultAsync(t => t.Token == tokenString);
@@ -399,7 +452,6 @@ public class Database : DbContext
if (token == null) return;
this.RegistrationTokens.Remove(token);
-
await this.SaveChangesAsync();
}
@@ -427,10 +479,10 @@ public class Database : DbContext
this.RatedLevels.RemoveRange(this.RatedLevels.Where(r => r.UserId == user.UserId));
this.GameTokens.RemoveRange(this.GameTokens.Where(t => t.UserId == user.UserId));
this.WebTokens.RemoveRange(this.WebTokens.Where(t => t.UserId == user.UserId));
+ this.Reactions.RemoveRange(this.Reactions.Where(p => p.UserId == user.UserId));
this.Comments.RemoveRange(this.Comments.Where(c => c.PosterUserId == user.UserId));
this.Reviews.RemoveRange(this.Reviews.Where(r => r.ReviewerId == user.UserId));
this.Photos.RemoveRange(this.Photos.Where(p => p.CreatorId == user.UserId));
- this.Reactions.RemoveRange(this.Reactions.Where(p => p.UserId == user.UserId));
this.Users.Remove(user);
diff --git a/ProjectLighthouse/Extensions/DatabaseExtensions.cs b/ProjectLighthouse/Extensions/DatabaseExtensions.cs
index a7e27782..b1335ca1 100644
--- a/ProjectLighthouse/Extensions/DatabaseExtensions.cs
+++ b/ProjectLighthouse/Extensions/DatabaseExtensions.cs
@@ -5,7 +5,6 @@ using System.Threading.Tasks;
using LBPUnion.ProjectLighthouse.Levels;
using LBPUnion.ProjectLighthouse.PlayerData;
using LBPUnion.ProjectLighthouse.PlayerData.Reviews;
-using LBPUnion.ProjectLighthouse.Types;
using Microsoft.EntityFrameworkCore;
namespace LBPUnion.ProjectLighthouse.Extensions;
@@ -19,6 +18,8 @@ public static class DatabaseExtensions
public static IQueryable ByGameVersion
(this IQueryable query, GameVersion gameVersion, bool includeSublevels = false, bool includeCreatorAndLocation = false)
{
+ query = query.Where(s => s.Type == SlotType.User);
+
if (includeCreatorAndLocation)
{
query = query.Include(s => s.Creator).Include(s => s.Location);
@@ -56,6 +57,9 @@ public static class DatabaseExtensions
return query;
}
- public static async Task Has(this IQueryable queryable, Expression> predicate) =>
- await queryable.FirstOrDefaultAsync(predicate) != null;
+ public static async Task Has(this IQueryable queryable, Expression> predicate)
+ => await queryable.FirstOrDefaultAsync(predicate) != null;
+
+ public static void RemoveWhere(this DbSet queryable, Expression> predicate) where T : class
+ => queryable.RemoveRange(queryable.Where(predicate));
}
\ No newline at end of file
diff --git a/ProjectLighthouse/Files/FileHelper.cs b/ProjectLighthouse/Files/FileHelper.cs
index 18a542fc..710af8b9 100644
--- a/ProjectLighthouse/Files/FileHelper.cs
+++ b/ProjectLighthouse/Files/FileHelper.cs
@@ -11,6 +11,7 @@ using ICSharpCode.SharpZipLib.Zip.Compression;
using LBPUnion.ProjectLighthouse.Configuration;
using LBPUnion.ProjectLighthouse.Extensions;
using LBPUnion.ProjectLighthouse.Logging;
+using LBPUnion.ProjectLighthouse.PlayerData;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;
@@ -50,6 +51,51 @@ public static class FileHelper
};
}
+ public static GameVersion ParseLevelVersion(LbpFile file)
+ {
+ if (file.FileType != LbpFileType.Level || file.Data.Length < 16 || file.Data[3] != 'b') return GameVersion.Unknown;
+
+ // Revision numbers borrowed from https://github.com/ennuo/toolkit/blob/main/src/main/java/ennuo/craftworld/resources/structs/Revision.java
+
+ const ushort lbp2Latest = 0x3F8;
+ const ushort lbp1Latest = 0x272;
+ const ushort lbpVitaLatest = 0x3E2;
+ const ushort lbpVitaDescriptor = 0x4431;
+ // There are like 1600 revisions so this doesn't cover everything
+ uint revision = 0;
+
+ // construct a 32 bit number from 4 individual bytes
+ for (int i = 4; i <= 7; i++)
+ {
+ revision <<= 8;
+ revision |= file.Data[i];
+ }
+
+ if (revision >= 0x271)
+ {
+ // construct a 16 bit number from 2 individual bytes
+ ushort branchDescriptor = (ushort) (file.Data[12] << 8 | file.Data[13]);
+ if (revision == lbpVitaLatest && branchDescriptor == lbpVitaDescriptor) return GameVersion.LittleBigPlanetVita;
+ }
+
+
+ GameVersion version = GameVersion.Unknown;
+ if (revision <= lbp1Latest)
+ {
+ version = GameVersion.LittleBigPlanet1;
+ }
+ else if (revision >> 0x10 != 0)
+ {
+ version = GameVersion.LittleBigPlanet3;
+ }
+ else if(revision <= lbp2Latest)
+ {
+ version = GameVersion.LittleBigPlanet2;
+ }
+
+ return version;
+ }
+
public static LbpFileType DetermineFileType(byte[] data)
{
if (data.Length == 0) return LbpFileType.Unknown; // Can't be anything if theres no data.
@@ -63,18 +109,18 @@ public static class FileHelper
string footer = Encoding.ASCII.GetString(readLastBytes(reader, 4));
if (footer == "FARC") return LbpFileType.FileArchive;
- byte[] header = reader.ReadBytes(3);
+ byte[] header = reader.ReadBytes(4);
return Encoding.ASCII.GetString(header) switch
{
- "REC" => LbpFileType.MotionRecording,
- "PRF" => LbpFileType.CrossLevel,
- "PTG" => LbpFileType.Painting,
- "TEX" => LbpFileType.Texture,
- "FSH" => LbpFileType.Script,
- "VOP" => LbpFileType.Voice,
- "LVL" => LbpFileType.Level,
- "PLN" => LbpFileType.Plan,
+ "RECb" => LbpFileType.MotionRecording,
+ "PRFb" => LbpFileType.CrossLevel,
+ "PTGb" => LbpFileType.Painting,
+ "TEX " => LbpFileType.Texture,
+ "FSHb" => LbpFileType.Script,
+ "VOPb" => LbpFileType.Voice,
+ "LVLb" => LbpFileType.Level,
+ "PLNb" => LbpFileType.Plan,
_ => readAlternateHeader(reader),
};
}
diff --git a/ProjectLighthouse/Helpers/SlotHelper.cs b/ProjectLighthouse/Helpers/SlotHelper.cs
new file mode 100644
index 00000000..f2b8abb3
--- /dev/null
+++ b/ProjectLighthouse/Helpers/SlotHelper.cs
@@ -0,0 +1,106 @@
+#nullable enable
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
+using Microsoft.EntityFrameworkCore;
+
+namespace LBPUnion.ProjectLighthouse.Helpers;
+
+public static class SlotHelper
+{
+
+ public static SlotType ParseType(string? slotType)
+ {
+ if (slotType == null) return SlotType.Unknown;
+ return slotType switch
+ {
+ "developer" => SlotType.Developer,
+ "user" => SlotType.User,
+ "moon" => SlotType.Moon,
+ "pod" => SlotType.Pod,
+ "local" => SlotType.Local,
+ _ => SlotType.Unknown,
+ };
+
+ }
+
+ public static bool IsTypeInvalid(string? slotType)
+ {
+ if (slotType == null) return true;
+ return slotType switch
+ {
+ "developer" => false,
+ "user" => false,
+ _ => true,
+ };
+ }
+
+ private static readonly SemaphoreSlim semaphore = new(1, 1);
+
+ public static async Task GetPlaceholderSlotId(Database database, int guid, SlotType slotType)
+ {
+ int slotId = await database.Slots.Where(s => s.Type == slotType && s.InternalSlotId == guid).Select(s => s.SlotId).FirstOrDefaultAsync();
+ if (slotId != 0) return slotId;
+
+ await semaphore.WaitAsync(TimeSpan.FromSeconds(5));
+ try
+ {
+ // if two requests come in at the same time for the same story level which hasn't been generated
+ // one will wait for the lock to be released and the second will be caught by this second check
+ slotId = await database.Slots
+ .Where(s => s.Type == slotType && s.InternalSlotId == guid)
+ .Select(s => s.SlotId)
+ .FirstOrDefaultAsync();
+
+ if (slotId != 0) return slotId;
+
+ Location? devLocation = await database.Locations.FirstOrDefaultAsync(l => l.Id == 1);
+ if (devLocation == null)
+ {
+ devLocation = new Location
+ {
+ Id = 1,
+ };
+ database.Locations.Add(devLocation);
+ }
+
+ int devCreatorId = await database.Users.Where(u => u.Username.Length == 0).Select(u => u.UserId).FirstOrDefaultAsync();
+ if (devCreatorId == 0)
+ {
+ User devCreator = new()
+ {
+ Username = "",
+ Banned = true,
+ Biography = "Placeholder author of story levels",
+ BannedReason = "Banned to not show in users list",
+ LocationId = devLocation.Id,
+ };
+ database.Users.Add(devCreator);
+ await database.SaveChangesAsync();
+ devCreatorId = devCreator.UserId;
+ }
+
+ Slot slot = new()
+ {
+ Name = $"{slotType} slot {guid}",
+ Description = $"Placeholder for {slotType} type level",
+ CreatorId = devCreatorId,
+ InternalSlotId = guid,
+ LocationId = devLocation.Id,
+ Type = slotType,
+ };
+
+ database.Slots.Add(slot);
+ await database.SaveChangesAsync();
+ return slot.SlotId;
+ }
+ finally
+ {
+ semaphore.Release();
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/ProjectLighthouse/Helpers/StatisticsHelper.cs b/ProjectLighthouse/Helpers/StatisticsHelper.cs
index 2ec0dba0..e0a0ff70 100644
--- a/ProjectLighthouse/Helpers/StatisticsHelper.cs
+++ b/ProjectLighthouse/Helpers/StatisticsHelper.cs
@@ -1,6 +1,7 @@
using System.Linq;
using System.Threading.Tasks;
using LBPUnion.ProjectLighthouse.Administration;
+using LBPUnion.ProjectLighthouse.Levels;
using LBPUnion.ProjectLighthouse.PlayerData;
using LBPUnion.ProjectLighthouse.Types;
using Microsoft.EntityFrameworkCore;
@@ -16,7 +17,7 @@ public static class StatisticsHelper
public static async Task RecentMatchesForGame(GameVersion gameVersion)
=> await database.LastContacts.Where(l => TimeHelper.Timestamp - l.Timestamp < 300 && l.GameVersion == gameVersion).CountAsync();
- public static async Task SlotCount() => await database.Slots.CountAsync();
+ public static async Task SlotCount() => await database.Slots.Where(s => s.Type == SlotType.User).CountAsync();
public static async Task UserCount() => await database.Users.CountAsync(u => u.PermissionLevel != PermissionLevel.Banned);
diff --git a/ProjectLighthouse/Levels/Categories/NewestLevelsCategory.cs b/ProjectLighthouse/Levels/Categories/NewestLevelsCategory.cs
index a5d41b16..9ba8a23d 100644
--- a/ProjectLighthouse/Levels/Categories/NewestLevelsCategory.cs
+++ b/ProjectLighthouse/Levels/Categories/NewestLevelsCategory.cs
@@ -13,12 +13,12 @@ public class NewestLevelsCategory : Category
public override string Description { get; set; } = "Levels recently published";
public override string IconHash { get; set; } = "g820623";
public override string Endpoint { get; set; } = "newest";
- public override Slot? GetPreviewSlot(Database database) => database.Slots.OrderByDescending(s => s.FirstUploaded).FirstOrDefault();
+ public override Slot? GetPreviewSlot(Database database) => database.Slots.Where(s => s.Type == SlotType.User).OrderByDescending(s => s.FirstUploaded).FirstOrDefault();
public override IEnumerable GetSlots
(Database database, int pageStart, int pageSize)
=> database.Slots.ByGameVersion(GameVersion.LittleBigPlanet3, false, true)
.OrderByDescending(s => s.FirstUploaded)
.Skip(pageStart - 1)
.Take(Math.Min(pageSize, 20));
- public override int GetTotalSlots(Database database) => database.Slots.Count();
+ public override int GetTotalSlots(Database database) => database.Slots.Count(s => s.Type == SlotType.User);
}
\ No newline at end of file
diff --git a/ProjectLighthouse/Levels/Slot.cs b/ProjectLighthouse/Levels/Slot.cs
index 098d7760..caf72beb 100644
--- a/ProjectLighthouse/Levels/Slot.cs
+++ b/ProjectLighthouse/Levels/Slot.cs
@@ -1,4 +1,5 @@
#nullable enable
+using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
@@ -40,14 +41,15 @@ public class Slot
}
[XmlAttribute("type")]
- [NotMapped]
[JsonIgnore]
- public string Type { get; set; } = "user";
+ public SlotType Type { get; set; } = SlotType.User;
[Key]
[XmlElement("id")]
public int SlotId { get; set; }
+ public int InternalSlotId { get; set; }
+
[XmlElement("name")]
public string Name { get; set; } = "";
@@ -141,6 +143,16 @@ public class Slot
[JsonIgnore]
public int Comments => this.database.Comments.Count(c => c.Type == CommentType.Level && c.TargetId == this.SlotId);
+ [XmlIgnore]
+ [NotMapped]
+ [JsonIgnore]
+ public int Photos => this.database.Photos.Count(p => p.SlotId == this.SlotId);
+
+ [XmlIgnore]
+ [NotMapped]
+ [JsonIgnore]
+ public int PhotosWithAuthor => this.database.Photos.Count(p => p.SlotId == this.SlotId && p.CreatorId == this.CreatorId);
+
[XmlIgnore]
[NotMapped]
public int Plays => this.PlaysLBP1 + this.PlaysLBP2 + this.PlaysLBP3 + this.PlaysLBPVita;
@@ -240,6 +252,31 @@ public class Slot
LbpSerializer.StringElement("sizeOfResources", this.Resources.Sum(FileHelper.ResourceSize));
}
+ public string SerializeDevSlot(bool includeExtras = true)
+ {
+
+ int comments = 0, photos = 0;
+ if (includeExtras)
+ {
+ comments = this.database.Comments.Count(c => c.Type == CommentType.Level && c.TargetId == this.SlotId);
+
+ photos = this.database.Photos.Count(c => c.SlotId == this.SlotId);
+ }
+
+ int players = RoomHelper.Rooms
+ .Where(r => r.Slot.SlotType == SlotType.Developer && r.Slot.SlotId == this.InternalSlotId)
+ .Sum(r => r.PlayerIds.Count);
+
+ string slotData = LbpSerializer.StringElement("id", this.InternalSlotId) +
+ LbpSerializer.StringElement("playerCount", players);
+
+ if(includeExtras)
+ slotData += LbpSerializer.StringElement("commentCount", comments) +
+ LbpSerializer.StringElement("photoCount", photos);
+
+ return LbpSerializer.TaggedStringElement("slot", slotData, "type", "developer");
+ }
+
public string Serialize
(
GameVersion gameVersion = GameVersion.LittleBigPlanet1,
@@ -248,6 +285,8 @@ public class Slot
Review? yourReview = null
)
{
+ if (this.Type == SlotType.Developer) return this.SerializeDevSlot();
+
int playerCount = RoomHelper.Rooms.Count(r => r.Slot.SlotType == SlotType.User && r.Slot.SlotId == this.SlotId);
string slotData = LbpSerializer.StringElement("name", this.Name) +
@@ -274,6 +313,8 @@ public class Slot
LbpSerializer.StringElement("mmpick", this.TeamPick) +
LbpSerializer.StringElement("heartCount", this.Hearts) +
LbpSerializer.StringElement("playCount", this.Plays) +
+ LbpSerializer.StringElement("photoCount", this.Photos) +
+ LbpSerializer.StringElement("authorPhotoCount", this.PhotosWithAuthor) +
LbpSerializer.StringElement("commentCount", this.Comments) +
LbpSerializer.StringElement("uniquePlayCount", this.PlaysLBP2Unique) + // ??? good naming scheme lol
LbpSerializer.StringElement("completionCount", this.PlaysComplete) +
diff --git a/ProjectLighthouse/Levels/SlotType.cs b/ProjectLighthouse/Levels/SlotType.cs
index a34876c9..90e7ea76 100644
--- a/ProjectLighthouse/Levels/SlotType.cs
+++ b/ProjectLighthouse/Levels/SlotType.cs
@@ -1,12 +1,20 @@
+using System.Xml.Serialization;
+
namespace LBPUnion.ProjectLighthouse.Levels;
public enum SlotType
{
+ [XmlEnum("developer")]
Developer = 0,
+ [XmlEnum("user")]
User = 1,
+ [XmlEnum("moon")]
Moon = 2,
Unknown = 3,
Unknown2 = 4,
+ [XmlEnum("pod")]
Pod = 5,
+ [XmlEnum("local")]
+ Local = 6,
DLC = 8,
}
\ No newline at end of file
diff --git a/ProjectLighthouse/Migrations/20220729002704_DeveloperSlots.cs b/ProjectLighthouse/Migrations/20220729002704_DeveloperSlots.cs
new file mode 100644
index 00000000..d05747f6
--- /dev/null
+++ b/ProjectLighthouse/Migrations/20220729002704_DeveloperSlots.cs
@@ -0,0 +1,72 @@
+using LBPUnion.ProjectLighthouse;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ProjectLighthouse.Migrations
+{
+ [DbContext(typeof(Database))]
+ [Migration("20220729002704_DeveloperSlots")]
+ public partial class DeveloperSlots : Migration
+ {
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn(
+ name: "InternalSlotId",
+ table: "Slots",
+ type: "int",
+ nullable: false,
+ defaultValue: 0);
+
+ migrationBuilder.AddColumn(
+ name: "Type",
+ table: "Slots",
+ type: "int",
+ defaultValue: 1,
+ nullable: false);
+
+ migrationBuilder.AddColumn(
+ name: "SlotId",
+ table: "Photos",
+ type: "int",
+ nullable: true);
+
+ migrationBuilder.CreateIndex(
+ name: "IX_Photos_SlotId",
+ table: "Photos",
+ column: "SlotId");
+
+ migrationBuilder.AddForeignKey(
+ name: "FK_Photos_Slots_SlotId",
+ table: "Photos",
+ column: "SlotId",
+ principalTable: "Slots",
+ principalColumn: "SlotId",
+ onDelete: ReferentialAction.Cascade);
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropForeignKey(
+ name: "FK_Photos_Slots_SlotId",
+ table: "Photos");
+
+ migrationBuilder.DropIndex(
+ name: "IX_Photos_SlotId",
+ table: "Photos");
+
+ migrationBuilder.DropColumn(
+ name: "InternalSlotId",
+ table: "Slots");
+
+ migrationBuilder.DropColumn(
+ name: "Type",
+ table: "Slots");
+
+ migrationBuilder.DropColumn(
+ name: "SlotId",
+ table: "Photos");
+ }
+ }
+}
diff --git a/ProjectLighthouse/Migrations/20220729182709_AddExpiryTimesToTokens.cs b/ProjectLighthouse/Migrations/20220729182709_AddExpiryTimesToTokens.cs
new file mode 100644
index 00000000..1560ad99
--- /dev/null
+++ b/ProjectLighthouse/Migrations/20220729182709_AddExpiryTimesToTokens.cs
@@ -0,0 +1,80 @@
+using System;
+using LBPUnion.ProjectLighthouse;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ProjectLighthouse.Migrations
+{
+ [DbContext(typeof(Database))]
+ [Migration("20220729182709_AddExpiryTimesToTokens")]
+ public partial class AddExpiryTimesToTokens : Migration
+ {
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ // Remove existing tokens
+ migrationBuilder.Sql("DELETE FROM GameTokens;");
+ migrationBuilder.Sql("DELETE FROM WebTokens;");
+ migrationBuilder.Sql("DELETE FROM EmailSetTokens;");
+ migrationBuilder.Sql("DELETE FROM EmailVerificationTokens;");
+ migrationBuilder.Sql("DELETE FROM PasswordResetTokens;");
+ migrationBuilder.Sql("DELETE FROM RegistrationTokens;");
+
+ migrationBuilder.AddColumn(
+ name: "ExpiresAt",
+ table: "WebTokens",
+ type: "datetime(6)",
+ nullable: false,
+ defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+ migrationBuilder.AddColumn(
+ name: "ExpiresAt",
+ table: "GameTokens",
+ type: "datetime(6)",
+ nullable: false,
+ defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+ migrationBuilder.AddColumn(
+ name: "ExpiresAt",
+ table: "EmailVerificationTokens",
+ type: "datetime(6)",
+ nullable: false,
+ defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+ migrationBuilder.AddColumn(
+ name: "ExpiresAt",
+ table: "EmailSetTokens",
+ type: "datetime(6)",
+ nullable: false,
+ defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "ExpiresAt",
+ table: "WebTokens");
+
+ migrationBuilder.DropColumn(
+ name: "ExpiresAt",
+ table: "RegistrationTokens");
+
+ migrationBuilder.DropColumn(
+ name: "ExpiresAt",
+ table: "PasswordResetTokens");
+
+ migrationBuilder.DropColumn(
+ name: "ExpiresAt",
+ table: "GameTokens");
+
+ migrationBuilder.DropColumn(
+ name: "ExpiresAt",
+ table: "EmailVerificationTokens");
+
+ migrationBuilder.DropColumn(
+ name: "ExpiresAt",
+ table: "EmailSetTokens");
+ }
+ }
+}
diff --git a/ProjectLighthouse/Migrations/20220801055525_AddPrivacySettingsToUser.cs b/ProjectLighthouse/Migrations/20220801055525_AddPrivacySettingsToUser.cs
new file mode 100644
index 00000000..d0735a73
--- /dev/null
+++ b/ProjectLighthouse/Migrations/20220801055525_AddPrivacySettingsToUser.cs
@@ -0,0 +1,42 @@
+using System;
+using LBPUnion.ProjectLighthouse;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ProjectLighthouse.Migrations
+{
+ [DbContext(typeof(Database))]
+ [Migration("20220801055525_AddPrivacySettingsToUser")]
+ public partial class AddPrivacySettingsToUser : Migration
+ {
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn(
+ name: "LevelVisibility",
+ table: "Users",
+ type: "int",
+ nullable: false,
+ defaultValue: 2);
+
+ migrationBuilder.AddColumn(
+ name: "ProfileVisibility",
+ table: "Users",
+ type: "int",
+ nullable: false,
+ defaultValue: 2);
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "LevelVisibility",
+ table: "Users");
+
+ migrationBuilder.DropColumn(
+ name: "ProfileVisibility",
+ table: "Users");
+ }
+ }
+}
diff --git a/ProjectLighthouse/Migrations/20220802150408_Arrrrrr.cs b/ProjectLighthouse/Migrations/20220802150408_Arrrrrr.cs
new file mode 100644
index 00000000..43659add
--- /dev/null
+++ b/ProjectLighthouse/Migrations/20220802150408_Arrrrrr.cs
@@ -0,0 +1,31 @@
+using System;
+using LBPUnion.ProjectLighthouse;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ProjectLighthouse.Migrations
+{
+ [DbContext(typeof(Database))]
+ [Migration("20220802150408_Arrrrrr")]
+ public partial class Arrrrrr : Migration
+ {
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn(
+ name: "IsAPirate",
+ table: "Users",
+ type: "tinyint(1)",
+ nullable: false,
+ defaultValue: false);
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "IsAPirate",
+ table: "Users");
+ }
+ }
+}
diff --git a/ProjectLighthouse/PlayerData/GameToken.cs b/ProjectLighthouse/PlayerData/GameToken.cs
index dd83924a..1317b34f 100644
--- a/ProjectLighthouse/PlayerData/GameToken.cs
+++ b/ProjectLighthouse/PlayerData/GameToken.cs
@@ -1,3 +1,4 @@
+using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
@@ -28,4 +29,6 @@ public class GameToken
// Set to true on login
public bool Used { get; set; }
+
+ public DateTime ExpiresAt { get; set; }
}
\ No newline at end of file
diff --git a/ProjectLighthouse/PlayerData/LastContactHelper.cs b/ProjectLighthouse/PlayerData/LastContactHelper.cs
index 28c9ae6c..78a31531 100644
--- a/ProjectLighthouse/PlayerData/LastContactHelper.cs
+++ b/ProjectLighthouse/PlayerData/LastContactHelper.cs
@@ -9,9 +9,8 @@ namespace LBPUnion.ProjectLighthouse.PlayerData;
public static class LastContactHelper
{
- private static readonly Database database = new();
- public static async Task SetLastContact(User user, GameVersion gameVersion, Platform platform)
+ public static async Task SetLastContact(Database database, User user, GameVersion gameVersion, Platform platform)
{
LastContact? lastContact = await database.LastContacts.Where(l => l.UserId == user.UserId).FirstOrDefaultAsync();
diff --git a/ProjectLighthouse/PlayerData/Photo.cs b/ProjectLighthouse/PlayerData/Photo.cs
index 8a8ca224..302d5366 100644
--- a/ProjectLighthouse/PlayerData/Photo.cs
+++ b/ProjectLighthouse/PlayerData/Photo.cs
@@ -5,6 +5,7 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Xml.Serialization;
+using LBPUnion.ProjectLighthouse.Levels;
using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
using LBPUnion.ProjectLighthouse.Serialization;
using Microsoft.EntityFrameworkCore;
@@ -19,6 +20,10 @@ public class Photo
[NotMapped]
private List? _subjects;
+ [NotMapped]
+ [XmlElement("slot")]
+ public PhotoSlot? XmlLevelInfo;
+
[NotMapped]
[XmlArray("subjects")]
[XmlArrayItem("subject")]
@@ -81,9 +86,34 @@ public class Photo
[ForeignKey(nameof(CreatorId))]
public User? Creator { get; set; }
- public string Serialize(int slotId)
+ public int? SlotId { get; set; }
+
+ [ForeignKey(nameof(SlotId))]
+ public Slot? Slot { get; set; }
+
+ public string Serialize()
{
- string slot = LbpSerializer.TaggedStringElement("slot", LbpSerializer.StringElement("id", slotId), "type", "user");
+ using Database database = new();
+ var partialSlot = database.Slots.Where(s => s.SlotId == this.SlotId.GetValueOrDefault())
+ .Select(s => new
+ {
+ s.InternalSlotId,
+ s.Type,
+ })
+ .FirstOrDefault();
+ if (partialSlot == null) return this.Serialize(0, SlotType.User);
+
+ int serializedSlotId = partialSlot.InternalSlotId;
+ if (serializedSlotId == 0) serializedSlotId = this.SlotId.GetValueOrDefault();
+
+ return this.Serialize(serializedSlotId, partialSlot.Type);
+ }
+
+ public string Serialize(int slotId, SlotType slotType)
+ {
+
+ string slot = LbpSerializer.TaggedStringElement("slot", LbpSerializer.StringElement("id", slotId), "type", slotType.ToString().ToLower());
+ if (slotId == 0) slot = "";
string subjectsAggregate = this.Subjects.Aggregate(string.Empty, (s, subject) => s + subject.Serialize());
diff --git a/ProjectLighthouse/PlayerData/PhotoSlot.cs b/ProjectLighthouse/PlayerData/PhotoSlot.cs
new file mode 100644
index 00000000..2726a932
--- /dev/null
+++ b/ProjectLighthouse/PlayerData/PhotoSlot.cs
@@ -0,0 +1,20 @@
+using System.Xml.Serialization;
+using LBPUnion.ProjectLighthouse.Levels;
+
+namespace LBPUnion.ProjectLighthouse.PlayerData;
+
+[XmlRoot("slot")]
+public class PhotoSlot
+{
+ [XmlAttribute("type")]
+ public SlotType SlotType { get; set; }
+
+ [XmlElement("id")]
+ public int SlotId { get; set; }
+
+ [XmlElement("rootLevel")]
+ public string RootLevel { get; set; }
+
+ [XmlElement("name")]
+ public string LevelName { get; set; }
+}
\ No newline at end of file
diff --git a/ProjectLighthouse/PlayerData/Profiles/Email/EmailSetToken.cs b/ProjectLighthouse/PlayerData/Profiles/Email/EmailSetToken.cs
index 152e42ed..879efce9 100644
--- a/ProjectLighthouse/PlayerData/Profiles/Email/EmailSetToken.cs
+++ b/ProjectLighthouse/PlayerData/Profiles/Email/EmailSetToken.cs
@@ -1,3 +1,4 @@
+using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -14,4 +15,6 @@ public class EmailSetToken
public User User { get; set; }
public string EmailToken { get; set; }
+
+ public DateTime ExpiresAt { get; set; }
}
\ No newline at end of file
diff --git a/ProjectLighthouse/PlayerData/Profiles/Email/EmailVerificationToken.cs b/ProjectLighthouse/PlayerData/Profiles/Email/EmailVerificationToken.cs
index 61559cce..d2c9e866 100644
--- a/ProjectLighthouse/PlayerData/Profiles/Email/EmailVerificationToken.cs
+++ b/ProjectLighthouse/PlayerData/Profiles/Email/EmailVerificationToken.cs
@@ -1,3 +1,4 @@
+using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -14,4 +15,6 @@ public class EmailVerificationToken
public User User { get; set; }
public string EmailToken { get; set; }
+
+ public DateTime ExpiresAt { get; set; }
}
\ No newline at end of file
diff --git a/ProjectLighthouse/PlayerData/Profiles/PrivacyType.cs b/ProjectLighthouse/PlayerData/Profiles/PrivacyType.cs
new file mode 100644
index 00000000..0ac9e4e8
--- /dev/null
+++ b/ProjectLighthouse/PlayerData/Profiles/PrivacyType.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+namespace LBPUnion.ProjectLighthouse.PlayerData.Profiles;
+
+///
+/// Where user levels/profiles should show.
+///
+[SuppressMessage("ReSharper", "UnusedMember.Global")]
+public enum PrivacyType
+{
+ ///
+ /// Shows your levels/profile only to those signed in on the website or the game.
+ ///
+ PSN = 0,
+ ///
+ /// Shows your levels/profile only to those in-game.
+ ///
+ Game = 1,
+ ///
+ /// Shows your levels/profile to everyone.
+ ///
+ All = 2,
+}
+
+public static class PrivacyTypeExtensions
+{
+ public static string ToSerializedString(this PrivacyType type)
+ => type.ToString().ToLower();
+
+ public static PrivacyType? FromSerializedString(string type)
+ {
+ return type switch
+ {
+ "psn" => PrivacyType.PSN,
+ "game" => PrivacyType.Game,
+ "all" => PrivacyType.All,
+ _ => null,
+ };
+ }
+}
\ No newline at end of file
diff --git a/ProjectLighthouse/PlayerData/Profiles/User.cs b/ProjectLighthouse/PlayerData/Profiles/User.cs
index 99664812..1ae3d804 100644
--- a/ProjectLighthouse/PlayerData/Profiles/User.cs
+++ b/ProjectLighthouse/PlayerData/Profiles/User.cs
@@ -154,6 +154,15 @@ public class User
[JsonIgnore]
public string? ApprovedIPAddress { get; set; }
#nullable disable
+
+ ///
+ /// ARRR! Forces the user to see Pirate English translations on the website.
+ ///
+ public bool IsAPirate { get; set; }
+
+ public PrivacyType LevelVisibility { get; set; } = PrivacyType.All;
+
+ public PrivacyType ProfileVisibility { get; set; } = PrivacyType.All;
public string Serialize(GameVersion gameVersion = GameVersion.LittleBigPlanet1)
{
diff --git a/ProjectLighthouse/PlayerData/Reviews/Review.cs b/ProjectLighthouse/PlayerData/Reviews/Review.cs
index 6843df3c..be4035c2 100644
--- a/ProjectLighthouse/PlayerData/Reviews/Review.cs
+++ b/ProjectLighthouse/PlayerData/Reviews/Review.cs
@@ -74,7 +74,7 @@ public class Review
_ => "none",
};
- string reviewData = LbpSerializer.TaggedStringElement("slot_id", this.SlotId, "type", this.Slot?.Type) +
+ string reviewData = LbpSerializer.TaggedStringElement("slot_id", this.SlotId, "type", this.Slot?.Type.ToString().ToLower()) +
LbpSerializer.StringElement("reviewer", this.Reviewer?.Username) +
LbpSerializer.StringElement("thumb", this.Thumb) +
LbpSerializer.StringElement("timestamp", this.Timestamp) +
diff --git a/ProjectLighthouse/PlayerData/WebToken.cs b/ProjectLighthouse/PlayerData/WebToken.cs
index 7860a418..9ad0f5be 100644
--- a/ProjectLighthouse/PlayerData/WebToken.cs
+++ b/ProjectLighthouse/PlayerData/WebToken.cs
@@ -1,3 +1,4 @@
+using System;
using System.ComponentModel.DataAnnotations;
namespace LBPUnion.ProjectLighthouse.PlayerData;
@@ -11,4 +12,6 @@ public class WebToken
public int UserId { get; set; }
public string UserToken { get; set; }
+
+ public DateTime ExpiresAt { get; set; }
}
\ No newline at end of file
diff --git a/ProjectLighthouse/ProjectLighthouse.csproj b/ProjectLighthouse/ProjectLighthouse.csproj
index bee4e972..d7565d7a 100644
--- a/ProjectLighthouse/ProjectLighthouse.csproj
+++ b/ProjectLighthouse/ProjectLighthouse.csproj
@@ -12,7 +12,7 @@
("InitiallyLocked")
.HasColumnType("tinyint(1)");
+ b.Property("InternalSlotId")
+ .HasColumnType("int");
+
b.Property("LastUpdated")
.HasColumnType("bigint");
@@ -321,6 +324,9 @@ namespace ProjectLighthouse.Migrations
b.Property("TeamPick")
.HasColumnType("tinyint(1)");
+ b.Property("Type")
+ .HasColumnType("int");
+
b.HasKey("SlotId");
b.HasIndex("CreatorId");
@@ -417,6 +423,9 @@ namespace ProjectLighthouse.Migrations
b.Property("Approved")
.HasColumnType("tinyint(1)");
+ b.Property("ExpiresAt")
+ .HasColumnType("datetime(6)");
+
b.Property("GameVersion")
.HasColumnType("int");
@@ -487,6 +496,9 @@ namespace ProjectLighthouse.Migrations
.IsRequired()
.HasColumnType("longtext");
+ b.Property("SlotId")
+ .HasColumnType("int");
+
b.Property("SmallHash")
.IsRequired()
.HasColumnType("longtext");
@@ -498,6 +510,8 @@ namespace ProjectLighthouse.Migrations
b.HasIndex("CreatorId");
+ b.HasIndex("SlotId");
+
b.ToTable("Photos");
});
@@ -572,6 +586,9 @@ namespace ProjectLighthouse.Migrations
b.Property("EmailToken")
.HasColumnType("longtext");
+ b.Property("ExpiresAt")
+ .HasColumnType("datetime(6)");
+
b.Property("UserId")
.HasColumnType("int");
@@ -591,6 +608,9 @@ namespace ProjectLighthouse.Migrations
b.Property("EmailToken")
.HasColumnType("longtext");
+ b.Property("ExpiresAt")
+ .HasColumnType("datetime(6)");
+
b.Property("UserId")
.HasColumnType("int");
@@ -694,6 +714,12 @@ namespace ProjectLighthouse.Migrations
b.Property("IconHash")
.HasColumnType("longtext");
+ b.Property("IsAPirate")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("LevelVisibility")
+ .HasColumnType("int");
+
b.Property("LocationId")
.HasColumnType("int");
@@ -721,6 +747,9 @@ namespace ProjectLighthouse.Migrations
b.Property("PlanetHashLBPVita")
.HasColumnType("longtext");
+ b.Property("ProfileVisibility")
+ .HasColumnType("int");
+
b.Property("Username")
.IsRequired()
.HasColumnType("longtext");
@@ -874,6 +903,9 @@ namespace ProjectLighthouse.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("int");
+ b.Property("ExpiresAt")
+ .HasColumnType("datetime(6)");
+
b.Property("UserId")
.HasColumnType("int");
@@ -1032,7 +1064,13 @@ namespace ProjectLighthouse.Migrations
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
+ b.HasOne("LBPUnion.ProjectLighthouse.Levels.Slot", "Slot")
+ .WithMany()
+ .HasForeignKey("SlotId");
+
b.Navigation("Creator");
+
+ b.Navigation("Slot");
});
modelBuilder.Entity("LBPUnion.ProjectLighthouse.PlayerData.PhotoSubject", b =>