diff --git a/src/BirdsiteLive/Controllers/AboutController.cs b/src/BirdsiteLive/Controllers/AboutController.cs index e64a147..3b02e29 100644 --- a/src/BirdsiteLive/Controllers/AboutController.cs +++ b/src/BirdsiteLive/Controllers/AboutController.cs @@ -27,16 +27,16 @@ namespace BirdsiteLive.Controllers return View(stats); } - public IActionResult Blacklisting() + public IActionResult Blocklisting() { var status = GetModerationStatus(); - return View("Blacklisting", status); + return View("Blocklisting", status); } - public IActionResult Whitelisting() + public IActionResult Allowlisting() { var status = GetModerationStatus(); - return View("Whitelisting", status); + return View("Allowlisting", status); } private ModerationStatus GetModerationStatus() diff --git a/src/BirdsiteLive/Views/About/Whitelisting.cshtml b/src/BirdsiteLive/Views/About/Allowlisting.cshtml similarity index 66% rename from src/BirdsiteLive/Views/About/Whitelisting.cshtml rename to src/BirdsiteLive/Views/About/Allowlisting.cshtml index bdd00bc..55ec191 100644 --- a/src/BirdsiteLive/Views/About/Whitelisting.cshtml +++ b/src/BirdsiteLive/Views/About/Allowlisting.cshtml @@ -1,25 +1,25 @@ @using BirdsiteLive.Domain.Repository @model BirdsiteLive.Controllers.ModerationStatus @{ - ViewData["Title"] = "Whitelisting"; + ViewData["Title"] = "Allowlisting"; }
-

Whitelisting

+

Allowlisting

@if (Model.Followers == ModerationTypeEnum.WhiteListing) { -


This node is whitelisting some instances and/or Fediverse users.

+


This node is allowlisting some instances and/or Fediverse users.

} @if (Model.TwitterAccounts == ModerationTypeEnum.WhiteListing) { -


This node is whitelisting some twitter users.

+


This node is allowlisting some twitter users.

} @if (Model.Followers != ModerationTypeEnum.WhiteListing && Model.TwitterAccounts != ModerationTypeEnum.WhiteListing) { -


This node is not using whitelisting.

+


This node is not using an allowlist.

} @*

FAQ

diff --git a/src/BirdsiteLive/Views/About/Blacklisting.cshtml b/src/BirdsiteLive/Views/About/Blocklisting.cshtml similarity index 66% rename from src/BirdsiteLive/Views/About/Blacklisting.cshtml rename to src/BirdsiteLive/Views/About/Blocklisting.cshtml index 148b0aa..c88194f 100644 --- a/src/BirdsiteLive/Views/About/Blacklisting.cshtml +++ b/src/BirdsiteLive/Views/About/Blocklisting.cshtml @@ -1,25 +1,25 @@ @using BirdsiteLive.Domain.Repository @model BirdsiteLive.Controllers.ModerationStatus @{ - ViewData["Title"] = "Blacklisting"; + ViewData["Title"] = "Blocklisting"; }
-

Blacklisting

+

Blocklisting

@if (Model.Followers == ModerationTypeEnum.BlackListing) { -


This node is blacklisting some instances and/or Fediverse users.

+


This node is blocklisting some instances and/or Fediverse users.

} @if (Model.TwitterAccounts == ModerationTypeEnum.BlackListing) { -


This node is blacklisting some twitter users.

+


This node is blocklisting some twitter users.

} @if (Model.Followers != ModerationTypeEnum.BlackListing && Model.TwitterAccounts != ModerationTypeEnum.BlackListing) { -


This node is not using blacklisting.

+


This node is not using a blocklist.

} @*

FAQ

diff --git a/src/BirdsiteLive/Views/Shared/Components/NodeInfo/Default.cshtml b/src/BirdsiteLive/Views/Shared/Components/NodeInfo/Default.cshtml index 4e0f093..b26ea6f 100644 --- a/src/BirdsiteLive/Views/Shared/Components/NodeInfo/Default.cshtml +++ b/src/BirdsiteLive/Views/Shared/Components/NodeInfo/Default.cshtml @@ -3,11 +3,11 @@
@if (ViewData.Model.WhitelistingEnabled) { - Whitelisting Enabled + Allowlist Enabled } @if (ViewData.Model.BlacklistingEnabled) { - Blacklisting Enabled + Blocklist Enabled }