Revert "Rename ServerConfiguration.WebsiteConfiguration to Website"

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

View file

@ -27,7 +27,7 @@
bool showLink = (bool?)ViewData["ShowLink"] ?? false;
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">
@{

View file

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

View file

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

View file

@ -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 Website { get; set; } = new();
public WebsiteConfiguration WebsiteConfiguration { get; set; } = new();
public CustomizationConfiguration Customization { get; set; } = new();
}

View file

@ -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.Website.MissingIconHash;
if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = ServerConfiguration.Instance.WebsiteConfiguration.MissingIconHash;
return avatarHash;
}

View file

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