diff --git a/ProjectLighthouse.Servers.Website/Pages/Partials/SlotCardPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/SlotCardPartial.cshtml index 6e469d63..cd633eb2 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Partials/SlotCardPartial.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/Partials/SlotCardPartial.cshtml @@ -27,7 +27,7 @@ bool showLink = (bool?)ViewData["ShowLink"] ?? false; string iconHash = Model.IconHash; - if (string.IsNullOrWhiteSpace(iconHash) || iconHash.StartsWith('g')) iconHash = ServerConfiguration.Instance.WebsiteConfiguration.MissingIconHash; + if (string.IsNullOrWhiteSpace(iconHash) || iconHash.StartsWith('g')) iconHash = ServerConfiguration.Instance.Website.MissingIconHash; }
@{ diff --git a/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml index 0722a616..43f59b33 100644 --- a/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml @@ -98,7 +98,7 @@ if (string.IsNullOrWhiteSpace(faceHash)) { - faceHash = ServerConfiguration.Instance.WebsiteConfiguration.MissingIconHash; + faceHash = ServerConfiguration.Instance.Website.MissingIconHash; } string faceAlt = review.Thumb switch { diff --git a/ProjectLighthouse/Configuration/Legacy/LegacyServerSettings.cs b/ProjectLighthouse/Configuration/Legacy/LegacyServerSettings.cs index 123fcf63..ea08ed67 100644 --- a/ProjectLighthouse/Configuration/Legacy/LegacyServerSettings.cs +++ b/ProjectLighthouse/Configuration/Legacy/LegacyServerSettings.cs @@ -203,7 +203,7 @@ internal class LegacyServerSettings ProfileCommentsEnabled = this.ProfileCommentsEnabled, }; - configuration.WebsiteConfiguration = new WebsiteConfiguration + configuration.Website = new WebsiteConfiguration { MissingIconHash = this.MissingIconHash, ConvertAssetsOnStartup = this.ConvertAssetsOnStartup, diff --git a/ProjectLighthouse/Configuration/ServerConfiguration.cs b/ProjectLighthouse/Configuration/ServerConfiguration.cs index bd3ce250..0cd17c4a 100644 --- a/ProjectLighthouse/Configuration/ServerConfiguration.cs +++ b/ProjectLighthouse/Configuration/ServerConfiguration.cs @@ -195,6 +195,6 @@ public class ServerConfiguration public InfluxDBConfiguration InfluxDB { get; set; } = new(); public MailConfiguration Mail { get; set; } = new(); public UserGeneratedContentLimitConfiguration UserGeneratedContentLimits { get; set; } = new(); - public WebsiteConfiguration WebsiteConfiguration { get; set; } = new(); + public WebsiteConfiguration Website { get; set; } = new(); public CustomizationConfiguration Customization { get; set; } = new(); } \ No newline at end of file diff --git a/ProjectLighthouse/PlayerData/Profiles/User.cs b/ProjectLighthouse/PlayerData/Profiles/User.cs index 300345d2..451c3f18 100644 --- a/ProjectLighthouse/PlayerData/Profiles/User.cs +++ b/ProjectLighthouse/PlayerData/Profiles/User.cs @@ -64,7 +64,7 @@ public class User if (string.IsNullOrWhiteSpace(avatarHash) || this.IconHash.StartsWith('g')) avatarHash = this.YayHash; if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = this.MehHash; if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = this.BooHash; - if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = ServerConfiguration.Instance.WebsiteConfiguration.MissingIconHash; + if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = ServerConfiguration.Instance.Website.MissingIconHash; return avatarHash; } diff --git a/ProjectLighthouse/StartupTasks.cs b/ProjectLighthouse/StartupTasks.cs index caff91bc..69c72829 100644 --- a/ProjectLighthouse/StartupTasks.cs +++ b/ProjectLighthouse/StartupTasks.cs @@ -77,7 +77,7 @@ public static class StartupTasks return; } - if (ServerConfiguration.Instance.WebsiteConfiguration.ConvertAssetsOnStartup + if (ServerConfiguration.Instance.Website.ConvertAssetsOnStartup && serverType == ServerType.Website) { FileHelper.ConvertAllTexturesToPng();