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

Revert "Rename ServerConfiguration.WebsiteConfiguration to Website"

Browse source 
This reverts commit 7a2f99291d.
This commit is contained in:
jvyden 2022-06-01 17:10:13 -04:00
commit 96ed3cfad2
No known key found for this signature in database
GPG key ID: 18BCF2BE0262B278
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ProjectLighthouse.Servers.Website/Pages/Partials/SlotCardPartial.cshtml
View file

@ -27,7 +27,7 @@
bool showLink = (bool?)ViewData["ShowLink"] ?? false; bool showLink = (bool?)ViewData["ShowLink"] ?? false;
string iconHash = Model.IconHash; string iconHash = Model.IconHash;
if (string.IsNullOrWhiteSpace(iconHash) || iconHash.StartsWith('g')) iconHash = ServerConfiguration.Instance.Website.MissingIconHash; if (string.IsNullOrWhiteSpace(iconHash) || iconHash.StartsWith('g')) iconHash = ServerConfiguration.Instance.WebsiteConfiguration.MissingIconHash;
} }
<div class="card"> <div class="card">
@{ @{

2
ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml
View file

@ -98,7 +98,7 @@
if (string.IsNullOrWhiteSpace(faceHash)) if (string.IsNullOrWhiteSpace(faceHash))
{ {
faceHash = ServerConfiguration.Instance.Website.MissingIconHash; faceHash = ServerConfiguration.Instance.WebsiteConfiguration.MissingIconHash;
} }
string faceAlt = review.Thumb switch { string faceAlt = review.Thumb switch {

2
ProjectLighthouse/Configuration/Legacy/LegacyServerSettings.cs
View file

@ -203,7 +203,7 @@ internal class LegacyServerSettings
ProfileCommentsEnabled = this.ProfileCommentsEnabled, ProfileCommentsEnabled = this.ProfileCommentsEnabled,
}; };
configuration.Website = new WebsiteConfiguration configuration.WebsiteConfiguration = new WebsiteConfiguration
{ {
MissingIconHash = this.MissingIconHash, MissingIconHash = this.MissingIconHash,
ConvertAssetsOnStartup = this.ConvertAssetsOnStartup, ConvertAssetsOnStartup = this.ConvertAssetsOnStartup,

2
ProjectLighthouse/Configuration/ServerConfiguration.cs
View file

@ -195,6 +195,6 @@ public class ServerConfiguration
public InfluxDBConfiguration InfluxDB { get; set; } = new(); public InfluxDBConfiguration InfluxDB { get; set; } = new();
public MailConfiguration Mail { get; set; } = new(); public MailConfiguration Mail { get; set; } = new();
public UserGeneratedContentLimitConfiguration UserGeneratedContentLimits { get; set; } = new(); public UserGeneratedContentLimitConfiguration UserGeneratedContentLimits { get; set; } = new();
public WebsiteConfiguration Website { get; set; } = new(); public WebsiteConfiguration WebsiteConfiguration { get; set; } = new();
public CustomizationConfiguration Customization { get; set; } = new(); public CustomizationConfiguration Customization { get; set; } = new();
} }

2
ProjectLighthouse/PlayerData/Profiles/User.cs
View file

@ -64,7 +64,7 @@ public class User
if (string.IsNullOrWhiteSpace(avatarHash) || this.IconHash.StartsWith('g')) avatarHash = this.YayHash; if (string.IsNullOrWhiteSpace(avatarHash) || this.IconHash.StartsWith('g')) avatarHash = this.YayHash;
if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = this.MehHash; if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = this.MehHash;
if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = this.BooHash; if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = this.BooHash;
if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = ServerConfiguration.Instance.Website.MissingIconHash; if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = ServerConfiguration.Instance.WebsiteConfiguration.MissingIconHash;
return avatarHash; return avatarHash;
} }

2
ProjectLighthouse/StartupTasks.cs
View file

@ -77,7 +77,7 @@ public static class StartupTasks
return; return;
} }
if (ServerConfiguration.Instance.Website.ConvertAssetsOnStartup if (ServerConfiguration.Instance.WebsiteConfiguration.ConvertAssetsOnStartup
&& serverType == ServerType.Website) && serverType == ServerType.Website)
{ {
FileHelper.ConvertAllTexturesToPng(); FileHelper.ConvertAllTexturesToPng();