Merge branch 'main' of https://iceshrimp.dev/limepotato/jormungandr

revert revert 671b52c663

revert clean locales from experiments mentions

custom/assets/instance.css

@@ -282,103 +282,3 @@ section.modal._popup>div.form>textarea {
 .profile~.contents>div>._panel .content:not(.omitted) .empty {
 	display: none;
 }
-
-/* Koppers Reply */
-:root {
-	--originalAvatarSize: var(--avatarSize);
-}
-
-.list .note-container .reply-to {
-	--avatarSize: 16px;
-
-	.avatar-container {
-		margin-left: calc((var(--originalAvatarSize) - var(--avatarSize)) / 2);
-		align-self: center;
-	}
-
-	.cat:before,
-	.cat:after {
-		margin-bottom: 5px;
-	}
-
-	.body {
-		display: flex;
-		align-items: baseline;
-		overflow-x: hidden;
-
-		>.header {
-			align-items: initial;
-
-			.user-info {
-
-				>div>.name,
-				.info {
-					display: none;
-				}
-
-				&,
-				>div:first-child {
-					width: auto;
-				}
-			}
-
-			div:has(> .hpaizdrt) {
-				display: none
-			}
-		}
-
-		>.body {
-			flex-grow: 1;
-			max-height: 32px;
-
-			br,
-			.files,
-			.reply-icon,
-			&:has(.cw:not(._cw_style_modern)) .wrmlmaau,
-			.showMoreButton,
-			.rp,
-			.cw button {
-				display: none
-			}
-
-			.mfm-object :not(br) {
-				display: inline;
-			}
-
-			.mfm-object,
-			.mfm-object * {
-				--mfm-zoom-size: 100% !important;
-
-				white-space: nowrap;
-				word-break: keep-all;
-			}
-		}
-
-		.content {
-			&.collapsed>.body {
-				mask: none;
-				-webkit-mask: none;
-			}
-
-			&._cw_style_modern.showContent {
-				min-height: initial;
-
-				>.hiddenNote {
-					text-align: left;
-					font-weight: inherit;
-					font-size: inherit;
-					padding: 0;
-				}
-
-				>button,
-				>.body {
-					display: none;
-				}
-			}
-		}
-
-		.footer {
-			display: none !important;
-		}
-	}
-}

packages/backend/src/remote/activitypub/models/note.ts

@@ -150,12 +150,6 @@ export async function createNote(
 		const DateChecker = new Date(note.published);
 		const FutureCheck = new Date();
 		FutureCheck.setDate(FutureCheck.getDate() + 3); // Allow some wiggle room for misconfigured hosts
-		if (DateChecker.getFullYear() < 2007) {
-			logger.warn(
-				"Note somehow made before Activitypub was created; discarding",
-			);
-			return null;
-		}
 		if (DateChecker > FutureCheck) {
 			logger.warn("Note somehow made after today; discarding");
 			return null;

packages/client/src/pages/admin/experiments.vue

@@ -0,0 +1,74 @@
+<template>
+	<MkStickyContainer>
+		<template #header
+			><MkPageHeader
+				:actions="headerActions"
+				:tabs="headerTabs"
+				:display-back-button="true"
+		/></template>
+		<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
+			<FormSuspense :p="init">
+				<FormSwitch
+					v-model="enablePostImports"
+					@update:modelValue="save"
+					class="_formBlock"
+				>
+					<template #label>
+						<i class="ph-download-simple ph-bold ph-lg"></i>
+						{{ i18n.ts._experiments.enablePostImports }}
+					</template>
+					<template #caption>{{
+						i18n.ts._experiments.postImportsCaption
+					}}</template>
+				</FormSwitch>
+			</FormSuspense>
+		</MkSpacer>
+	</MkStickyContainer>
+</template>
+
+<script lang="ts" setup>
+import {} from "vue";
+import MkStickyContainer from "@/components/global/MkStickyContainer.vue";
+import FormSuspense from "@/components/form/suspense.vue";
+import FormSwitch from "@/components/form/switch.vue";
+import * as os from "@/os";
+import { fetchInstance } from "@/instance";
+import { i18n } from "@/i18n";
+import { definePageMetadata } from "@/scripts/page-metadata";
+
+let enablePostImports = $ref(false);
+let meta = $ref<MetaExperiments | null>(null);
+
+type MetaExperiments = {
+	experimentalFeatures?: {
+		postImports?: boolean;
+	};
+};
+
+async function init() {
+	meta = (await os.api("admin/meta")) as MetaExperiments;
+	if (!meta) return;
+
+	enablePostImports = meta.experimentalFeatures?.postImports ?? false;
+}
+
+function save() {
+	const experiments: MetaExperiments = {
+		experimentalFeatures: {
+			postImports: enablePostImports,
+		},
+	};
+	os.apiWithDialog("admin/update-meta", experiments).then(() => {
+		fetchInstance();
+	});
+}
+
+const headerActions = $computed(() => []);
+
+const headerTabs = $computed(() => []);
+
+definePageMetadata({
+	title: i18n.ts._experiments.title,
+	icon: "ph-flask ph-bold ph-lg",
+});
+</script>

packages/client/src/pages/admin/index.vue

@@ -259,6 +259,12 @@ const menuDef = $computed(() => [
 							to: "/admin/database",
 							active: currentPage?.route.name === "database",
 						},
+						{
+							icon: "ph-flask ph-bold ph-lg",
+							text :i18n.ts._experiments.title,
+							to: "/admin/experiments",
+							active: currentPage?.route.name === "experiments",
+						},
 					],
 				},
 		  ]

packages/client/src/router.ts

@@ -543,6 +543,11 @@ export const routes = [
 				name: "other-settings",
 				component: page(() => import("./pages/admin/custom-css.vue")),
 			},
+			{
+				path: "/experiments",
+				name: "experiments",
+				component: page(() => import("./pages/admin/experiments.vue")),
+			},
 			{
 				path: "/",
 				component: page(() => import("./pages/_empty_.vue")),