Foxnouns.Backend/Controllers/MembersController.cs

@@ -303,8 +303,8 @@ public class MembersController(
                     .SetProperty(u => u.LastActive, clock.GetCurrentInstant())
             );
 
-        // Fetch the new sid then pass that to RenderMember
+        // Re-fetch member to fetch the new sid
-        var newSid = await db.Members.Where(m => m.Id == member.Id).Select(m => m.Sid).FirstAsync();
+        var updatedMember = await db.ResolveMemberAsync(CurrentUser!.Id, memberRef);
-        return Ok(memberRenderer.RenderMember(member, CurrentToken, newSid));
+        return Ok(memberRenderer.RenderMember(updatedMember, CurrentToken));
     }
 }

Foxnouns.Backend/Controllers/UsersController.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics.CodeAnalysis;
-using Coravel.Mailer.Mail.Helpers;
 using Coravel.Queuing.Interfaces;
 using EntityFramework.Exceptions.Common;
 using Foxnouns.Backend.Database;
@@ -117,42 +116,6 @@ public class UsersController(
         if (req.HasProperty(nameof(req.Avatar)))
             errors.Add(("avatar", ValidationUtils.ValidateAvatar(req.Avatar)));
 
-        if (req.HasProperty(nameof(req.MemberTitle)))
-        {
-            if (string.IsNullOrEmpty(req.MemberTitle))
-            {
-                user.MemberTitle = null;
-            }
-            else
-            {
-                errors.Add(("member_title", ValidationUtils.ValidateDisplayName(req.MemberTitle)));
-                user.MemberTitle = req.MemberTitle;
-            }
-        }
-
-        if (req.HasProperty(nameof(req.MemberListHidden)))
-            user.ListHidden = req.MemberListHidden == true;
-
-        if (req.HasProperty(nameof(req.Timezone)))
-        {
-            if (string.IsNullOrEmpty(req.Timezone))
-            {
-                user.Timezone = null;
-            }
-            else
-            {
-                if (TimeZoneInfo.TryFindSystemTimeZoneById(req.Timezone, out _))
-                    user.Timezone = req.Timezone;
-                else
-                    errors.Add(
-                        (
-                            "timezone",
-                            ValidationError.GenericValidationError("Invalid timezone", req.Timezone)
-                        )
-                    );
-            }
-        }
-
         ValidationUtils.Validate(errors);
         // This is fired off regardless of whether the transaction is committed
         // (atomic operations are hard when combined with background jobs)
@@ -290,9 +253,6 @@ public class UsersController(
         public Pronoun[]? Pronouns { get; init; }
         public Field[]? Fields { get; init; }
         public Snowflake[]? Flags { get; init; }
-        public string? MemberTitle { get; init; }
-        public bool? MemberListHidden { get; init; }
-        public string? Timezone { get; init; }
     }
 
     [HttpGet("@me/settings")]
@@ -346,20 +306,13 @@ public class UsersController(
                     .SetProperty(u => u.LastActive, clock.GetCurrentInstant())
             );
 
-        // Get the user's new sid
-        var newSid = await db
-            .Users.Where(u => u.Id == CurrentUser.Id)
-            .Select(u => u.Sid)
-            .FirstAsync();
-
         var user = await db.ResolveUserAsync(CurrentUser.Id);
         return Ok(
             await userRenderer.RenderUserAsync(
-                CurrentUser,
+                user,
                 CurrentUser,
                 CurrentToken,
-                renderMembers: false,
+                renderMembers: false
-                overrideSid: newSid
             )
         );
     }

Foxnouns.Backend/Database/Migrations/20241124201309_AddUserTimezone.cs

@@ -1,30 +0,0 @@
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Foxnouns.Backend.Database.Migrations
-{
-    /// <inheritdoc />
-    [DbContext(typeof(DatabaseContext))]
-    [Migration("20241124201309_AddUserTimezone")]
-    public partial class AddUserTimezone : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "timezone",
-                table: "users",
-                type: "text",
-                nullable: true
-            );
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(name: "timezone", table: "users");
-        }
-    }
-}

Foxnouns.Backend/Database/Migrations/DatabaseContextModelSnapshot.cs

@@ -434,10 +434,6 @@ namespace Foxnouns.Backend.Database.Migrations
                         .HasColumnName("sid")
                         .HasDefaultValueSql("find_free_user_sid()");
 
-                    b.Property<string>("Timezone")
-                        .HasColumnType("text")
-                        .HasColumnName("timezone");
-
                     b.Property<string>("Username")
                         .IsRequired()
                         .HasColumnType("text")

Foxnouns.Backend/Database/Models/User.cs

@@ -15,7 +15,6 @@ public class User : BaseModel
     public string? Avatar { get; set; }
     public string[] Links { get; set; } = [];
     public bool ListHidden { get; set; }
-    public string? Timezone { get; set; }
 
     public List<FieldEntry> Names { get; set; } = [];
     public List<Pronoun> Pronouns { get; set; } = [];

Foxnouns.Backend/Properties/launchSettings.json

@@ -4,7 +4,6 @@
     "Development": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-      "hotReloadEnabled": false,
       "launchBrowser": false,
       "externalUrlConfiguration": true,
       "environmentVariables": {
@@ -14,7 +13,6 @@
     "Production": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-      "hotReloadEnabled": false,
       "launchBrowser": false,
       "externalUrlConfiguration": true,
       "environmentVariables": {

Foxnouns.Backend/Services/MemberRendererService.cs

@@ -24,17 +24,13 @@ public class MemberRendererService(DatabaseContext db, Config config)
         return members.Select(m => RenderPartialMember(m, renderUnlisted));
     }
 
-    public MemberResponse RenderMember(
+    public MemberResponse RenderMember(Member member, Token? token = null)
-        Member member,
-        Token? token = null,
-        string? overrideSid = null
-    )
     {
         var renderUnlisted = token?.UserId == member.UserId && token.HasScope("user.read_hidden");
 
         return new MemberResponse(
             member.Id,
-            overrideSid ?? member.Sid,
+            member.Sid,
             member.Name,
             member.DisplayName ?? member.Name,
             member.Bio,

Foxnouns.Backend/Services/UserRendererService.cs

@@ -4,7 +4,6 @@ using Foxnouns.Backend.Utils;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 using NodaTime;
-using Org.BouncyCastle.Ocsp;
 
 namespace Foxnouns.Backend.Services;
 
@@ -20,7 +19,6 @@ public class UserRendererService(
         Token? token = null,
         bool renderMembers = true,
         bool renderAuthMethods = false,
-        string? overrideSid = null,
         CancellationToken ct = default
     )
     {
@@ -51,16 +49,9 @@ public class UserRendererService(
                 .ToListAsync(ct)
             : [];
 
-        int? utcOffset = null;
-        if (
-            user.Timezone != null
-            && TimeZoneInfo.TryFindSystemTimeZoneById(user.Timezone, out var tz)
-        )
-            utcOffset = (int)tz.GetUtcOffset(DateTimeOffset.UtcNow).TotalSeconds;
-
         return new UserResponse(
             user.Id,
-            overrideSid ?? user.Sid,
+            user.Sid,
             user.Username,
             user.DisplayName,
             user.Bio,
@@ -72,7 +63,6 @@ public class UserRendererService(
             user.Fields,
             user.CustomPreferences,
             flags.Select(f => RenderPrideFlag(f.PrideFlag)),
-            utcOffset,
             user.Role,
             renderMembers
                 ? members.Select(m => memberRenderer.RenderPartialMember(m, tokenHidden))
@@ -80,8 +70,7 @@ public class UserRendererService(
             renderAuthMethods ? authMethods.Select(RenderAuthMethod) : null,
             tokenHidden ? user.ListHidden : null,
             tokenHidden ? user.LastActive : null,
-            tokenHidden ? user.LastSidReroll : null,
+            tokenHidden ? user.LastSidReroll : null
-            tokenHidden ? user.Timezone ?? "<none>" : null
         );
     }
 
@@ -126,7 +115,6 @@ public class UserRendererService(
         IEnumerable<Field> Fields,
         Dictionary<Snowflake, User.CustomPreference> CustomPreferences,
         IEnumerable<PrideFlagResponse> Flags,
-        int? UtcOffset,
         [property: JsonConverter(typeof(ScreamingSnakeCaseEnumConverter))] UserRole Role,
         [property: JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             IEnumerable<MemberRendererService.PartialMember>? Members,
@@ -136,8 +124,7 @@ public class UserRendererService(
             bool? MemberListHidden,
         [property: JsonProperty(NullValueHandling = NullValueHandling.Ignore)] Instant? LastActive,
         [property: JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            Instant? LastSidReroll,
+            Instant? LastSidReroll
-        [property: JsonProperty(NullValueHandling = NullValueHandling.Ignore)] string? Timezone
     );
 
     public record AuthMethodResponse(

Foxnouns.Frontend/.env.example

@@ -1,7 +1,5 @@
 # Example .env file--DO NOT EDIT
 PUBLIC_LANGUAGE=en
-PUBLIC_BASE_URL=https://pronouns.cc
-PUBLIC_SHORT_URL=https://prns.cc
 PUBLIC_API_BASE=https://pronouns.cc/api
 PRIVATE_API_HOST=http://localhost:5003/api
 PRIVATE_INTERNAL_API_HOST=http://localhost:5000/api

Foxnouns.Frontend/package.json

@@ -38,11 +38,9 @@
 	"packageManager": "pnpm@9.12.3+sha512.cce0f9de9c5a7c95bef944169cc5dfe8741abfb145078c0d508b868056848a87c81e626246cb60967cbd7fd29a6c062ef73ff840d96b3c86c40ac92cf4a813ee",
 	"dependencies": {
 		"@fontsource/firago": "^5.1.0",
-		"base64-arraybuffer": "^1.0.2",
 		"bootstrap-icons": "^1.11.3",
 		"luxon": "^3.5.0",
 		"markdown-it": "^14.1.0",
-		"pretty-bytes": "^6.1.1",
 		"sanitize-html": "^2.13.1",
 		"tslog": "^4.9.3"
 	}

Foxnouns.Frontend/pnpm-lock.yaml

@@ -11,9 +11,6 @@ importers:
       '@fontsource/firago':
         specifier: ^5.1.0
         version: 5.1.0
-      base64-arraybuffer:
-        specifier: ^1.0.2
-        version: 1.0.2
       bootstrap-icons:
         specifier: ^1.11.3
         version: 1.11.3
@@ -23,9 +20,6 @@ importers:
       markdown-it:
         specifier: ^14.1.0
         version: 14.1.0
-      pretty-bytes:
-        specifier: ^6.1.1
-        version: 6.1.1
       sanitize-html:
         specifier: ^2.13.1
         version: 2.13.1
@@ -710,10 +704,6 @@ packages:
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
-  base64-arraybuffer@1.0.2:
-    resolution: {integrity: sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==}
-    engines: {node: '>= 0.6.0'}
-
   bootstrap-icons@1.11.3:
     resolution: {integrity: sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww==}
 
@@ -1221,10 +1211,6 @@ packages:
     engines: {node: '>=14'}
     hasBin: true
 
-  pretty-bytes@6.1.1:
-    resolution: {integrity: sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==}
-    engines: {node: ^14.13.1 || >=16.0.0}
-
   punycode.js@2.3.1:
     resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==}
     engines: {node: '>=6'}
@@ -1952,8 +1938,6 @@ snapshots:
 
   balanced-match@1.0.2: {}
 
-  base64-arraybuffer@1.0.2: {}
-
   bootstrap-icons@1.11.3: {}
 
   bootstrap@5.3.3(@popperjs/core@2.11.8):
@@ -2448,8 +2432,6 @@ snapshots:
 
   prettier@3.3.3: {}
 
-  pretty-bytes@6.1.1: {}
-
   punycode.js@2.3.1: {}
 
   punycode@2.3.1: {}

Foxnouns.Frontend/src/lib/api/models/user.ts

@@ -1,6 +1,5 @@
 export type PartialUser = {
 	id: string;
-	sid: string;
 	username: string;
 	display_name: string | null;
 	avatar_url: string | null;
@@ -15,20 +14,17 @@ export type User = PartialUser & {
 	pronouns: Pronoun[];
 	fields: Field[];
 	flags: PrideFlag[];
-	utc_offset: number | null;
 	role: "USER" | "MODERATOR" | "ADMIN";
 };
 
 export type MeUser = UserWithMembers & {
-	members: PartialMember[];
 	auth_methods: AuthMethod[];
 	member_list_hidden: boolean;
 	last_active: string;
 	last_sid_reroll: string;
-	timezone: string;
 };
 
-export type UserWithMembers = User & { members: PartialMember[] | null };
+export type UserWithMembers = User & { members: PartialMember[] };
 
 export type UserWithHiddenFields = User & {
 	auth_methods?: unknown[];
@@ -42,7 +38,6 @@ export type UserSettings = {
 
 export type PartialMember = {
 	id: string;
-	sid: string;
 	name: string;
 	display_name: string;
 	bio: string | null;

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

@@ -1,23 +1,14 @@
 <script lang="ts">
 	import { DEFAULT_AVATAR } from "$lib";
 
-	type Props = { url: string | null; alt: string; lazyLoad?: boolean; size?: number };
+	type Props = { url: string | null; alt: string; lazyLoad?: boolean; width?: number };
-	let { url, alt, lazyLoad, size }: Props = $props();
+	let { url, alt, lazyLoad, width }: Props = $props();
-
-	let width = $derived(size || 200);
 </script>
 
 <img
 	class="rounded-circle img-fluid"
-	style="height: {width}px; width: {width}px"
 	src={url || DEFAULT_AVATAR}
 	{alt}
-	{width}
+	width={width || 200}
 	loading={lazyLoad ? "lazy" : "eager"}
 />
-
-<style>
-	img {
-		object-fit: cover;
-	}
-</style>

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

@@ -1,35 +0,0 @@
-<script lang="ts">
-	import { Pagination, PaginationItem, PaginationLink } from "@sveltestrap/sveltestrap";
-
-	type Props = { currentPage: number; pageCount: number; href: string; center?: boolean };
-	let { currentPage, pageCount, href, center }: Props = $props();
-
-	let prevPage = $derived(currentPage > 0 ? currentPage - 1 : 0);
-	let prevLink = $derived(prevPage !== 0 ? `${href}?page=${prevPage}` : href);
-
-	let nextPage = $derived(currentPage < pageCount - 1 ? currentPage + 1 : pageCount - 1);
-</script>
-
-{#if pageCount > 1}
-	<div>
-		<Pagination listClassName={center ? "justify-content-center" : undefined}>
-			<PaginationItem>
-				<PaginationLink first {href} />
-			</PaginationItem>
-			<PaginationItem>
-				<PaginationLink previous href={prevLink} />
-			</PaginationItem>
-			{#each new Array(pageCount) as _, page}
-				<PaginationItem active={page === currentPage}>
-					<PaginationLink href="{href}?page={page}">{page + 1}</PaginationLink>
-				</PaginationItem>
-			{/each}
-			<PaginationItem>
-				<PaginationLink next href="{href}?page={nextPage}" />
-			</PaginationItem>
-			<PaginationItem>
-				<PaginationLink last href="{href}?page={pageCount - 1}" />
-			</PaginationItem>
-		</Pagination>
-	</div>
-{/if}

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

@@ -1,80 +0,0 @@
-<script lang="ts">
-	import Avatar from "$components/Avatar.svelte";
-	import { t } from "$lib/i18n";
-	import { Icon, InputGroup } from "@sveltestrap/sveltestrap";
-	import { encode } from "base64-arraybuffer";
-	import prettyBytes from "pretty-bytes";
-	import ShortNoscriptWarning from "./ShortNoscriptWarning.svelte";
-
-	type Props = {
-		current: string | null;
-		alt: string;
-		update: (avatar: string) => Promise<void>;
-		updated: boolean;
-	};
-	let { current, alt, update: onclick, updated }: Props = $props();
-
-	const MAX_AVATAR_BYTES = 1_000_000;
-
-	let avatarFiles: FileList | null = $state(null);
-	let avatar: string = $state("");
-	let avatarExists = $derived(avatar !== "");
-	let avatarTooLarge = $derived(avatar !== "" && avatar.length > MAX_AVATAR_BYTES);
-
-	$effect(() => {
-		getAvatar(avatarFiles);
-	});
-
-	const getAvatar = async (list: FileList | null) => {
-		if (!list || list.length === 0) {
-			avatar = "";
-			return;
-		}
-
-		const buffer = await list[0].arrayBuffer();
-		const base64 = encode(buffer);
-
-		const uri = `data:${list[0].type};base64,${base64}`;
-		avatar = uri;
-	};
-</script>
-
-<p class="text-center">
-	<Avatar url={avatarExists ? avatar : current} {alt} />
-</p>
-
-<InputGroup class="mb-2">
-	<input
-		class="form-control"
-		id="avatar"
-		type="file"
-		bind:files={avatarFiles}
-		accept="image/png, image/jpeg, image/gif, image/webp"
-	/>
-	<button
-		class="btn btn-secondary"
-		disabled={!avatarExists || avatarTooLarge}
-		onclick={() => onclick(avatar)}
-	>
-		{$t("edit-profile.update-avatar")}
-	</button>
-</InputGroup>
-
-<ShortNoscriptWarning />
-
-{#if updated}
-	<p class="text-success-emphasis">
-		<Icon name="check-circle-fill" />
-		{$t("edit-profile.avatar-updated")}
-	</p>
-{/if}
-
-{#if avatarTooLarge}
-	<p class="text-danger-emphasis">
-		<Icon name="exclamation-circle-fill" />
-		{$t("edit-profile.file-too-large", {
-			max: prettyBytes(MAX_AVATAR_BYTES),
-			current: prettyBytes(avatar.length),
-		})}
-	</p>
-{/if}

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

@@ -1,26 +0,0 @@
-<script lang="ts">
-	import { t } from "$lib/i18n";
-	import { renderMarkdown } from "$lib/markdown";
-
-	type Props = { value: string; maxLength: number };
-	let { value = $bindable(), maxLength }: Props = $props();
-</script>
-
-<textarea name="bio" class="form-control" style="height: 200px;" bind:value></textarea>
-<button disabled={value.length > maxLength} type="submit" class="btn btn-primary mt-2 my-1">
-	{$t("save-changes")}
-</button>
-
-<p class="text-muted mt-1">
-	{$t("edit-profile.bio-length-hint", {
-		length: value.length,
-		maxLength,
-	})}
-</p>
-
-{#if value !== ""}
-	<div class="card">
-		<div class="card-header">{$t("edit-profile.preview")}</div>
-		<div class="card-body">{@html renderMarkdown(value)}</div>
-	</div>
-{/if}

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

@@ -1,18 +0,0 @@
-<script lang="ts">
-	import { Icon } from "@sveltestrap/sveltestrap";
-	import { t } from "$lib/i18n";
-	import type { RawApiError } from "$api/error";
-	import ErrorAlert from "$components/ErrorAlert.svelte";
-
-	type Props = { form: { error: RawApiError | null; ok: boolean } | null };
-	let { form }: Props = $props();
-</script>
-
-{#if form?.error}
-	<ErrorAlert error={form.error} />
-{:else if form?.ok}
-	<p class="text-success-emphasis">
-		<Icon name="check-circle-fill" />
-		{$t("edit-profile.saved-changes")}
-	</p>
-{/if}

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

@@ -1,12 +0,0 @@
-<script lang="ts">
-	import { t } from "$lib/i18n";
-</script>
-
-<noscript>
-	<div class="alert alert-secondary">
-		<h4>{$t("error.noscript-title")}</h4>
-		<p>
-			{$t("error.noscript-info")}
-		</p>
-	</div>
-</noscript>

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

@@ -1,11 +0,0 @@
-<script lang="ts">
-	import { t } from "$lib/i18n";
-	import { Icon } from "@sveltestrap/sveltestrap";
-</script>
-
-<noscript>
-	<p class="text-danger-emphasis">
-		<Icon name="exclamation-circle-fill" aria-hidden />
-		{$t("error.noscript-short")}
-	</p>
-</noscript>

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

@@ -1,30 +0,0 @@
-<script lang="ts">
-	import { PUBLIC_SHORT_URL } from "$env/static/public";
-	import { t } from "$lib/i18n";
-	import { ButtonGroup, Button, Icon } from "@sveltestrap/sveltestrap";
-	import ShortNoscriptWarning from "./ShortNoscriptWarning.svelte";
-
-	type Props = { sid: string; rerollSid: () => Promise<void>; canRerollSid: boolean };
-	let { sid, rerollSid, canRerollSid }: Props = $props();
-
-	const copySid = async () => {
-		const url = `${PUBLIC_SHORT_URL}/${sid}`;
-		await navigator.clipboard.writeText(url);
-	};
-</script>
-
-{$t("edit-profile.sid-current")} <code>{sid}</code>
-<ButtonGroup class="mb-1">
-	<Button color="secondary" onclick={() => rerollSid()} disabled={!canRerollSid}>
-		{$t("edit-profile.sid-reroll")}
-	</Button>
-	<Button color="secondary" onclick={() => copySid()}>
-		<Icon name="link-45deg" aria-hidden />
-		<span class="visually-hidden">{$t("edit-profile.sid-copy")}</span>
-	</Button>
-</ButtonGroup>
-<ShortNoscriptWarning />
-<p class="text-muted">
-	<Icon name="info-circle-fill" aria-hidden />
-	{$t("edit-profile.sid-hint")}
-</p>

Foxnouns.Frontend/src/lib/components/profile/user/MemberCard.svelte

@@ -35,15 +35,11 @@
 
 <div>
 	<a href="/@{username}/{member.name}">
-		<Avatar
+		<Avatar url={member.avatar_url} lazyLoad alt={$t("avatar-tooltip", { name: member.name })} />
-			url={member.avatar_url}
-			lazyLoad
-			alt={$t("avatar-tooltip", { name: member.display_name })}
-		/>
 	</a>
 	<p class="m-2">
 		<a class="text-reset fs-5 text-break" href="/@{username}/{member.name}">
-			{member.display_name}
+			{member.name}
 		</a>
 		{#if pronouns}
 			<br />

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

@@ -1,136 +1,91 @@
 {
-  "hello": "Hello, {{name}}!",
+	"hello": "Hello, {{name}}!",
-  "nav": {
+	"nav": {
-    "log-in": "Log in or sign up",
+		"log-in": "Log in or sign up",
-    "settings": "Settings"
+		"settings": "Settings"
-  },
+	},
-  "avatar-tooltip": "Avatar for {{name}}",
+	"avatar-tooltip": "Avatar for {{name}}",
-  "profile": {
+	"profile": {
-    "edit-member-profile-notice": "You are currently viewing the public profile of {{memberName}}.",
+		"edit-member-profile-notice": "You are currently viewing the public profile of {memberName}.",
-    "edit-user-profile-notice": "You are currently viewing your public profile.",
+		"edit-user-profile-notice": "You are currently viewing your public profile.",
-    "edit-profile-link": "Edit profile",
+		"edit-profile-link": "Edit profile",
-    "names-header": "Names",
+		"names-header": "Names",
-    "pronouns-header": "Pronouns",
+		"pronouns-header": "Pronouns",
-    "default-members-header": "Members",
+		"default-members-header": "Members",
-    "create-member-button": "Create member",
+		"create-member-button": "Create member"
-    "back-to-user": "Back to {{name}}"
+	},
-  },
+	"title": {
-  "title": {
+		"log-in": "Log in",
-    "log-in": "Log in",
+		"welcome": "Welcome",
-    "welcome": "Welcome",
+		"settings": "Settings"
-    "settings": "Settings"
+	},
-  },
+	"auth": {
-  "auth": {
+		"log-in-form-title": "Log in with email",
-    "log-in-form-title": "Log in with email",
+		"log-in-form-email-label": "Email address",
-    "log-in-form-email-label": "Email address",
+		"log-in-form-password-label": "Password",
-    "log-in-form-password-label": "Password",
+		"register-with-email-button": "Register with email",
-    "register-with-email-button": "Register with email",
+		"log-in-button": "Log in",
-    "log-in-button": "Log in",
+		"log-in-3rd-party-header": "Log in with another service",
-    "log-in-3rd-party-header": "Log in with another service",
+		"log-in-3rd-party-desc": "If you prefer, you can also log in with one of these services:",
-    "log-in-3rd-party-desc": "If you prefer, you can also log in with one of these services:",
+		"log-in-with-discord": "Log in with Discord",
-    "log-in-with-discord": "Log in with Discord",
+		"log-in-with-google": "Log in with Google",
-    "log-in-with-google": "Log in with Google",
+		"log-in-with-tumblr": "Log in with Tumblr",
-    "log-in-with-tumblr": "Log in with Tumblr",
+		"log-in-with-the-fediverse": "Log in with the Fediverse",
-    "log-in-with-the-fediverse": "Log in with the Fediverse",
+		"remote-fediverse-account-label": "Your Fediverse account",
-    "remote-fediverse-account-label": "Your Fediverse account",
+		"register-username-label": "Username",
-    "register-username-label": "Username",
+		"register-button": "Register account",
-    "register-button": "Register account",
+		"register-with-mastodon": "Register with a Fediverse account",
-    "register-with-mastodon": "Register with a Fediverse account",
+		"log-in-with-fediverse-error-blurb": "Is your instance returning an error?",
-    "log-in-with-fediverse-error-blurb": "Is your instance returning an error?",
+		"log-in-with-fediverse-force-refresh-button": "Force a refresh on our end"
-    "log-in-with-fediverse-force-refresh-button": "Force a refresh on our end"
+	},
-  },
+	"error": {
-  "error": {
+		"bad-request-header": "Something was wrong with your input",
-    "bad-request-header": "Something was wrong with your input",
+		"generic-header": "Something went wrong",
-    "generic-header": "Something went wrong",
+		"raw-header": "Raw error",
-    "raw-header": "Raw error",
+		"authentication-error": "Something went wrong when logging you in.",
-    "authentication-error": "Something went wrong when logging you in.",
+		"bad-request": "Your input was rejected by the server, please check for any mistakes and try again.",
-    "bad-request": "Your input was rejected by the server, please check for any mistakes and try again.",
+		"forbidden": "You are not allowed to perform that action.",
-    "forbidden": "You are not allowed to perform that action.",
+		"internal-server-error": "Server experienced an internal error, please try again later.",
-    "internal-server-error": "Server experienced an internal error, please try again later.",
+		"authentication-required": "You need to log in first.",
-    "authentication-required": "You need to log in first.",
+		"missing-scopes": "The current token is missing a required scope. Did you manually edit your cookies?",
-    "missing-scopes": "The current token is missing a required scope. Did you manually edit your cookies?",
+		"generic-error": "An unknown error occurred.",
-    "generic-error": "An unknown error occurred.",
+		"user-not-found": "User not found, please check your spelling and try again. Remember that usernames are case sensitive.",
-    "user-not-found": "User not found, please check your spelling and try again. Remember that usernames are case sensitive.",
+		"member-not-found": "Member not found, please check your spelling and try again.",
-    "member-not-found": "Member not found, please check your spelling and try again.",
+		"account-already-linked": "This account is already linked with a pronouns.cc account.",
-    "account-already-linked": "This account is already linked with a pronouns.cc account.",
+		"last-auth-method": "You cannot remove your last authentication method.",
-    "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-max-length-error": "Value is too long, maximum length is {{max}}, current length is {{actual}}.",
+		"validation-min-length-error": "Value is too long, 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-1": "The following value is not allowed here",
+		"validation-disallowed-value-2": "Allowed values are",
-    "validation-disallowed-value-2": "Allowed values are",
+		"validation-reason": "Reason",
-    "validation-reason": "Reason",
+		"validation-generic": "The value you entered is not allowed here. Reason",
-    "validation-generic": "The value you entered is not allowed here. Reason",
+		"extra-info-header": "Extra error information"
-    "extra-info-header": "Extra error information",
+	},
-    "noscript-title": "This page requires JavaScript",
+	"settings": {
-    "noscript-info": "This page requires JavaScript to function correctly. Some buttons may not work, or the page may not work at all.",
+		"general-information-tab": "General information",
-    "noscript-short": "Requires JavaScript"
+		"your-profile-tab": "Your profile",
-  },
+		"members-tab": "Members",
-  "settings": {
+		"authentication-tab": "Authentication",
-    "general-information-tab": "General information",
+		"export-tab": "Export your data",
-    "your-profile-tab": "Your profile",
+		"change-username-button": "Change username",
-    "members-tab": "Members",
+		"username-change-hint": "Changing your username will make any existing links to your or your members' profiles invalid.\nYour username must be unique, be at most 40 characters long, and only contain letters from the basic English alphabet, dashes, underscores, and periods. Your username is used as part of your profile link, you can set a separate display name.",
-    "authentication-tab": "Authentication",
+		"username-update-error": "Could not update your username as the new username is invalid:\n{{message}}",
-    "export-tab": "Export your data",
+		"change-avatar-link": "Change your avatar here",
-    "change-username-button": "Change username",
+		"new-username": "New username",
-    "username-change-hint": "Changing your username will make any existing links to your or your members' profiles invalid.\nYour username must be unique, be at most 40 characters long, and only contain letters from the basic English alphabet, dashes, underscores, and periods. Your username is used as part of your profile link, you can set a separate display name.",
+		"table-role": "Role",
-    "username-update-error": "Could not update your username as the new username is invalid:\n{{message}}",
+		"table-custom-preferences": "Custom preferences",
-    "change-avatar-link": "Change your avatar here",
+		"table-member-list-hidden": "Member list hidden?",
-    "new-username": "New username",
+		"table-member-count": "Member count",
-    "table-role": "Role",
+		"table-created-at": "Account created at",
-    "table-custom-preferences": "Custom preferences",
+		"table-id": "Your ID",
-    "table-member-list-hidden": "Member list hidden?",
+		"table-title": "Account information",
-    "table-member-count": "Member count",
+		"force-log-out-title": "Log out everywhere",
-    "table-created-at": "Account created at",
+		"force-log-out-button": "Force log out",
-    "table-id": "Your ID",
+		"force-log-out-hint": "If you think one of your tokens might have been compromised, you can log out on all devices by clicking this button.",
-    "table-title": "Account information",
+		"log-out-title": "Log out",
-    "force-log-out-title": "Log out everywhere",
+		"log-out-hint": "Use this button to log out on this device only.",
-    "force-log-out-button": "Force log out",
+		"log-out-button": "Log out"
-    "force-log-out-hint": "If you think one of your tokens might have been compromised, you can log out on all devices by clicking this button.",
+	},
-    "log-out-title": "Log out",
+	"yes": "Yes",
-    "log-out-hint": "Use this button to log out on this device only.",
+	"no": "No"
-    "log-out-button": "Log out",
-    "avatar": "Avatar",
-    "username-update-success": "Successfully changed your username!",
-    "create-member-title": "Create a new member",
-    "create-member-name-label": "Member name"
-  },
-  "yes": "Yes",
-  "no": "No",
-  "edit-profile": {
-    "user-header": "Editing your profile",
-    "general-tab": "General",
-    "names-pronouns-tab": "Names & pronouns",
-    "file-too-large": "This file is too large, please resize it (maximum is {{max}}, the file you're trying to upload is {{current}})",
-    "sid-current": "Current short ID:",
-    "sid": "Short ID",
-    "sid-reroll": "Reroll short ID",
-    "sid-hint": "This ID is used in prns.cc links. You can reroll one short ID every hour (shared between your main profile and all members) by pressing the button above.",
-    "sid-copy": "Copy short link",
-    "update-avatar": "Update avatar",
-    "avatar-updated": "Avatar updated! It might take a moment to be reflected on your profile.",
-    "member-header-label": "\"Members\" header text",
-    "member-header-info": "This is the text used for the \"Members\" heading. If you leave it blank, the default text will be used.",
-    "hide-member-list-label": "Hide member list",
-    "timezone-label": "Timezone",
-    "timezone-preview": "This will show up on your profile like this:",
-    "timezone-info": "This is optional. Your timezone is never shared directly, only the difference between UTC and your current timezone is.",
-    "hide-member-list-info": "This only hides your member list. Individual members will still be visible to anyone with a direct link to their pages.",
-    "profile-options-header": "Profile options",
-    "bio-tab": "Bio",
-    "saved-changes": "Successfully saved changes!",
-    "bio-length-hint": "Using {{length}}/{{maxLength}} characters",
-    "preview": "Preview",
-    "fields-tab": "Fields",
-    "flags-links-tab": "Flags & links",
-    "back-to-settings-tab": "Back to settings",
-    "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"
-  },
-  "save-changes": "Save changes",
-  "change": "Change"
 }

Foxnouns.Frontend/src/routes/+layout.server.ts

@@ -6,12 +6,10 @@ import log from "$lib/log";
 import type { LayoutServerLoad } from "./$types";
 
 export const load = (async ({ fetch, cookies }) => {
-	let token: string | null = null;
 	let meUser: MeUser | null = null;
 	if (cookies.get(TOKEN_COOKIE_NAME)) {
 		try {
 			meUser = await apiRequest<MeUser>("GET", "/users/@me", { fetch, cookies });
-			token = cookies.get(TOKEN_COOKIE_NAME) || null;
 		} catch (e) {
 			if (e instanceof ApiError && e.code === ErrorCode.AuthenticationRequired) clearToken(cookies);
 			else log.error("Could not fetch /users/@me and token has not expired:", e);
@@ -19,5 +17,5 @@ export const load = (async ({ fetch, cookies }) => {
 	}
 
 	const meta = await apiRequest<Meta>("GET", "/meta", { fetch, cookies });
-	return { meta, meUser, token };
+	return { meta, meUser };
 }) satisfies LayoutServerLoad;

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

@@ -1,7 +1,5 @@
 import { apiRequest } from "$api";
-import type { PartialMember, UserWithMembers } from "$api/models";
+import type { UserWithMembers } from "$api/models";
-
-const MEMBERS_PER_PAGE = 20;
 
 export const load = async ({ params, fetch, cookies, url }) => {
 	const user = await apiRequest<UserWithMembers>("GET", `/users/${params.username}`, {
@@ -10,20 +8,12 @@ export const load = async ({ params, fetch, cookies, url }) => {
 	});
 
 	// Paginate members on the server side
-	let currentPage = 0;
+	let currentPage = Number(url.searchParams.get("page") || "0");
-	let pageCount = 0;
+	const pageCount = Math.ceil(user.members.length / 20);
-	let members: PartialMember[] = [];
+	let members = user.members.slice(currentPage * 20, (currentPage + 1) * 20);
-	if (user.members) {
+	if (members.length === 0) {
-		currentPage = Number(url.searchParams.get("page") || "0");
+		members = user.members.slice(0, 20);
-		pageCount = Math.ceil(user.members.length / MEMBERS_PER_PAGE);
+		currentPage = 0;
-		members = user.members.slice(
-			currentPage * MEMBERS_PER_PAGE,
-			(currentPage + 1) * MEMBERS_PER_PAGE,
-		);
-		if (members.length === 0) {
-			members = user.members.slice(0, MEMBERS_PER_PAGE);
-			currentPage = 0;
-		}
 	}
 
 	return { user, members, currentPage, pageCount };

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

@@ -6,7 +6,7 @@
 	import ProfileFields from "$components/profile/ProfileFields.svelte";
 	import { t } from "$lib/i18n";
 	import { Icon } from "@sveltestrap/sveltestrap";
-	import Paginator from "$components/Paginator.svelte";
+	import Paginator from "./Paginator.svelte";
 	import MemberCard from "$components/profile/user/MemberCard.svelte";
 
 	type Props = { data: PageData };
@@ -25,7 +25,7 @@
 		<OwnProfileNotice editLink="/settings/profile" />
 	{/if}
 
-	<ProfileHeader name="@{data.user.username}" profile={data.user}/>
+	<ProfileHeader name="@{data.user.username}" profile={data.user} lazyLoadAvatar={true} />
 	<ProfileFields profile={data.user} {allPreferences} />
 
 	{#if data.members.length > 0}
@@ -34,27 +34,27 @@
 			{data.user.member_title || $t("profile.default-members-header")}
 			{#if isMeUser}
 				<a class="btn btn-success" href="/settings/create-member">
-					<Icon name="person-plus-fill" aria-hidden />
+					<Icon name="person-plus-fill" aria-hidden={true} />
 					{$t("profile.create-member-button")}
 				</a>
 			{/if}
+			<Paginator
+				currentPage={data.currentPage}
+				pageCount={data.pageCount}
+				href="/@{data.user.username}"
+			/>
 		</h2>
-		<Paginator
-			center
-			currentPage={data.currentPage}
-			pageCount={data.pageCount}
-			href="/@{data.user.username}"
-		/>
 		<div class="row row-cols-2 row-cols-md-3 row-cols-lg-4 row-cols-xl-5 text-center">
 			{#each data.members as member (member.id)}
 				<MemberCard username={data.user.username} {member} {allPreferences} />
 			{/each}
 		</div>
-		<Paginator
+		<div class="text-center">
-			center
+			<Paginator
-			currentPage={data.currentPage}
+				currentPage={data.currentPage}
-			pageCount={data.pageCount}
+				pageCount={data.pageCount}
-			href="/@{data.user.username}"
+				href="/@{data.user.username}"
-		/>
+			/>
+		</div>
 	{/if}
 </div>

Foxnouns.Frontend/src/routes/@[username]/Paginator.svelte

@@ -0,0 +1,31 @@
+<script lang="ts">
+	import { Pagination, PaginationItem, PaginationLink } from "@sveltestrap/sveltestrap";
+
+	type Props = { currentPage: number; pageCount: number; href: string };
+	let { currentPage, pageCount, href }: Props = $props();
+
+	let prevPage = $derived(currentPage > 0 ? currentPage - 1 : 0);
+	let prevLink = $derived(prevPage !== 0 ? `${href}?page=${prevPage}` : href);
+
+	let nextPage = $derived(currentPage < pageCount - 1 ? currentPage + 1 : pageCount - 1);
+</script>
+
+{#if pageCount > 1}
+	<Pagination>
+		<PaginationItem>
+			<PaginationLink first {href} />
+		</PaginationItem>
+		<PaginationItem>
+			<PaginationLink previous href={prevLink} />
+		</PaginationItem>
+		<PaginationItem active>
+			<PaginationLink href="{href}?page={currentPage}">{currentPage + 1}</PaginationLink>
+		</PaginationItem>
+		<PaginationItem>
+			<PaginationLink next href="{href}?page={nextPage}" />
+		</PaginationItem>
+		<PaginationItem>
+			<PaginationLink last href="{href}?page={pageCount - 1}" />
+		</PaginationItem>
+	</Pagination>
+{/if}

Foxnouns.Frontend/src/routes/@[username]/[memberName]/+page.server.ts

@@ -1,15 +0,0 @@
-import { apiRequest } from "$api";
-import type { Member } from "$api/models/member";
-
-export const load = async ({ params, fetch, cookies }) => {
-	const member = await apiRequest<Member>(
-		"GET",
-		`/users/${params.username}/members/${params.memberName}`,
-		{
-			fetch,
-			cookies,
-		},
-	);
-
-	return { member };
-};

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

@@ -1,40 +0,0 @@
-<script lang="ts">
-	import type { PageData } from "./$types";
-	import ProfileHeader from "$components/profile/ProfileHeader.svelte";
-	import OwnProfileNotice from "$components/profile/OwnProfileNotice.svelte";
-	import { mergePreferences } from "$api/models";
-	import ProfileFields from "$components/profile/ProfileFields.svelte";
-	import { Icon } from "@sveltestrap/sveltestrap";
-	import { t } from "$lib/i18n";
-
-	type Props = { data: PageData };
-	let { data }: Props = $props();
-
-	let allPreferences = $derived(mergePreferences(data.member.user.custom_preferences));
-	let isMeUser = $derived(data.meUser && data.meUser.id === data.member.user.id);
-</script>
-
-<svelte:head>
-	<title>{data.member.display_name} • @{data.member.user.username} • pronouns.cc</title>
-</svelte:head>
-
-<div class="container">
-	{#if isMeUser}
-		<OwnProfileNotice
-			memberName={data.member.display_name}
-			editLink="/settings/members/{data.member.id}"
-		/>
-	{/if}
-
-	<div class="m-3">
-		<a class="btn btn-secondary" href="/@{data.member.user.username}">
-			<Icon name="arrow-left" aria-hidden />
-			{$t("profile.back-to-user", {
-				name: data.member.user.display_name ?? data.member.user.username,
-			})}
-		</a>
-	</div>
-
-	<ProfileHeader name="{data.member.name} (@{data.member.user.username})" profile={data.member} />
-	<ProfileFields profile={data.member} {allPreferences} />
-</div>

Foxnouns.Frontend/src/routes/settings/+layout.server.ts

@@ -4,5 +4,5 @@ export const load = async ({ parent }) => {
 	const data = await parent();
 	if (!data.meUser) redirect(303, "/auth/log-in");
 
-	return { user: data.meUser!, token: data.token! };
+	return { user: data.meUser! };
 };

Foxnouns.Frontend/src/routes/settings/+page.svelte

@@ -29,8 +29,7 @@
 			</FormGroup>
 			{#if form?.ok}
 				<p class="text-success-emphasis">
-					<Icon name="check-circle-fill" />
+					<Icon name="check-circle-fill" /> Successfully changed your username!
-					{$t("settings.username-update-success")}
 				</p>
 			{:else if usernameError}
 				<p class="text-danger-emphasis text-has-newline">
@@ -47,7 +46,7 @@
 		</p>
 	</div>
 	<div class="col-md-3 text-center">
-		<h5>{$t("settings.avatar")}</h5>
+		<h5>Avatar</h5>
 		<Avatar
 			url={data.user.avatar_url}
 			alt={$t("avatar-tooltip", { name: "@" + data.user.username })}

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

@@ -1,18 +0,0 @@
-const MEMBERS_PER_PAGE = 15;
-
-export const load = async ({ url, parent }) => {
-	const { user } = await parent();
-
-	let currentPage = Number(url.searchParams.get("page") || "0");
-	let pageCount = Math.ceil(user.members.length / MEMBERS_PER_PAGE);
-	let members = user.members.slice(
-		currentPage * MEMBERS_PER_PAGE,
-		(currentPage + 1) * MEMBERS_PER_PAGE,
-	);
-	if (members.length === 0) {
-		members = user.members.slice(0, MEMBERS_PER_PAGE);
-		currentPage = 0;
-	}
-
-	return { members, currentPage, pageCount };
-};

Foxnouns.Frontend/src/routes/settings/members/+page.svelte

@@ -1,48 +0,0 @@
-<script lang="ts">
-	import Paginator from "$components/Paginator.svelte";
-	import { Icon, ListGroup, ListGroupItem } from "@sveltestrap/sveltestrap";
-	import { t } from "$lib/i18n";
-	import type { PageData } from "./$types";
-	import Avatar from "$components/Avatar.svelte";
-
-	type Props = { data: PageData };
-	let { data }: Props = $props();
-
-	let canCreateMember = $derived(data.user.members.length < data.meta.limits.member_count);
-</script>
-
-<h3 class="mb-3">{$t("settings.members-tab")} ({data.user.members.length})</h3>
-
-<Paginator
-	center
-	currentPage={data.currentPage}
-	pageCount={data.pageCount}
-	href="/settings/members"
-/>
-
-<ListGroup class="mb-3">
-	{#if canCreateMember}
-		<ListGroupItem tag="a" href="/settings/members/new">
-			<Icon name="person-fill-add" aria-hidden />
-			<strong>{$t("profile.create-member-button")}</strong>
-		</ListGroupItem>
-	{/if}
-	{#each data.members as member (member.id)}
-		<ListGroupItem tag="a" href="/settings/members/{member.id}" data-sveltekit-preload-data="tap">
-			<Avatar
-				url={member.avatar_url}
-				alt={$t("avatar-tooltip", { name: member.display_name })}
-				size={20}
-			/>
-			{member.display_name}
-			{#if member.display_name !== member.name}({member.name}){/if}
-		</ListGroupItem>
-	{/each}
-</ListGroup>
-
-<Paginator
-	center
-	currentPage={data.currentPage}
-	pageCount={data.pageCount}
-	href="/settings/members"
-/>

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

@@ -1,22 +0,0 @@
-import { apiRequest } from "$api";
-import ApiError from "$api/error";
-import type { Member } from "$api/models";
-import log from "$lib/log";
-import { redirect } from "@sveltejs/kit";
-
-export const load = async ({ parent, params, fetch, cookies }) => {
-	const { meUser, token } = await parent();
-	if (!meUser) redirect(303, "/");
-
-	try {
-		const member = await apiRequest<Member>("GET", `/users/@me/members/${params.id}`, {
-			fetch,
-			cookies,
-		});
-		return { user: meUser, token: token!, member };
-	} catch (e) {
-		if (e instanceof ApiError) throw e.obj;
-		log.error("Error trying to fetch member %s:", params.id, e);
-		throw e;
-	}
-};

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

@@ -1,65 +0,0 @@
-<script lang="ts">
-	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 };
-	let { data, children }: Props = $props();
-
-	const isActive = (path: string) => $page.url.pathname === path;
-</script>
-
-<svelte:head>
-	<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: data.member.name })}</h3>
-	<div class="row">
-		<div class="col-md-3 mt-1 mb-3">
-			<div class="list-group">
-				<a
-					href="/settings/members/{data.member.id}"
-					class="list-group-item list-group-item-action"
-					class:active={isActive(`/settings/members/${data.member.id}`)}
-				>
-					{$t("edit-profile.general-tab")}
-				</a>
-				<a
-					href="/settings/members/{data.member.id}/names-pronouns"
-					class="list-group-item list-group-item-action"
-					class:active={isActive(`/settings/members/${data.member.id}/names-pronouns`)}
-				>
-					{$t("edit-profile.names-pronouns-tab")}
-				</a>
-				<a
-					href="/settings/members/{data.member.id}/fields"
-					class="list-group-item list-group-item-action"
-					class:active={isActive(`/settings/members/${data.member.id}/fields`)}
-				>
-					{$t("edit-profile.fields-tab")}
-				</a>
-				<a
-					href="/settings/members/{data.member.id}/flags-links"
-					class="list-group-item list-group-item-action"
-					class:active={isActive(`/settings/members/${data.member.id}/flags-links`)}
-				>
-					{$t("edit-profile.flags-links-tab")}
-				</a>
-				<a
-					href="/@{data.user.username}/{data.member.name}"
-					class="list-group-item list-group-item-action text-danger"
-				>
-					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")}
-				</a>
-			</div>
-		</div>
-		<div class="col-md-9">
-			{@render children?.()}
-		</div>
-	</div>
-</div>

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

@@ -1,82 +0,0 @@
-import { apiRequest, fastRequest } from "$api";
-import ApiError, { ErrorCode, type RawApiError } from "$api/error";
-import type { Member } from "$api/models/member";
-import log from "$lib/log.js";
-
-export const load = async ({ params, fetch, cookies }) => {
-	try {
-		const member = await apiRequest<Member>("GET", `/users/@me/members/${params.id}`, {
-			fetch,
-			cookies,
-		});
-		return { member };
-	} catch (e) {
-		if (e instanceof ApiError) throw e.obj;
-		log.error("Error trying to fetch member %s:", params.id, e);
-		throw e;
-	}
-};
-
-export const actions = {
-	changeName: async ({ params, request, fetch, cookies }) => {
-		const body = await request.formData();
-		const name = body.get("name") as string | null;
-		if (!name)
-			return {
-				error: {
-					message: "You must pass a name.",
-					status: 403,
-					code: ErrorCode.BadRequest,
-				} as RawApiError,
-				ok: false,
-			};
-
-		try {
-			await fastRequest("PATCH", `/users/@me/members/${params.id}`, {
-				body: { name },
-				fetch,
-				cookies,
-			});
-			return { error: null, ok: true };
-		} catch (e) {
-			if (e instanceof ApiError) return { error: e.obj, ok: false };
-			log.error("Error updating name for member %s:", params.id, e);
-			throw e;
-		}
-	},
-	changeDisplayName: async ({ params, request, fetch, cookies }) => {
-		const body = await request.formData();
-		let displayName = body.get("display-name") as string | null;
-		if (!displayName || displayName === "") displayName = null;
-
-		try {
-			await fastRequest("PATCH", `/users/@me/members/${params.id}`, {
-				body: { display_name: displayName },
-				fetch,
-				cookies,
-			});
-			return { error: null, ok: true };
-		} catch (e) {
-			if (e instanceof ApiError) return { error: e.obj, ok: false };
-			log.error("Error updating name for member %s:", params.id, e);
-			throw e;
-		}
-	},
-	bio: async ({ params, request, fetch, cookies }) => {
-		const body = await request.formData();
-		const bio = body.get("bio") as string | null;
-
-		try {
-			await fastRequest("PATCH", `/users/@me/members/${params.id}`, {
-				body: { bio },
-				fetch,
-				cookies,
-			});
-			return { error: null, ok: true };
-		} catch (e) {
-			if (e instanceof ApiError) return { error: e.obj, ok: false };
-			log.error("Error updating bio for member %s:", params.id, e);
-			throw e;
-		}
-	},
-};

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

@@ -1,115 +0,0 @@
-<script lang="ts">
-	import { DateTime } from "luxon";
-	import type { ActionData, PageData } from "./$types";
-	import type { Member } from "$api/models";
-	import { apiRequest, fastRequest } from "$api";
-	import ApiError from "$api/error";
-	import log from "$lib/log";
-	import { InputGroup } from "@sveltestrap/sveltestrap";
-	import { t } from "$lib/i18n";
-	import AvatarEditor from "$components/editor/AvatarEditor.svelte";
-	import ErrorAlert from "$components/ErrorAlert.svelte";
-	import NoscriptWarning from "$components/editor/NoscriptWarning.svelte";
-	import FormStatusMarker from "$components/editor/FormStatusMarker.svelte";
-	import SidEditor from "$components/editor/SidEditor.svelte";
-	import BioEditor from "$components/editor/BioEditor.svelte";
-
-	type Props = { data: PageData; form: ActionData };
-	let { data, form }: Props = $props();
-
-	// SID reroll code
-	// We compare the current time with the user's last SID reroll time. If it's more than an hour ago, it can be rerolled.
-	let error: ApiError | null = $state(null);
-	let sid = $state(data.member.sid);
-	let lastSidReroll = $state(data.user.last_sid_reroll);
-	let canRerollSid = $derived(
-		DateTime.now().toLocal().diff(DateTime.fromISO(lastSidReroll).toLocal(), "hours").hours >= 1,
-	);
-	const rerollSid = async () => {
-		try {
-			const resp = await apiRequest<Member>(
-				"POST",
-				`/users/@me/members/${data.member.id}/reroll-sid`,
-				{ token: data.token },
-			);
-			sid = resp.sid;
-			lastSidReroll = DateTime.now().toUTC().toISO();
-			error = null;
-		} catch (e) {
-			log.error("Could not reroll sid:", e);
-			if (e instanceof ApiError) error = e;
-		}
-	};
-
-	// Passed to AvatarEditor
-	let avatarUpdated = $state(false);
-	const updateAvatar = async (avatar: string) => {
-		try {
-			await fastRequest("PATCH", `/users/@me/members/${data.member.id}`, {
-				body: { avatar },
-				token: data.token,
-			});
-			avatarUpdated = true;
-			error = null;
-		} catch (e) {
-			log.error("Could not update avatar:", e);
-			if (e instanceof ApiError) error = e;
-		}
-	};
-
-	// Bio is stored in a $state() so we have a markdown preview
-	let bio = $state(data.member.bio || "");
-</script>
-
-{#if error}
-	<ErrorAlert error={error.obj} />
-{/if}
-
-{#if form}
-	<FormStatusMarker {form} />
-{/if}
-
-<div class="row">
-	<div class="col-md">
-		<h4>{$t("settings.avatar")}</h4>
-		<AvatarEditor
-			current={data.member.avatar_url}
-			alt={$t("avatar-tooltip", { name: data.member.name })}
-			update={updateAvatar}
-			updated={avatarUpdated}
-		/>
-	</div>
-	<div class="col-md">
-		<h4>{$t("edit-profile.member-name")}</h4>
-		<form method="POST" action="?/changeName" class="mb-3">
-			<InputGroup>
-				<input name="name" class="form-control" type="text" value={data.member.name} />
-				<button type="submit" class="btn btn-primary">
-					{$t("change")}
-				</button>
-			</InputGroup>
-		</form>
-
-		<h4>{$t("edit-profile.display-name")}</h4>
-		<form class="mb-3" method="POST" action="?/changeDisplayName">
-			<InputGroup>
-				<input
-					class="form-control"
-					name="display-name"
-					placeholder={data.member.name}
-					value={data.member.display_name !== data.member.name ? data.member.display_name : null}
-				/>
-				<button class="btn btn-primary" type="submit">{$t("change")}</button>
-			</InputGroup>
-		</form>
-
-		<h4>{$t("edit-profile.sid")}</h4>
-		<SidEditor {rerollSid} {sid} {canRerollSid} />
-	</div>
-	<div class="row">
-		<h4>{$t("edit-profile.bio-tab")}</h4>
-		<form method="POST" action="?/bio">
-			<BioEditor bind:value={bio} maxLength={data.meta.limits.bio_length} />
-		</form>
-	</div>
-</div>

Foxnouns.Frontend/src/routes/settings/members/new/+page.server.ts

@@ -1,34 +0,0 @@
-import { apiRequest } from "$api";
-import ApiError, { ErrorCode, type RawApiError } from "$api/error";
-import type { Member } from "$api/models/member";
-import log from "$lib/log.js";
-import { isRedirect, redirect } from "@sveltejs/kit";
-
-export const actions = {
-	default: async ({ request, fetch, cookies }) => {
-		const body = await request.formData();
-		const name = body.get("name") as string | null;
-		if (!name)
-			return {
-				error: {
-					message: "No name supplied.",
-					status: 403,
-					code: ErrorCode.BadRequest,
-				} as RawApiError,
-			};
-
-		try {
-			const member = await apiRequest<Member>("POST", "/users/@me/members", {
-				body: { name },
-				fetch,
-				cookies,
-			});
-			redirect(303, `/settings/members/${member.id}`);
-		} catch (e) {
-			if (isRedirect(e)) throw e;
-			if (e instanceof ApiError) return { error: e.obj };
-			log.error("Could not create member:", e);
-			throw e;
-		}
-	},
-};

Foxnouns.Frontend/src/routes/settings/members/new/+page.svelte

@@ -1,22 +0,0 @@
-<script lang="ts">
-	import ErrorAlert from "$components/ErrorAlert.svelte";
-	import { t } from "$lib/i18n";
-	import type { ActionData } from "./$types";
-
-	type Props = { form: ActionData };
-	let { form }: Props = $props();
-</script>
-
-<h3>{$t("settings.create-member-title")}</h3>
-
-{#if form?.error}
-	<ErrorAlert error={form.error} />
-{/if}
-
-<form method="POST">
-	<div class="my-3">
-		<label class="form-label" for="name">{$t("settings.create-member-name-label")}</label>
-		<input class="form-control" type="text" id="name" name="name" required />
-	</div>
-	<button class="btn btn-primary" type="submit">{$t("profile.create-member-button")}</button>
-</form>

Foxnouns.Frontend/src/routes/settings/profile/+layout.server.ts

@@ -1,7 +0,0 @@
-import { redirect } from "@sveltejs/kit";
-
-export const load = async ({ parent }) => {
-	const { meUser, token } = await parent();
-	if (!meUser) redirect(303, "/");
-	return { user: meUser!, token: token! };
-};

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

@@ -1,65 +0,0 @@
-<script lang="ts">
-	import type { Snippet } from "svelte";
-	import { page } from "$app/stores";
-	import { t } from "$lib/i18n";
-
-	type Props = { children: Snippet };
-	let { children }: Props = $props();
-
-	const isActive = (path: string) => $page.url.pathname === path;
-</script>
-
-<svelte:head>
-	<title>{$t("edit-profile.user-header")} • pronouns.cc</title>
-</svelte:head>
-
-<div class="container">
-	<h3>{$t("edit-profile.user-header")}</h3>
-	<div class="row">
-		<div class="col-md-3 mt-1 mb-3">
-			<div class="list-group">
-				<a
-					href="/settings/profile"
-					class="list-group-item list-group-item-action"
-					class:active={isActive("/settings/profile")}
-				>
-					{$t("edit-profile.general-tab")}
-				</a>
-				<a
-					href="/settings/profile/names-pronouns"
-					class="list-group-item list-group-item-action"
-					class:active={isActive("/settings/profile/names-pronouns")}
-				>
-					{$t("edit-profile.names-pronouns-tab")}
-				</a>
-				<a
-					href="/settings/profile/bio"
-					class="list-group-item list-group-item-action"
-					class:active={isActive("/settings/profile/bio")}
-				>
-					{$t("edit-profile.bio-tab")}
-				</a>
-				<a
-					href="/settings/profile/fields"
-					class="list-group-item list-group-item-action"
-					class:active={isActive("/settings/profile/fields")}
-				>
-					{$t("edit-profile.fields-tab")}
-				</a>
-				<a
-					href="/settings/profile/flags-links"
-					class="list-group-item list-group-item-action"
-					class:active={isActive("/settings/profile/flags-links")}
-				>
-					{$t("edit-profile.flags-links-tab")}
-				</a>
-				<a href="/settings" class="list-group-item list-group-item-action text-danger">
-					{$t("edit-profile.back-to-settings-tab")}
-				</a>
-			</div>
-		</div>
-		<div class="col-md-9">
-			{@render children?.()}
-		</div>
-	</div>
-</div>

Foxnouns.Frontend/src/routes/settings/profile/+page.server.ts

@@ -1,47 +0,0 @@
-import { fastRequest } from "$api";
-import ApiError from "$api/error";
-import log from "$lib/log.js";
-
-export const actions = {
-	options: async ({ request, fetch, cookies }) => {
-		const body = await request.formData();
-		let memberTitle = body.get("member-title") as string | null;
-		if (!memberTitle || memberTitle === "") memberTitle = null;
-
-		let timezone = body.get("timezone") as string | null;
-		if (!timezone || timezone === "") timezone = null;
-
-		let hideMemberList = !!body.get("hide-member-list");
-
-		try {
-			await fastRequest("PATCH", "/users/@me", {
-				body: { timezone, member_title: memberTitle, member_list_hidden: hideMemberList },
-				fetch,
-				cookies,
-			});
-			return { error: null, ok: true };
-		} catch (e) {
-			if (e instanceof ApiError) return { error: e.obj, ok: false };
-			log.error("Error patching user:", e);
-			throw e;
-		}
-	},
-	changeDisplayName: async ({ request, fetch, cookies }) => {
-		const body = await request.formData();
-		let displayName = body.get("display-name") as string | null;
-		if (!displayName || displayName === "") displayName = null;
-
-		try {
-			await fastRequest("PATCH", "/users/@me", {
-				body: { display_name: displayName },
-				fetch,
-				cookies,
-			});
-			return { error: null, ok: true };
-		} catch (e) {
-			if (e instanceof ApiError) return { error: e.obj, ok: false };
-			log.error("Error patching user:", e);
-			throw e;
-		}
-	},
-};

Foxnouns.Frontend/src/routes/settings/profile/+page.svelte

@@ -1,196 +0,0 @@
-<script lang="ts">
-	import type { ActionData, PageData } from "./$types";
-	import { t } from "$lib/i18n";
-	import { Icon, InputGroup } from "@sveltestrap/sveltestrap";
-	import AvatarEditor from "$components/editor/AvatarEditor.svelte";
-	import { apiRequest, fastRequest } from "$api";
-	import ApiError from "$api/error";
-	import ErrorAlert from "$components/ErrorAlert.svelte";
-	import type { User } from "$api/models/user";
-	import log from "$lib/log";
-	import { DateTime, FixedOffsetZone } from "luxon";
-	import FormStatusMarker from "$components/editor/FormStatusMarker.svelte";
-	import SidEditor from "$components/editor/SidEditor.svelte";
-
-	type Props = { data: PageData; form: ActionData };
-	let { data, form }: Props = $props();
-
-	let error: ApiError | null = $state(null);
-
-	// Timezone code
-	let tz = $state(data.user.timezone === "<none>" ? null : data.user.timezone);
-	const validTimezones = Intl.supportedValuesOf("timeZone");
-	const detectTimezone = () => {
-		tz = DateTime.local().zoneName;
-	};
-
-	let currentTime = $state("");
-	let displayTimezone = $state("");
-	$effect(() => {
-		if (!tz || tz === "") {
-			currentTime = "";
-			displayTimezone = "";
-			return;
-		}
-
-		const offset = DateTime.now().setZone(tz).offset;
-		const zone = FixedOffsetZone.instance(offset);
-
-		currentTime = DateTime.now().setZone(zone).toLocaleString(DateTime.TIME_SIMPLE);
-		displayTimezone = zone.formatOffset(DateTime.now().toUnixInteger(), "narrow");
-	});
-
-	// SID reroll code
-	// We compare the current time with the user's last SID reroll time. If it's more than an hour ago, it can be rerolled.
-	let sid = $state(data.user.sid);
-	let lastSidReroll = $state(data.user.last_sid_reroll);
-	let canRerollSid = $derived(
-		DateTime.now().toLocal().diff(DateTime.fromISO(lastSidReroll).toLocal(), "hours").hours >= 1,
-	);
-	const rerollSid = async () => {
-		try {
-			const resp = await apiRequest<User>("POST", "/users/@me/reroll-sid", { token: data.token });
-			sid = resp.sid;
-			lastSidReroll = DateTime.now().toUTC().toISO();
-			error = null;
-		} catch (e) {
-			log.error("Could not reroll sid:", e);
-			if (e instanceof ApiError) error = e;
-		}
-	};
-
-	// Avatar update code
-	// AvatarEditor handles converting the uploaded image to a base64 string
-	let avatarUpdated = $state(false);
-	const updateAvatar = async (avatar: string) => {
-		try {
-			await fastRequest("PATCH", "/users/@me", {
-				body: { avatar },
-				token: data.token,
-			});
-			avatarUpdated = true;
-			error = null;
-		} catch (e) {
-			log.error("Could not update avatar:", e);
-			if (e instanceof ApiError) error = e;
-		}
-	};
-</script>
-
-{#if error}
-	<ErrorAlert error={error.obj} />
-{/if}
-
-{#if form}
-	<div class="row">
-		<FormStatusMarker {form} />
-	</div>
-{/if}
-
-<div class="row">
-	<div class="col-md">
-		<h4>{$t("settings.avatar")}</h4>
-		<AvatarEditor
-			current={data.user.avatar_url}
-			alt={$t("avatar-tooltip", { name: "@" + data.user.username })}
-			update={updateAvatar}
-			updated={avatarUpdated}
-		/>
-	</div>
-	<div class="col-md">
-		<h4>{$t("edit-profile.username")}</h4>
-		<input class="form-control" type="text" value={data.user.username} disabled readonly />
-		<p class="mt-1 mb-3 text-muted">
-			<Icon name="info-circle-fill" aria-hidden />
-			{$t("edit-profile.change-username-info")}
-			<a href="/settings">{$t("edit-profile.change-username-link")}</a>
-		</p>
-
-		<h4>{$t("edit-profile.display-name")}</h4>
-		<form class="mb-3" method="POST" action="?/changeDisplayName">
-			<InputGroup>
-				<input
-					class="form-control"
-					name="display-name"
-					placeholder={data.user.username}
-					value={data.user.display_name}
-				/>
-				<button class="btn btn-primary" type="submit">{$t("change")}</button>
-			</InputGroup>
-		</form>
-
-		<h4>{$t("edit-profile.sid")}</h4>
-		<SidEditor {sid} {rerollSid} {canRerollSid} />
-	</div>
-</div>
-
-<div class="mt-3">
-	<h4>{$t("edit-profile.profile-options-header")}</h4>
-	<form method="POST" action="?/options">
-		<div class="mb-3">
-			<label class="form-label" for="member-title">{$t("edit-profile.member-header-label")}</label>
-			<input
-				type="text"
-				id="member-title"
-				name="member-title"
-				class="form-control"
-				value={data.user.member_title}
-				placeholder={$t("profile.default-members-header")}
-			/>
-			<p class="text-muted mt-1">
-				<Icon name="info-circle-fill" aria-hidden />
-				{$t("edit-profile.member-header-info")}
-			</p>
-		</div>
-		<div class="mb-3">
-			<label class="form-label" for="timezone">{$t("edit-profile.timezone-label")}</label>
-			<InputGroup>
-				<input
-					type="text"
-					id="timezone"
-					name="timezone"
-					class="form-control"
-					list="timezones"
-					bind:value={tz}
-				/>
-				<datalist id="timezones">
-					{#each validTimezones as timezone}<option value={timezone}></option>{/each}
-				</datalist>
-				<button type="button" class="btn btn-secondary" onclick={() => detectTimezone()}>
-					Detect timezone
-				</button>
-			</InputGroup>
-			{#if tz && tz !== "" && validTimezones.includes(tz)}
-				<div class="mt-1">
-					{$t("edit-profile.timezone-preview")}
-					<Icon name="clock" aria-hidden />
-					{currentTime} <span class="text-body-secondary">(UTC{displayTimezone})</span>
-				</div>
-			{/if}
-			<p class="text-muted mt-1">
-				<Icon name="info-circle-fill" aria-hidden />
-				{$t("edit-profile.timezone-info")}
-			</p>
-		</div>
-		<div class="form-check">
-			<input
-				class="form-check-input"
-				type="checkbox"
-				checked={data.user.member_list_hidden}
-				value="true"
-				name="hide-member-list"
-				id="hide-member-list"
-			/>
-			<label class="form-check-label" for="hide-member-list">
-				{$t("edit-profile.hide-member-list-label")}
-			</label>
-		</div>
-		<p class="text-muted mt-1">
-			<Icon name="info-circle-fill" aria-hidden />
-			{$t("edit-profile.hide-member-list-info")}
-		</p>
-		<div class="mt-2">
-			<button type="submit" class="btn btn-primary">{$t("save-changes")}</button>
-		</div>
-	</form>
-</div>

Foxnouns.Frontend/src/routes/settings/profile/bio/+page.server.ts

@@ -1,19 +0,0 @@
-import { fastRequest } from "$api";
-import ApiError from "$api/error";
-import log from "$lib/log.js";
-
-export const actions = {
-	default: async ({ request, fetch, cookies }) => {
-		const body = await request.formData();
-		const bio = body.get("bio") as string | null;
-
-		try {
-			await fastRequest("PATCH", "/users/@me", { body: { bio }, fetch, cookies });
-			return { error: null, ok: true };
-		} catch (e) {
-			if (e instanceof ApiError) return { error: e.obj, ok: false };
-			log.error("Error updating bio:", e);
-			throw e;
-		}
-	},
-};

Foxnouns.Frontend/src/routes/settings/profile/bio/+page.svelte

@@ -1,17 +0,0 @@
-<script lang="ts">
-	import FormStatusMarker from "$components/editor/FormStatusMarker.svelte";
-	import type { ActionData, PageData } from "./$types";
-	import BioEditor from "$components/editor/BioEditor.svelte";
-	import { t } from "$lib/i18n";
-
-	type Props = { data: PageData; form: ActionData };
-	let { data, form }: Props = $props();
-
-	let bio = $state(data.user.bio || "");
-</script>
-
-<h4>{$t("edit-profile.bio-tab")}</h4>
-<FormStatusMarker {form} />
-<form method="POST">
-	<BioEditor bind:value={bio} maxLength={data.meta.limits.bio_length} />
-</form>

package.json

@@ -3,8 +3,7 @@
     "concurrently": "^9.0.1"
   },
   "scripts": {
-    "watch:be": "dotnet watch --no-hot-reload --project Foxnouns.Backend -- --migrate-and-start",
+    "dev": "concurrently -n .net,node,rate -c magenta,yellow,blue -i 'cd Foxnouns.Backend && dotnet watch --no-hot-reload' 'cd Foxnouns.Frontend && pnpm dev' 'cd rate && go run -v .'",
-    "dev": "concurrently -n .net,node,rate -c magenta,yellow,blue -i 'pnpm watch:be' 'cd Foxnouns.Frontend && pnpm dev' 'cd rate && go run -v .'",
     "format": "dotnet csharpier . && cd Foxnouns.Frontend && pnpm format"
   },
   "packageManager": "pnpm@9.12.3+sha512.cce0f9de9c5a7c95bef944169cc5dfe8741abfb145078c0d508b868056848a87c81e626246cb60967cbd7fd29a6c062ef73ff840d96b3c86c40ac92cf4a813ee"

rate/rate_limiter.go

@@ -134,12 +134,12 @@ func (l *Limiter) bucketLimiter(user, method, bucket string) *httprate.RateLimit
 func requestLimitFor(method string) (int, time.Duration) {
 	switch strings.ToUpper(method) {
 	case "PATCH", "POST":
-		return 3, time.Second
+		return 1, time.Second
 	case "DELETE":
-		return 2, 5 * time.Second
+		return 1, 5 * time.Second
 	case "GET":
-		return 10, time.Second
+		return 3, time.Second
 	default:
-		return 5, time.Second
+		return 2, time.Second
 	}
 }