From 0df2d4956082e548072aad7abc22790a753e3159 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Sun, 5 Jan 2025 05:34:20 +0100 Subject: [PATCH] [backend/api] [frontend/pages] Remove specified as an option for default renote visibility --- .../Controllers/Web/SettingsController.cs | 3 +++ .../20241106151513_AddNoteThreadContext.cs | 0 .../20241106163544_IndexNoteThreadContext.cs | 0 ...20241203204110_AddInlineHtmlFeatureFlag.cs | 0 .../20241214231301_NormalizeMfmLineEndings.cs | 0 .../20241214232528_NormalizeCwLineEndings.cs | 0 ...0105042933_FixupDefaultRenoteVisibility.cs | 25 +++++++++++++++++++ .../Pages/Settings/Account.razor | 1 - 8 files changed, 28 insertions(+), 1 deletion(-) rename Iceshrimp.Backend/Core/Database/Migrations/{v2024.1-beta5 => v2025.1-beta5}/20241106151513_AddNoteThreadContext.cs (100%) rename Iceshrimp.Backend/Core/Database/Migrations/{v2024.1-beta5 => v2025.1-beta5}/20241106163544_IndexNoteThreadContext.cs (100%) rename Iceshrimp.Backend/Core/Database/Migrations/{v2024.1-beta5 => v2025.1-beta5}/20241203204110_AddInlineHtmlFeatureFlag.cs (100%) rename Iceshrimp.Backend/Core/Database/Migrations/{v2024.1-beta5 => v2025.1-beta5}/20241214231301_NormalizeMfmLineEndings.cs (100%) rename Iceshrimp.Backend/Core/Database/Migrations/{v2024.1-beta5 => v2025.1-beta5}/20241214232528_NormalizeCwLineEndings.cs (100%) create mode 100644 Iceshrimp.Backend/Core/Database/Migrations/v2025.1-beta5/20250105042933_FixupDefaultRenoteVisibility.cs diff --git a/Iceshrimp.Backend/Controllers/Web/SettingsController.cs b/Iceshrimp.Backend/Controllers/Web/SettingsController.cs index 04852362..afb4d143 100644 --- a/Iceshrimp.Backend/Controllers/Web/SettingsController.cs +++ b/Iceshrimp.Backend/Controllers/Web/SettingsController.cs @@ -56,6 +56,9 @@ public class SettingsController( { var settings = await GetOrInitUserSettings(); + if (newSettings.DefaultRenoteVisibility == NoteVisibility.Specified) + throw GracefulException.BadRequest("Default renote visibility cannot be 'specified'"); + settings.FilterInaccessible = newSettings.FilterInaccessible; settings.PrivateMode = newSettings.PrivateMode; settings.AlwaysMarkSensitive = newSettings.AlwaysMarkSensitive; diff --git a/Iceshrimp.Backend/Core/Database/Migrations/v2024.1-beta5/20241106151513_AddNoteThreadContext.cs b/Iceshrimp.Backend/Core/Database/Migrations/v2025.1-beta5/20241106151513_AddNoteThreadContext.cs similarity index 100% rename from Iceshrimp.Backend/Core/Database/Migrations/v2024.1-beta5/20241106151513_AddNoteThreadContext.cs rename to Iceshrimp.Backend/Core/Database/Migrations/v2025.1-beta5/20241106151513_AddNoteThreadContext.cs diff --git a/Iceshrimp.Backend/Core/Database/Migrations/v2024.1-beta5/20241106163544_IndexNoteThreadContext.cs b/Iceshrimp.Backend/Core/Database/Migrations/v2025.1-beta5/20241106163544_IndexNoteThreadContext.cs similarity index 100% rename from Iceshrimp.Backend/Core/Database/Migrations/v2024.1-beta5/20241106163544_IndexNoteThreadContext.cs rename to Iceshrimp.Backend/Core/Database/Migrations/v2025.1-beta5/20241106163544_IndexNoteThreadContext.cs diff --git a/Iceshrimp.Backend/Core/Database/Migrations/v2024.1-beta5/20241203204110_AddInlineHtmlFeatureFlag.cs b/Iceshrimp.Backend/Core/Database/Migrations/v2025.1-beta5/20241203204110_AddInlineHtmlFeatureFlag.cs similarity index 100% rename from Iceshrimp.Backend/Core/Database/Migrations/v2024.1-beta5/20241203204110_AddInlineHtmlFeatureFlag.cs rename to Iceshrimp.Backend/Core/Database/Migrations/v2025.1-beta5/20241203204110_AddInlineHtmlFeatureFlag.cs diff --git a/Iceshrimp.Backend/Core/Database/Migrations/v2024.1-beta5/20241214231301_NormalizeMfmLineEndings.cs b/Iceshrimp.Backend/Core/Database/Migrations/v2025.1-beta5/20241214231301_NormalizeMfmLineEndings.cs similarity index 100% rename from Iceshrimp.Backend/Core/Database/Migrations/v2024.1-beta5/20241214231301_NormalizeMfmLineEndings.cs rename to Iceshrimp.Backend/Core/Database/Migrations/v2025.1-beta5/20241214231301_NormalizeMfmLineEndings.cs diff --git a/Iceshrimp.Backend/Core/Database/Migrations/v2024.1-beta5/20241214232528_NormalizeCwLineEndings.cs b/Iceshrimp.Backend/Core/Database/Migrations/v2025.1-beta5/20241214232528_NormalizeCwLineEndings.cs similarity index 100% rename from Iceshrimp.Backend/Core/Database/Migrations/v2024.1-beta5/20241214232528_NormalizeCwLineEndings.cs rename to Iceshrimp.Backend/Core/Database/Migrations/v2025.1-beta5/20241214232528_NormalizeCwLineEndings.cs diff --git a/Iceshrimp.Backend/Core/Database/Migrations/v2025.1-beta5/20250105042933_FixupDefaultRenoteVisibility.cs b/Iceshrimp.Backend/Core/Database/Migrations/v2025.1-beta5/20250105042933_FixupDefaultRenoteVisibility.cs new file mode 100644 index 00000000..53271ef7 --- /dev/null +++ b/Iceshrimp.Backend/Core/Database/Migrations/v2025.1-beta5/20250105042933_FixupDefaultRenoteVisibility.cs @@ -0,0 +1,25 @@ +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Infrastructure; + +#nullable disable + +namespace Iceshrimp.Backend.Core.Database.Migrations +{ + /// + [DbContext(typeof(DatabaseContext))] + [Migration("20250105042933_FixupDefaultRenoteVisibility")] + public partial class FixupDefaultRenoteVisibility : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.Sql("""UPDATE "user_settings" SET "defaultRenoteVisibility" = 'followers' WHERE "defaultRenoteVisibility" = 'specified';"""); + }b + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + + } + } +} diff --git a/Iceshrimp.Frontend/Pages/Settings/Account.razor b/Iceshrimp.Frontend/Pages/Settings/Account.razor index a76a0ce5..6e579529 100644 --- a/Iceshrimp.Frontend/Pages/Settings/Account.razor +++ b/Iceshrimp.Frontend/Pages/Settings/Account.razor @@ -42,7 +42,6 @@ -