Foxnouns.Backend/Controllers/MembersController.cs

@@ -164,9 +164,6 @@ public class MembersController(
             member.Links = req.Links ?? [];
         }
 
-        if (req.HasProperty(nameof(req.Unlisted)))
-            member.Unlisted = req.Unlisted ?? false;
-
         if (req.Names != null)
         {
             errors.AddRange(
@@ -247,7 +244,6 @@ public class MembersController(
         public Pronoun[]? Pronouns { get; init; }
         public Field[]? Fields { get; init; }
         public Snowflake[]? Flags { get; init; }
-        public bool? Unlisted { get; init; }
     }
 
     [HttpDelete("/api/v2/users/@me/members/{memberRef}")]

Foxnouns.Backend/Utils/ValidationUtils.cs

@@ -414,7 +414,7 @@ public static partial class ValidationUtils
                     case > Limits.FieldEntryTextLimit:
                         errors.Add(
                             (
-                                $"{errorPrefix}.{entryIdx}.display_text",
+                                $"{errorPrefix}.{entryIdx}.value",
                                 ValidationError.LengthError(
                                     "Pronoun display text is too long",
                                     1,
@@ -427,7 +427,7 @@ public static partial class ValidationUtils
                     case < 1:
                         errors.Add(
                             (
-                                $"{errorPrefix}.{entryIdx}.display_text",
+                                $"{errorPrefix}.{entryIdx}.value",
                                 ValidationError.LengthError(
                                     "Pronoun display text is too short",
                                     1,

Foxnouns.Frontend/package.json

@@ -44,8 +44,6 @@
 		"markdown-it": "^14.1.0",
 		"pretty-bytes": "^6.1.1",
 		"sanitize-html": "^2.13.1",
-		"svelte-tippy": "^1.3.2",
-		"tippy.js": "^6.3.7",
 		"tslog": "^4.9.3"
 	}
 }

Foxnouns.Frontend/pnpm-lock.yaml

@@ -29,12 +29,6 @@ importers:
       sanitize-html:
         specifier: ^2.13.1
         version: 2.13.1
-      svelte-tippy:
-        specifier: ^1.3.2
-        version: 1.3.2
-      tippy.js:
-        specifier: ^6.3.7
-        version: 6.3.7
       tslog:
         specifier: ^4.9.3
         version: 4.9.3
@@ -1331,9 +1325,6 @@ packages:
       svelte:
         optional: true
 
-  svelte-tippy@1.3.2:
-    resolution: {integrity: sha512-41f+85hwhKBRqX0UNYrgFsi34Kk/KDvUkIZXYANxkWoA2NTVTCZbUC2J8hRNZ4TRVxObTshoZRjK2co5+i6LMw==}
-
   svelte@5.2.2:
     resolution: {integrity: sha512-eHIJRcvA6iuXdRGMESTmBtWTQCcCiol4gyH9DA60ybS35W1x27cvtbndNvWDqX72blyf+AYeQ4gzZ0XGg3L8sw==}
     engines: {node: '>=18'}
@@ -1346,9 +1337,6 @@ packages:
   tiny-glob@0.2.9:
     resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==}
 
-  tippy.js@6.3.7:
-    resolution: {integrity: sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ==}
-
   to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
@@ -2577,10 +2565,6 @@ snapshots:
     optionalDependencies:
       svelte: 5.2.2
 
-  svelte-tippy@1.3.2:
-    dependencies:
-      tippy.js: 6.3.7
-
   svelte@5.2.2:
     dependencies:
       '@ampproject/remapping': 2.3.0
@@ -2608,10 +2592,6 @@ snapshots:
       globalyzer: 0.1.0
       globrex: 0.1.2
 
-  tippy.js@6.3.7:
-    dependencies:
-      '@popperjs/core': 2.11.8
-
   to-regex-range@5.0.1:
     dependencies:
       is-number: 7.0.0

Foxnouns.Frontend/src/app.scss

@@ -29,15 +29,6 @@
 	white-space: pre-line;
 }
 
-// Make tippy tooltips look like bootstrap's
-.tippy-box {
-	padding: bootstrap.$spacer * 0.25 bootstrap.$spacer * 0.5;
-	opacity: 0.9;
-	color: var(--bs-body-bg);
-	background-color: var(--bs-emphasis-color);
-	border-radius: var(--bs-border-radius);
-}
-
 // Add breakpoint-dependent w-{size} utilities
 // Source: https://stackoverflow.com/questions/47760132/any-way-to-get-breakpoint-specific-width-classes
 @each $breakpoint in map-keys(bootstrap.$grid-breakpoints) {

Foxnouns.Frontend/src/lib/components/Error.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { ErrorCode, type RawApiError } from "$api/error";
-	import errorDescription from "$lib/errorCodes";
+	import errorDescription from "$lib/errorCodes.svelte";
 	import { t } from "$lib/i18n";
 	import KeyedValidationErrors from "./errors/KeyedValidationErrors.svelte";
 

Foxnouns.Frontend/src/lib/components/IconButton.svelte

@@ -1,20 +0,0 @@
-<script lang="ts">
-	import { Icon } from "@sveltestrap/sveltestrap";
-	import type { MouseEventHandler } from "svelte/elements";
-	import tippy from "$lib/tippy";
-
-	type Props = {
-		icon: string;
-		tooltip: string;
-		color?: "primary" | "secondary" | "success" | "danger";
-		type?: "submit" | "reset" | "button";
-		id?: string;
-		onclick?: MouseEventHandler<HTMLButtonElement>;
-	};
-	let { icon, tooltip, color = "primary", type, id, onclick }: Props = $props();
-</script>
-
-<button {id} {type} use:tippy={{ content: tooltip }} class="btn btn-{color}" {onclick}>
-	<Icon name={icon} />
-	<span class="visually-hidden">{tooltip}</span>
-</button>

Foxnouns.Frontend/src/lib/components/StatusIcon.svelte

@@ -1,14 +1,17 @@
 <script lang="ts">
-	import { Icon } from "@sveltestrap/sveltestrap";
+	import { Icon, Tooltip } from "@sveltestrap/sveltestrap";
 
 	import type { CustomPreference } from "$api/models/user";
-	import tippy from "$lib/tippy";
 
 	type Props = { preference: CustomPreference };
 	let { preference }: Props = $props();
+
+	// svelte-ignore non_reactive_update
+	let elem: HTMLSpanElement;
 </script>
 
-<span use:tippy={{ content: preference.tooltip }} aria-hidden={true}>
+<span bind:this={elem} aria-hidden={true}>
 	<Icon name={preference.icon} />
 </span>
 <span class="visually-hidden">{preference.tooltip}:</span>
+<Tooltip aria-hidden target={elem} placement="top">{preference.tooltip}</Tooltip>

Foxnouns.Frontend/src/lib/components/editor/FieldEditor.svelte

@@ -1,56 +0,0 @@
-<script lang="ts">
-	import type { CustomPreference, FieldEntry } from "$api/models";
-	import IconButton from "$components/IconButton.svelte";
-	import { t } from "$lib/i18n";
-	import FieldEntryEditor from "./FieldEntryEditor.svelte";
-
-	type Props = {
-		name: string;
-		entries: FieldEntry[];
-		allPreferences: Record<string, CustomPreference>;
-	};
-	let { name, entries = $bindable(), allPreferences }: Props = $props();
-
-	let newEntry = $state("");
-
-	const moveValue = (index: number, up: boolean) => {
-		if (up && index == 0) return;
-		if (!up && index == entries.length - 1) return;
-
-		const newIndex = up ? index - 1 : index + 1;
-		const temp = entries[index];
-		entries[index] = entries[newIndex];
-		entries[newIndex] = temp;
-		entries = [...entries];
-	};
-
-	const removeValue = (index: number) => {
-		entries.splice(index, 1);
-		entries = [...entries];
-	};
-
-	const addEntry = (event: Event) => {
-		event.preventDefault();
-		if (!newEntry) return;
-
-		entries = [...entries, { value: newEntry, status: "okay" }];
-		newEntry = "";
-	};
-</script>
-
-<h4>{name}</h4>
-
-{#each entries as _, index}
-	<FieldEntryEditor
-		{index}
-		bind:value={entries[index]}
-		{allPreferences}
-		{moveValue}
-		{removeValue}
-	/>
-{/each}
-
-<form class="input-group m-1" onsubmit={addEntry}>
-	<input type="text" class="form-control" bind:value={newEntry} />
-	<IconButton type="submit" color="success" icon="plus" tooltip={$t("editor.add-entry")} />
-</form>

Foxnouns.Frontend/src/lib/components/editor/FieldEntryEditor.svelte

@@ -1,65 +0,0 @@
-<script lang="ts">
-	import { defaultPreferences, type CustomPreference, type FieldEntry } from "$api/models";
-	import IconButton from "$components/IconButton.svelte";
-	import { t } from "$lib/i18n";
-	import tippy from "$lib/tippy";
-	import {
-		ButtonDropdown,
-		DropdownItem,
-		DropdownMenu,
-		DropdownToggle,
-		Icon,
-	} from "@sveltestrap/sveltestrap";
-
-	type Props = {
-		index: number;
-		value: FieldEntry;
-		allPreferences: Record<string, CustomPreference>;
-		moveValue: (index: number, up: boolean) => void;
-		removeValue: (index: number) => void;
-	};
-	let { index, value = $bindable(), allPreferences, moveValue, removeValue }: Props = $props();
-
-	let status = $derived(
-		value.status in allPreferences ? allPreferences[value.status] : defaultPreferences.missing,
-	);
-
-	let prefIds = $derived(Object.keys(allPreferences).filter((s) => s !== "missing"));
-</script>
-
-<div class="input-group m-1">
-	<IconButton
-		icon="chevron-up"
-		color="secondary"
-		tooltip={$t("editor.move-entry-up")}
-		onclick={() => moveValue(index, true)}
-	/>
-	<IconButton
-		icon="chevron-down"
-		color="secondary"
-		tooltip={$t("editor.move-entry-down")}
-		onclick={() => moveValue(index, true)}
-	/>
-	<input type="text" class="form-control" bind:value={value.value} />
-	<ButtonDropdown>
-		<span use:tippy={{ content: status.tooltip }}>
-			<DropdownToggle color="secondary" caret>
-				<Icon name={status.icon} />
-			</DropdownToggle>
-		</span>
-		<DropdownMenu>
-			{#each prefIds as id}
-				<DropdownItem on:click={() => (value.status = id)} active={value.status === id}>
-					<Icon name={allPreferences[id].icon} aria-hidden />
-					{allPreferences[id].tooltip}
-				</DropdownItem>
-			{/each}
-		</DropdownMenu>
-	</ButtonDropdown>
-	<IconButton
-		color="danger"
-		icon="trash3"
-		tooltip={$t("editor.remove-entry")}
-		onclick={() => removeValue(index)}
-	/>
-</div>

Foxnouns.Frontend/src/lib/components/editor/PronounEntryEditor.svelte

@@ -1,100 +0,0 @@
-<script lang="ts">
-	import { defaultPreferences, type CustomPreference, type Pronoun } from "$api/models";
-	import IconButton from "$components/IconButton.svelte";
-	import { t } from "$lib/i18n";
-	import tippy from "$lib/tippy";
-	import {
-		ButtonDropdown,
-		Collapse,
-		DropdownItem,
-		DropdownMenu,
-		DropdownToggle,
-		Icon,
-		InputGroupText,
-		Popover,
-	} from "@sveltestrap/sveltestrap";
-
-	type Props = {
-		index: number;
-		value: Pronoun;
-		allPreferences: Record<string, CustomPreference>;
-		moveValue: (index: number, up: boolean) => void;
-		removeValue: (index: number) => void;
-	};
-	let { index, value = $bindable(), allPreferences, moveValue, removeValue }: Props = $props();
-
-	$effect(() => {
-		if (!value.display_text) value.display_text = null;
-	});
-
-	let status = $derived(
-		value.status in allPreferences ? allPreferences[value.status] : defaultPreferences.missing,
-	);
-
-	let prefIds = $derived(Object.keys(allPreferences).filter((s) => s !== "missing"));
-
-	let displayOpen = $state(false);
-</script>
-
-<div class="m-1">
-	<div class="input-group">
-		<IconButton
-			icon="chevron-up"
-			color="secondary"
-			tooltip={$t("editor.move-entry-up")}
-			onclick={() => moveValue(index, true)}
-		/>
-		<IconButton
-			icon="chevron-down"
-			color="secondary"
-			tooltip={$t("editor.move-entry-down")}
-			onclick={() => moveValue(index, true)}
-		/>
-		<input type="text" class="form-control" bind:value={value.value} />
-		<ButtonDropdown>
-			<span use:tippy={{ content: status.tooltip }}>
-				<DropdownToggle color="secondary" caret>
-					<Icon name={status.icon} />
-				</DropdownToggle>
-			</span>
-			<DropdownMenu>
-				{#each prefIds as id}
-					<DropdownItem on:click={() => (value.status = id)} active={value.status === id}>
-						<Icon name={allPreferences[id].icon} aria-hidden />
-						{allPreferences[id].tooltip}
-					</DropdownItem>
-				{/each}
-			</DropdownMenu>
-		</ButtonDropdown>
-		<IconButton
-			color="secondary"
-			icon={value.display_text ? "tag-fill" : "tag"}
-			tooltip={$t("editor.change-display-text")}
-			onclick={() => (displayOpen = !displayOpen)}
-		/>
-		<IconButton
-			color="danger"
-			icon="trash3"
-			tooltip={$t("editor.remove-entry")}
-			onclick={() => removeValue(index)}
-		/>
-	</div>
-
-	<Collapse class="mt-1" isOpen={displayOpen}>
-		<div class="input-group">
-			<InputGroupText>{$t("editor.display-text-label")}</InputGroupText>
-			<input
-				placeholder={$t("editor.display-text-example")}
-				type="text"
-				class="form-control"
-				bind:value={value.display_text}
-			/>
-			<IconButton id="display-help" icon="question" tooltip="Help" color="secondary" />
-			<!-- TODO: remove children={false} once sveltestrap is updated
-			 This component is too complex to write manually, sadly -->
-			<Popover target="display-help" placement="bottom" children={false}>
-				{$t("editor.display-text-info")}
-			</Popover>
-		</div>
-	</Collapse>
-</div>

Foxnouns.Frontend/src/lib/components/editor/PronounsEditor.svelte

@@ -1,65 +0,0 @@
-<script lang="ts">
-	import type { CustomPreference, Pronoun } from "$api/models";
-	import IconButton from "$components/IconButton.svelte";
-	import { PUBLIC_LANGUAGE } from "$env/static/public";
-	import defaultPronouns from "$lib/defaultPronouns";
-	import { t } from "$lib/i18n";
-	import PronounEntryEditor from "./PronounEntryEditor.svelte";
-
-	type Props = {
-		entries: Pronoun[];
-		allPreferences: Record<string, CustomPreference>;
-	};
-	let { entries = $bindable(), allPreferences }: Props = $props();
-
-	let newEntry = $state("");
-
-	const moveValue = (index: number, up: boolean) => {
-		if (up && index == 0) return;
-		if (!up && index == entries.length - 1) return;
-
-		const newIndex = up ? index - 1 : index + 1;
-		const temp = entries[index];
-		entries[index] = entries[newIndex];
-		entries[newIndex] = temp;
-		entries = [...entries];
-	};
-
-	const removeValue = (index: number) => {
-		entries.splice(index, 1);
-		entries = [...entries];
-	};
-
-	const addEntry = (event: Event) => {
-		event.preventDefault();
-		if (!newEntry) return;
-
-		// Some pronouns are commonly abbreviated and should be expanded by the editor, or people will get confused
-		let entry = { value: newEntry, display_text: null as string | null, status: "okay" };
-		if (PUBLIC_LANGUAGE in defaultPronouns && newEntry in defaultPronouns[PUBLIC_LANGUAGE]) {
-			const def = defaultPronouns[PUBLIC_LANGUAGE][newEntry];
-			if (def.pronouns) entry.value = def.pronouns.join("/");
-			if (def.display) entry.display_text = def.display;
-		}
-
-		entries = [...entries, entry];
-		newEntry = "";
-	};
-</script>
-
-<h4>{$t("profile.pronouns-header")}</h4>
-
-{#each entries as _, index}
-	<PronounEntryEditor
-		{index}
-		bind:value={entries[index]}
-		{allPreferences}
-		{moveValue}
-		{removeValue}
-	/>
-{/each}
-
-<form class="input-group m-1" onsubmit={addEntry}>
-	<input type="text" class="form-control" bind:value={newEntry} />
-	<IconButton type="submit" color="success" icon="plus" tooltip={$t("editor.add-entry")} />
-</form>

Foxnouns.Frontend/src/lib/components/profile/ProfileFlag.svelte

@@ -1,18 +1,17 @@
 <script lang="ts">
 	import type { PrideFlag } from "$api/models/user";
-	import tippy from "$lib/tippy";
+	import { Tooltip } from "@sveltestrap/sveltestrap";
 
 	type Props = { flag: PrideFlag };
 	let { flag }: Props = $props();
+
+	// svelte-ignore non_reactive_update
+	let elem: HTMLImageElement;
 </script>
 
 <span class="mx-2 my-1">
-	<img
+	<Tooltip target={elem} aria-hidden placement="top">{flag.description ?? flag.name}</Tooltip>
-		use:tippy={{ content: flag.description ?? flag.name }}
+	<img bind:this={elem} class="flag" src={flag.image_url} alt={flag.description ?? flag.name} />
-		class="flag"
-		src={flag.image_url}
-		alt={flag.description ?? flag.name}
-	/>
 	{flag.name}
 </span>
 

Foxnouns.Frontend/src/lib/defaultPronouns/en.ts

@@ -1,16 +0,0 @@
-const enPronouns = {
-	"they/them": { pronouns: ["they", "them", "their", "theirs", "themself"] },
-	"they/them (singular)": {
-		pronouns: ["they", "them", "their", "theirs", "themself"],
-		display: "they/them (singular)",
-	},
-	"they/them (plural)": {
-		pronouns: ["they", "them", "their", "theirs", "themselves"],
-		display: "they/them (plural)",
-	},
-	"he/him": { pronouns: ["he", "him", "his", "his", "himself"] },
-	"she/her": { pronouns: ["she", "her", "her", "hers", "herself"] },
-	"it/its": { pronouns: ["it", "it", "its", "its", "itself"], display: "it/its" },
-} as Record<string, { pronouns: string[]; display?: string }>;
-
-export default enPronouns;

Foxnouns.Frontend/src/lib/defaultPronouns/index.ts

@@ -1,7 +0,0 @@
-import enPronouns from "./en";
-
-const defaultPronouns = {
-	en: enPronouns,
-} as Record<string, Record<string, { pronouns: string[]; display?: string }>>;
-
-export default defaultPronouns;

Foxnouns.Frontend/src/lib/i18n/locales/en.json

@@ -55,7 +55,7 @@
     "account-already-linked": "This account is already linked with a pronouns.cc account.",
     "last-auth-method": "You cannot remove your last authentication method.",
     "validation-max-length-error": "Value is too long, maximum length is {{max}}, current length is {{actual}}.",
-		"validation-min-length-error": "Value is too short, minimum length is {{min}}, current length is {{actual}}.",
+    "validation-min-length-error": "Value is too long, minimum length is {{min}}, current length is {{actual}}.",
     "validation-disallowed-value-1": "The following value is not allowed here",
     "validation-disallowed-value-2": "Allowed values are",
     "validation-reason": "Reason",
@@ -123,28 +123,14 @@
     "fields-tab": "Fields",
     "flags-links-tab": "Flags & links",
     "back-to-settings-tab": "Back to settings",
-		"member-header": "Editing profile of {{name}}",
+    "member-header": "Editing member {{name}}",
     "username": "Username",
     "change-username-info": "As changing your username will also change all of your members' links, you can only change it in your account settings.",
     "change-username-link": "Go to settings",
     "member-name": "Name",
     "change-member-name": "Change name",
-		"display-name": "Display name",
+    "display-name": "Display name"
-		"unlisted-label": "Hide from member list",
-		"unlisted-note": "This only hides this member from your public member list. They will still be visible to anyone at this link:",
-		"edit-names-pronouns-header": "Edit names and pronouns",
-		"back-to-profile-tab": "Back to profile"
   },
   "save-changes": "Save changes",
-	"change": "Change",
+  "change": "Change"
-	"editor": {
-		"remove-entry": "Remove entry",
-		"move-entry-down": "Move entry down",
-		"move-entry-up": "Move entry up",
-		"add-entry": "Add entry",
-		"change-display-text": "Change display text",
-		"display-text-example": "Optional display text (e.g. it/its)",
-		"display-text-label": "Display text",
-		"display-text-info": "This is the short text shown on your profile page. If you leave it empty, it will default to the first two forms of the full set."
-	}
 }

Foxnouns.Frontend/src/lib/tippy.ts

@@ -1,11 +0,0 @@
-import "tippy.js/animations/scale-subtle.css";
-import { createTippy } from "svelte-tippy";
-
-// use with use:tippy on elements
-// temporary (probably) until sveltestrap works with svelte 5
-const tippy = createTippy({
-	animation: "scale-subtle",
-	delay: [null, 0],
-});
-
-export default tippy;

Foxnouns.Frontend/src/routes/@[username]/+page.svelte

@@ -33,7 +33,7 @@
 		<h2>
 			{data.user.member_title || $t("profile.default-members-header")}
 			{#if isMeUser}
-				<a class="btn btn-success" href="/settings/members/new">
+				<a class="btn btn-success" href="/settings/create-member">
 					<Icon name="person-plus-fill" aria-hidden />
 					{$t("profile.create-member-button")}
 				</a>

Foxnouns.Frontend/src/routes/settings/members/[id]/+layout@.svelte

@@ -8,20 +8,14 @@
 	let { data, children }: Props = $props();
 
 	const isActive = (path: string) => $page.url.pathname === path;
-
-	let name = $derived(
-		data.member.display_name === data.member.name
-			? data.member.name
-			: `${data.member.display_name} (${data.member.name})`,
-	);
 </script>
 
 <svelte:head>
-	<title>{$t("edit-profile.member-header", { name })} • pronouns.cc</title>
+	<title>{$t("edit-profile.member-header", { name: data.member.name })} • pronouns.cc</title>
 </svelte:head>
 
 <div class="container">
-	<h3>{$t("edit-profile.member-header", { name })}</h3>
+	<h3>{$t("edit-profile.member-header", { name: data.member.name })}</h3>
 	<div class="row">
 		<div class="col-md-3 mt-1 mb-3">
 			<div class="list-group">
@@ -57,7 +51,7 @@
 					href="/@{data.user.username}/{data.member.name}"
 					class="list-group-item list-group-item-action text-danger"
 				>
-					{$t("edit-profile.back-to-profile-tab")}
+					Back to member
 				</a>
 				<a href="/settings/members" class="list-group-item list-group-item-action text-danger">
 					{$t("edit-profile.back-to-settings-tab")}

Foxnouns.Frontend/src/routes/settings/members/[id]/+page.server.ts

@@ -64,8 +64,7 @@ export const actions = {
 	},
 	bio: async ({ params, request, fetch, cookies }) => {
 		const body = await request.formData();
-		let bio = body.get("bio") as string | null;
+		const bio = body.get("bio") as string | null;
-		if (!bio || bio === "") bio = null;
 
 		try {
 			await fastRequest("PATCH", `/users/@me/members/${params.id}`, {
@@ -80,21 +79,4 @@ export const actions = {
 			throw e;
 		}
 	},
-	options: async ({ params, request, fetch, cookies }) => {
-		const body = await request.formData();
-		let unlisted = !!body.get("unlisted");
-
-		try {
-			await fastRequest("PATCH", `/users/@me/members/${params.id}`, {
-				body: { unlisted },
-				fetch,
-				cookies,
-			});
-			return { error: null, ok: true };
-		} catch (e) {
-			if (e instanceof ApiError) return { error: e.obj, ok: false };
-			log.error("Error patching member %s:", params.id, e);
-			throw e;
-		}
-	},
 };

Foxnouns.Frontend/src/routes/settings/members/[id]/+page.svelte

@@ -5,7 +5,7 @@
 	import { apiRequest, fastRequest } from "$api";
 	import ApiError from "$api/error";
 	import log from "$lib/log";
-	import { Icon, InputGroup } from "@sveltestrap/sveltestrap";
+	import { InputGroup } from "@sveltestrap/sveltestrap";
 	import { t } from "$lib/i18n";
 	import AvatarEditor from "$components/editor/AvatarEditor.svelte";
 	import ErrorAlert from "$components/ErrorAlert.svelte";
@@ -13,7 +13,6 @@
 	import FormStatusMarker from "$components/editor/FormStatusMarker.svelte";
 	import SidEditor from "$components/editor/SidEditor.svelte";
 	import BioEditor from "$components/editor/BioEditor.svelte";
-	import { PUBLIC_BASE_URL } from "$env/static/public";
 
 	type Props = { data: PageData; form: ActionData };
 	let { data, form }: Props = $props();
@@ -107,36 +106,7 @@
 		<h4>{$t("edit-profile.sid")}</h4>
 		<SidEditor {rerollSid} {sid} {canRerollSid} />
 	</div>
-	<div class="row mb-3">
+	<div class="row">
-		<h4>{$t("edit-profile.profile-options-header")}</h4>
-		<form method="POST" action="?/options">
-			<div class="form-check">
-				<input
-					class="form-check-input"
-					type="checkbox"
-					checked={data.member.unlisted}
-					value="true"
-					name="unlisted"
-					id="unlisted"
-				/>
-				<label class="form-check-label" for="unlisted">
-					{$t("edit-profile.unlisted-label")}
-				</label>
-			</div>
-			<p class="text-muted mt-1">
-				<Icon name="info-circle-fill" aria-hidden />
-				{$t("edit-profile.unlisted-note")}
-				<code>
-					{PUBLIC_BASE_URL.substring("https://".length)}/@{data.member.user.username}/{data.member
-						.name}
-				</code>
-			</p>
-			<div class="mt-2">
-				<button type="submit" class="btn btn-primary">{$t("save-changes")}</button>
-			</div>
-		</form>
-	</div>
-	<div class="row mb-3">
 		<h4>{$t("edit-profile.bio-tab")}</h4>
 		<form method="POST" action="?/bio">
 			<BioEditor bind:value={bio} maxLength={data.meta.limits.bio_length} />

Foxnouns.Frontend/src/routes/settings/members/[id]/names-pronouns/+page.svelte

@@ -1,52 +0,0 @@
-<script lang="ts">
-	import { apiRequest } from "$api";
-	import ApiError, { type RawApiError } from "$api/error";
-	import type { Member } from "$api/models";
-	import { mergePreferences } from "$api/models/user";
-	import FieldEditor from "$components/editor/FieldEditor.svelte";
-	import FormStatusMarker from "$components/editor/FormStatusMarker.svelte";
-	import PronounsEditor from "$components/editor/PronounsEditor.svelte";
-	import { t } from "$lib/i18n";
-	import log from "$lib/log";
-	import type { PageData } from "./$types";
-
-	type Props = { data: PageData };
-	let { data }: Props = $props();
-
-	let names = $state(data.member.names);
-	let pronouns = $state(data.member.pronouns);
-
-	let ok: { ok: boolean; error: RawApiError | null } | null = $state(null);
-
-	let allPreferences = $derived(mergePreferences(data.user.custom_preferences));
-
-	const update = async () => {
-		try {
-			const resp = await apiRequest<Member>("PATCH", `/users/@me/members/${data.member.id}`, {
-				body: { names, pronouns },
-				token: data.token,
-			});
-			names = resp.names;
-			pronouns = resp.pronouns;
-			ok = { ok: true, error: null };
-		} catch (e) {
-			ok = { ok: false, error: null };
-			log.error("Could not update names/pronouns:", e);
-			if (e instanceof ApiError) ok.error = e.obj;
-		}
-	};
-</script>
-
-<FormStatusMarker form={ok} />
-
-<div>
-	<FieldEditor name={$t("profile.names-header")} bind:entries={names} {allPreferences} />
-</div>
-
-<div>
-	<PronounsEditor bind:entries={pronouns} {allPreferences} />
-</div>
-
-<div>
-	<button class="btn btn-primary" onclick={() => update()}>{$t("save-changes")}</button>
-</div>

Foxnouns.Frontend/src/routes/settings/profile/+layout@.svelte

@@ -2,10 +2,9 @@
 	import type { Snippet } from "svelte";
 	import { page } from "$app/stores";
 	import { t } from "$lib/i18n";
-	import type { LayoutData } from "./$types";
 
-	type Props = { data: LayoutData; children: Snippet };
+	type Props = { children: Snippet };
-	let { data, children }: Props = $props();
+	let { children }: Props = $props();
 
 	const isActive = (path: string) => $page.url.pathname === path;
 </script>
@@ -54,9 +53,6 @@
 				>
 					{$t("edit-profile.flags-links-tab")}
 				</a>
-				<a href="/@{data.user.username}" class="list-group-item list-group-item-action text-danger">
-					{$t("edit-profile.back-to-profile-tab")}
-				</a>
 				<a href="/settings" class="list-group-item list-group-item-action text-danger">
 					{$t("edit-profile.back-to-settings-tab")}
 				</a>

Foxnouns.Frontend/src/routes/settings/profile/names-pronouns/+page.svelte

@@ -1,51 +0,0 @@
-<script lang="ts">
-	import { apiRequest } from "$api";
-	import ApiError, { type RawApiError } from "$api/error";
-	import { mergePreferences, type User } from "$api/models/user";
-	import FieldEditor from "$components/editor/FieldEditor.svelte";
-	import FormStatusMarker from "$components/editor/FormStatusMarker.svelte";
-	import PronounsEditor from "$components/editor/PronounsEditor.svelte";
-	import { t } from "$lib/i18n";
-	import log from "$lib/log";
-	import type { PageData } from "./$types";
-
-	type Props = { data: PageData };
-	let { data }: Props = $props();
-
-	let names = $state(data.user.names);
-	let pronouns = $state(data.user.pronouns);
-
-	let ok: { ok: boolean; error: RawApiError | null } | null = $state(null);
-
-	let allPreferences = $derived(mergePreferences(data.user.custom_preferences));
-
-	const update = async () => {
-		try {
-			const resp = await apiRequest<User>("PATCH", "/users/@me", {
-				body: { names, pronouns },
-				token: data.token,
-			});
-			names = resp.names;
-			pronouns = resp.pronouns;
-			ok = { ok: true, error: null };
-		} catch (e) {
-			ok = { ok: false, error: null };
-			log.error("Could not update names/pronouns:", e);
-			if (e instanceof ApiError) ok.error = e.obj;
-		}
-	};
-</script>
-
-<FormStatusMarker form={ok} />
-
-<div>
-	<FieldEditor name={$t("profile.names-header")} bind:entries={names} {allPreferences} />
-</div>
-
-<div>
-	<PronounsEditor bind:entries={pronouns} {allPreferences} />
-</div>
-
-<div>
-	<button class="btn btn-primary" onclick={() => update()}>{$t("save-changes")}</button>
-</div>