.gitignore

@@ -6,8 +6,6 @@ config.ini
 *.DotSettings.user
 proxy-config.json
 .DS_Store
-.idea/.idea.Foxnouns.NET/.idea/dataSources.xml
-.idea/.idea.Foxnouns.NET/.idea/sqldialects.xml
 
 docker/config.ini
 docker/proxy-config.json

.husky/task-runner.json

@@ -4,31 +4,14 @@
     {
       "name": "run-prettier",
       "command": "pnpm",
-      "args": [
-        "prettier",
-        "-w",
-        "${staged}"
-      ],
-      "include": [
-        "Foxnouns.Frontend/**/*.ts",
-        "Foxnouns.Frontend/**/*.json",
-        "Foxnouns.Frontend/**/*.scss",
-        "Foxnouns.Frontend/**/*.js",
-        "Foxnouns.Frontend/**/*.svelte"
-      ],
-      "cwd": "Foxnouns.Frontend/",
+      "args": ["format"],
       "pathMode": "absolute"
     },
     {
       "name": "run-csharpier",
       "command": "dotnet",
-      "args": [
-        "csharpier",
-        "${staged}"
-      ],
-      "include": [
-        "**/*.cs"
-      ]
+      "args": [ "csharpier", "${staged}" ],
+      "include": [ "**/*.cs" ]
     }
   ]
 }

Foxnouns.Backend/Controllers/Moderation/ReportsController.cs

@@ -18,7 +18,6 @@ using Foxnouns.Backend.Database.Models;
 using Foxnouns.Backend.Dto;
 using Foxnouns.Backend.Middleware;
 using Foxnouns.Backend.Services;
-using Foxnouns.Backend.Utils;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
@@ -50,8 +49,6 @@ public class ReportsController(
         [FromBody] CreateReportRequest req
     )
     {
-        ValidationUtils.Validate([("context", ValidationUtils.ValidateReportContext(req.Context))]);
-
         User target = await db.ResolveUserAsync(id);
 
         if (target.Id == CurrentUser!.Id)
@@ -99,7 +96,6 @@ public class ReportsController(
             TargetUserId = target.Id,
             TargetMemberId = null,
             Reason = req.Reason,
-            Context = req.Context,
             TargetType = ReportTargetType.User,
             TargetSnapshot = snapshot,
         };
@@ -116,8 +112,6 @@ public class ReportsController(
         [FromBody] CreateReportRequest req
     )
     {
-        ValidationUtils.Validate([("context", ValidationUtils.ValidateReportContext(req.Context))]);
-
         Member target = await db.ResolveMemberAsync(id);
 
         if (target.User.Id == CurrentUser!.Id)
@@ -164,7 +158,6 @@ public class ReportsController(
             TargetUserId = target.User.Id,
             TargetMemberId = target.Id,
             Reason = req.Reason,
-            Context = req.Context,
             TargetType = ReportTargetType.Member,
             TargetSnapshot = snapshot,
         };

Foxnouns.Backend/Database/DatabaseContext.cs

@@ -108,12 +108,6 @@ public class DatabaseContext(DbContextOptions options) : DbContext(options)
             .HasFilter("fediverse_application_id IS NULL")
             .IsUnique();
 
-        modelBuilder
-            .Entity<AuditLogEntry>()
-            .HasOne(e => e.Report)
-            .WithOne(e => e.AuditLogEntry)
-            .OnDelete(DeleteBehavior.SetNull);
-
         modelBuilder.Entity<User>().Property(u => u.Sid).HasDefaultValueSql("find_free_user_sid()");
         modelBuilder.Entity<User>().Property(u => u.Fields).HasColumnType("jsonb");
         modelBuilder.Entity<User>().Property(u => u.Names).HasColumnType("jsonb");

Foxnouns.Backend/Database/Migrations/20241218195457_AddContextToReports.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("20241218195457_AddContextToReports")]
-    public partial class AddContextToReports : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "context",
-                table: "reports",
-                type: "text",
-                nullable: true
-            );
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(name: "context", table: "reports");
-        }
-    }
-}

Foxnouns.Backend/Database/Migrations/20241218201855_MakeAuditLogReportsNullable.cs

@@ -1,65 +0,0 @@
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Foxnouns.Backend.Database.Migrations
-{
-    /// <inheritdoc />
-    [DbContext(typeof(DatabaseContext))]
-    [Migration("20241218201855_MakeAuditLogReportsNullable")]
-    public partial class MakeAuditLogReportsNullable : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "fk_audit_log_reports_report_id",
-                table: "audit_log"
-            );
-
-            migrationBuilder.DropIndex(name: "ix_audit_log_report_id", table: "audit_log");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_audit_log_report_id",
-                table: "audit_log",
-                column: "report_id",
-                unique: true
-            );
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_audit_log_reports_report_id",
-                table: "audit_log",
-                column: "report_id",
-                principalTable: "reports",
-                principalColumn: "id",
-                onDelete: ReferentialAction.SetNull
-            );
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "fk_audit_log_reports_report_id",
-                table: "audit_log"
-            );
-
-            migrationBuilder.DropIndex(name: "ix_audit_log_report_id", table: "audit_log");
-
-            migrationBuilder.CreateIndex(
-                name: "ix_audit_log_report_id",
-                table: "audit_log",
-                column: "report_id"
-            );
-
-            migrationBuilder.AddForeignKey(
-                name: "fk_audit_log_reports_report_id",
-                table: "audit_log",
-                column: "report_id",
-                principalTable: "reports",
-                principalColumn: "id"
-            );
-        }
-    }
-}

Foxnouns.Backend/Database/Migrations/DatabaseContextModelSnapshot.cs

@@ -113,7 +113,6 @@ namespace Foxnouns.Backend.Database.Migrations
                         .HasName("pk_audit_log");
 
                     b.HasIndex("ReportId")
-                        .IsUnique()
                         .HasDatabaseName("ix_audit_log_report_id");
 
                     b.ToTable("audit_log", (string)null);
@@ -410,10 +409,6 @@ namespace Foxnouns.Backend.Database.Migrations
                         .HasColumnType("bigint")
                         .HasColumnName("id");
 
-                    b.Property<string>("Context")
-                        .HasColumnType("text")
-                        .HasColumnName("context");
-
                     b.Property<int>("Reason")
                         .HasColumnType("integer")
                         .HasColumnName("reason");
@@ -680,9 +675,8 @@ namespace Foxnouns.Backend.Database.Migrations
             modelBuilder.Entity("Foxnouns.Backend.Database.Models.AuditLogEntry", b =>
                 {
                     b.HasOne("Foxnouns.Backend.Database.Models.Report", "Report")
-                        .WithOne("AuditLogEntry")
-                        .HasForeignKey("Foxnouns.Backend.Database.Models.AuditLogEntry", "ReportId")
-                        .OnDelete(DeleteBehavior.SetNull)
+                        .WithMany()
+                        .HasForeignKey("ReportId")
                         .HasConstraintName("fk_audit_log_reports_report_id");
 
                     b.Navigation("Report");
@@ -845,11 +839,6 @@ namespace Foxnouns.Backend.Database.Migrations
                     b.Navigation("ProfileFlags");
                 });
 
-            modelBuilder.Entity("Foxnouns.Backend.Database.Models.Report", b =>
-                {
-                    b.Navigation("AuditLogEntry");
-                });
-
             modelBuilder.Entity("Foxnouns.Backend.Database.Models.User", b =>
                 {
                     b.Navigation("AuthMethods");

Foxnouns.Backend/Database/Models/AuditLogEntry.cs

@@ -12,7 +12,6 @@
 //
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
-using System.ComponentModel.DataAnnotations.Schema;
 using Foxnouns.Backend.Utils;
 using Newtonsoft.Json;
 

Foxnouns.Backend/Database/Models/Report.cs

@@ -29,12 +29,9 @@ public class Report : BaseModel
 
     public ReportStatus Status { get; set; }
     public ReportReason Reason { get; init; }
-    public string? Context { get; init; }
 
     public ReportTargetType TargetType { get; init; }
     public string? TargetSnapshot { get; init; }
-
-    public AuditLogEntry? AuditLogEntry { get; set; }
 }
 
 [JsonConverter(typeof(ScreamingSnakeCaseEnumConverter))]

Foxnouns.Backend/Dto/Moderation.cs

@@ -57,7 +57,7 @@ public record NotificationResponse(
 
 public record AuditLogEntity(Snowflake Id, string Username);
 
-public record CreateReportRequest(ReportReason Reason, string? Context = null);
+public record CreateReportRequest(ReportReason Reason);
 
 public record IgnoreReportRequest(string? Reason = null);
 

Foxnouns.Backend/Utils/ValidationUtils.Strings.cs

@@ -196,13 +196,6 @@ public static partial class ValidationUtils
         };
     }
 
-    public const int MaximumReportContextLength = 512;
-
-    public static ValidationError? ValidateReportContext(string? context) =>
-        context?.Length > MaximumReportContextLength
-            ? ValidationError.GenericValidationError("Avatar is too large", null)
-            : null;
-
     public const int MinimumPasswordLength = 12;
     public const int MaximumPasswordLength = 1024;
 

Foxnouns.Frontend/package.json

@@ -13,8 +13,8 @@
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-node": "^5.2.10",
-		"@sveltejs/kit": "^2.12.1",
-		"@sveltejs/vite-plugin-svelte": "^5.0.2",
+		"@sveltejs/kit": "^2.11.1",
+		"@sveltejs/vite-plugin-svelte": "^4.0.3",
 		"@sveltestrap/sveltestrap": "^6.2.7",
 		"@types/eslint": "^9.6.1",
 		"@types/luxon": "^3.4.2",
@@ -28,13 +28,13 @@
 		"prettier": "^3.4.2",
 		"prettier-plugin-svelte": "^3.3.2",
 		"sass": "^1.83.0",
-		"svelte": "^5.14.3",
+		"svelte": "^5.13.0",
 		"svelte-bootstrap-icons": "^3.1.1",
 		"svelte-check": "^4.1.1",
 		"sveltekit-i18n": "^2.4.2",
 		"typescript": "^5.7.2",
-		"typescript-eslint": "^8.18.1",
-		"vite": "^6.0.3"
+		"typescript-eslint": "^8.18.0",
+		"vite": "^5.4.11"
 	},
 	"packageManager": "pnpm@9.15.0+sha512.76e2379760a4328ec4415815bcd6628dee727af3779aaa4c914e3944156c4299921a89f976381ee107d41f12cfa4b66681ca9c718f0668fa0831ed4c6d8ba56c",
 	"dependencies": {

Foxnouns.Frontend/src/app.d.ts

@@ -1,16 +1,7 @@
 // See https://svelte.dev/docs/kit/types#app.d.ts
-
-import type { ErrorCode } from "$api/error";
-
 // for information about these interfaces
 declare global {
 	namespace App {
-		interface Error {
-			message: string;
-			status: number;
-			code: ErrorCode;
-			id: string;
-		}
 		// interface Error {}
 		// interface Locals {}
 		// interface PageData {}

Foxnouns.Frontend/src/hooks.server.ts

@@ -1,8 +1,6 @@
-import ApiError, { ErrorCode } from "$api/error";
 import { PRIVATE_API_HOST, PRIVATE_INTERNAL_API_HOST } from "$env/static/private";
 import { PUBLIC_API_BASE } from "$env/static/public";
-import log from "$lib/log";
-import type { HandleFetch, HandleServerError } from "@sveltejs/kit";
+import type { HandleFetch } from "@sveltejs/kit";
 
 export const handleFetch: HandleFetch = async ({ request, fetch }) => {
 	if (request.url.startsWith(`${PUBLIC_API_BASE}/internal`)) {
@@ -13,24 +11,3 @@ export const handleFetch: HandleFetch = async ({ request, fetch }) => {
 
 	return await fetch(request);
 };
-
-export const handleError: HandleServerError = async ({ error, status, message }) => {
-	const id = crypto.randomUUID();
-
-	if (error instanceof ApiError) {
-		return {
-			id,
-			status: error.raw?.status || status,
-			message: error.raw?.message || "Unknown error",
-			code: error.code,
-		};
-	}
-
-	if (status >= 400 && status <= 499) {
-		return { id, status, message, code: ErrorCode.GenericApiError };
-	}
-
-	log.error("[%s] error in handler:", id, error);
-
-	return { id, status, message, code: ErrorCode.InternalServerError };
-};

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

@@ -9,7 +9,7 @@ export type Method = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
 /**
  * Optional arguments for a request. `load` and `action` functions should always pass `fetch` and `cookies`.
  */
-export type RequestArgs<T> = {
+export type RequestArgs = {
 	/**
 	 * The token for this request. Where possible, `cookies` should be passed instead.
 	 * Will override `cookies` if both are passed.
@@ -23,7 +23,7 @@ export type RequestArgs<T> = {
 	/**
 	 * The body for this request, which will be serialized to JSON. Should be a plain JS object.
 	 */
-	body?: T;
+	body?: unknown;
 	/**
 	 * The fetch function to use. Should be passed in loader and action functions, but can be safely ignored for client-side requests.
 	 */
@@ -41,10 +41,10 @@ export type RequestArgs<T> = {
  * @param args Optional arguments to the request function.
  * @returns A Response object.
  */
-export async function baseRequest<T = unknown>(
+export async function baseRequest(
 	method: Method,
 	path: string,
-	args: RequestArgs<T> = {},
+	args: RequestArgs = {},
 ): Promise<Response> {
 	const token = args.token ?? args.cookies?.get(TOKEN_COOKIE_NAME);
 
@@ -72,11 +72,11 @@ export async function baseRequest<T = unknown>(
  * @param args Optional arguments to the request function.
  * @returns The response deserialized as `T`.
  */
-export async function apiRequest<TResponse, TRequest = unknown>(
+export async function apiRequest<T>(
 	method: Method,
 	path: string,
-	args: RequestArgs<TRequest> = {},
-): Promise<TResponse> {
+	args: RequestArgs = {},
+): Promise<T> {
 	const resp = await baseRequest(method, path, args);
 
 	if (resp.status < 200 || resp.status > 299) {
@@ -84,7 +84,7 @@ export async function apiRequest<TResponse, TRequest = unknown>(
 		if ("code" in err) throw new ApiError(err);
 		else throw new ApiError();
 	}
-	return (await resp.json()) as TResponse;
+	return (await resp.json()) as T;
 }
 
 /**
@@ -94,10 +94,10 @@ export async function apiRequest<TResponse, TRequest = unknown>(
  * @param args Optional arguments to the request function.
  * @param enforce204 Whether to throw an error on a non-204 status code.
  */
-export async function fastRequest<T = unknown>(
+export async function fastRequest(
 	method: Method,
 	path: string,
-	args: RequestArgs<T> = {},
+	args: RequestArgs = {},
 	enforce204: boolean = false,
 ): Promise<void> {
 	const resp = await baseRequest(method, path, args);

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

@@ -1,26 +0,0 @@
-export type CreateReportRequest = {
-	reason: ReportReason;
-	context: string | null;
-};
-
-export enum ReportReason {
-	Totalitarianism = "TOTALITARIANISM",
-	HateSpeech = "HATE_SPEECH",
-	Racism = "RACISM",
-	Homophobia = "HOMOPHOBIA",
-	Transphobia = "TRANSPHOBIA",
-	Queerphobia = "QUEERPHOBIA",
-	Exclusionism = "EXCLUSIONISM",
-	Sexism = "SEXISM",
-	Ableism = "ABLEISM",
-	ChildPornography = "CHILD_PORNOGRAPHY",
-	PedophiliaAdvocacy = "PEDOPHILIA_ADVOCACY",
-	Harassment = "HARASSMENT",
-	Impersonation = "IMPERSONATION",
-	Doxxing = "DOXXING",
-	EncouragingSelfHarm = "ENCOURAGING_SELF_HARM",
-	Spam = "SPAM",
-	Trolling = "TROLLING",
-	Advertisement = "ADVERTISEMENT",
-	CopyrightViolation = "COPYRIGHT_VIOLATION",
-}

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

@@ -8,7 +8,7 @@
 		NavLink,
 		NavItem,
 	} from "@sveltestrap/sveltestrap";
-	import { page } from "$app/state";
+	import { page } from "$app/stores";
 	import type { Meta, MeUser } from "$api/models/index";
 	import Logo from "$components/Logo.svelte";
 	import { t } from "$lib/i18n";
@@ -51,19 +51,19 @@
 				<NavItem>
 					<NavLink
 						href="/@{user.username}"
-						active={page.url.pathname.startsWith(`/@${user.username}`)}
+						active={$page.url.pathname.startsWith(`/@${user.username}`)}
 					>
 						@{user.username}
 					</NavLink>
 				</NavItem>
 				<NavItem>
-					<NavLink href="/settings" active={page.url.pathname.startsWith("/settings")}>
+					<NavLink href="/settings" active={$page.url.pathname.startsWith("/settings")}>
 						{$t("nav.settings")}
 					</NavLink>
 				</NavItem>
 			{:else}
 				<NavItem>
-					<NavLink href="/auth/log-in" active={page.url.pathname === "/auth/log-in"}>
+					<NavLink href="/auth/log-in" active={$page.url.pathname === "/auth/log-in"}>
 						{$t("nav.log-in")}
 					</NavLink>
 				</NavItem>

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

@@ -1,12 +0,0 @@
-<script lang="ts">
-	import { t } from "$lib/i18n";
-
-	type Props = { required?: boolean };
-	let { required }: Props = $props();
-</script>
-
-{#if required}
-	<small class="text-danger"><abbr title={$t("form.required")}>*</abbr></small>
-{:else}
-	<small class="text-body-secondary">{$t("form.optional")}</small>
-{/if}

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

@@ -1,36 +0,0 @@
-<script lang="ts">
-	import type { MeUser } from "$api/models";
-	import { PUBLIC_BASE_URL, PUBLIC_SHORT_URL } from "$env/static/public";
-	import { t } from "$lib/i18n";
-
-	type Props = {
-		user: string;
-		member?: string;
-		sid: string;
-		reportUrl: string;
-		meUser: MeUser | null;
-	};
-
-	let { user, member, sid, reportUrl, meUser }: Props = $props();
-
-	let profileUrl = $derived(
-		member ? `${PUBLIC_BASE_URL}/@${user}/${member}` : `${PUBLIC_BASE_URL}/@${user}`,
-	);
-	let shortUrl = $derived(`${PUBLIC_SHORT_URL}/${sid}`);
-
-	const copyUrl = async (url: string) => {
-		await navigator.clipboard.writeText(url);
-	};
-</script>
-
-<div class="btn-group">
-	<button type="button" class="btn btn-outline-secondary" onclick={() => copyUrl(profileUrl)}>
-		{$t("profile.copy-link-button")}
-	</button>
-	<button type="button" class="btn btn-outline-secondary" onclick={() => copyUrl(shortUrl)}>
-		{$t("profile.copy-short-link-button")}
-	</button>
-	{#if meUser && meUser.username !== user}
-		<a class="btn btn-outline-danger" href={reportUrl}>{$t("profile.report-button")}</a>
-	{/if}
-</div>

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

@@ -18,10 +18,7 @@
 		"pronouns-header": "Pronouns",
 		"default-members-header": "Members",
 		"create-member-button": "Create member",
-		"back-to-user": "Back to {{name}}",
-		"copy-link-button": "Copy link",
-		"copy-short-link-button": "Copy short link",
-		"report-button": "Report profile"
+		"back-to-user": "Back to {{name}}"
 	},
 	"title": {
 		"log-in": "Log in",
@@ -240,35 +237,5 @@
 		"custom-preference-muted": "Show as muted text",
 		"custom-preference-favourite": "Treat like favourite"
 	},
-	"cancel": "Cancel",
-	"report": {
-		"title": "Reporting {{name}}",
-		"totalitarianism": "Support of totalitarian regimes",
-		"hate-speech": "Hate speech",
-		"racism": "Racism or xenophobia",
-		"homophobia": "Homophobia",
-		"transphobia": "Transphobia",
-		"queerphobia": "Queerphobia (other)",
-		"exclusionism": "Queer or plural exclusionism",
-		"sexism": "Sexism or misogyny",
-		"ableism": "Ableism",
-		"child-pornography": "Child pornography",
-		"pedophilia-advocacy": "Pedophilia advocacy",
-		"harassment": "Harassment",
-		"impersonation": "Impersonation",
-		"doxxing": "Doxxing",
-		"encouraging-self-harm": "Encouraging self-harm or suicide",
-		"spam": "Spam",
-		"trolling": "Trolling",
-		"advertisement": "Advertising",
-		"copyright-violation": "Copyright or trademark violation",
-		"success": "Successfully submitted report!",
-		"reason-label": "Why are you reporting this profile?",
-		"context-label": "Is there any context you'd like to give us?",
-		"submit-button": "Submit report"
-	},
-	"form": {
-		"optional": "(optional)",
-		"required": "Required"
-	}
+	"cancel": "Cancel"
 }

Foxnouns.Frontend/src/routes/+error.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { page } from "$app/stores";
-	import Error from "$components/Error.svelte";
 	import { t } from "$lib/i18n";
 	import type { LayoutData } from "./$types";
 
@@ -15,8 +14,22 @@
 </svelte:head>
 
 <div class="container">
-	<Error {error} headerElem="h3" />
-	<div class="btn-group mt-2">
+	<h3>{$t("title.an-error-occurred")}</h3>
+	<p>
+		<strong>{$page.status}</strong>: {error.message}
+	</p>
+	<p>
+		{#if $page.status === 400}
+			{$t("error.400-description")}
+		{:else if $page.status === 404}
+			{$t("error.404-description")}
+		{:else if $page.status === 500}
+			{$t("error.500-description")}
+		{:else}
+			{$t("error.unknown-status-description")}
+		{/if}
+	</p>
+	<div class="btn-group">
 		{#if data.meUser}
 			<a class="btn btn-primary" href="/@{data.meUser.username}">
 				{$t("error.back-to-profile-button")}

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

@@ -1,14 +1,25 @@
 import { apiRequest } from "$api";
+import ApiError, { ErrorCode } from "$api/error.js";
 import type { UserWithMembers } from "$api/models";
+import log from "$lib/log.js";
 import paginate from "$lib/paginate";
+import { error } from "@sveltejs/kit";
 
 const MEMBERS_PER_PAGE = 20;
 
 export const load = async ({ params, fetch, cookies, url }) => {
-	const user = await apiRequest<UserWithMembers>("GET", `/users/${params.username}`, {
-		fetch,
-		cookies,
-	});
+	let user: UserWithMembers;
+
+	try {
+		user = await apiRequest<UserWithMembers>("GET", `/users/${params.username}`, {
+			fetch,
+			cookies,
+		});
+	} catch (e) {
+		if (e instanceof ApiError && e.code === ErrorCode.UserNotFound) error(404, "User not found");
+		log.error("Error fetching user %s:", params.username, e);
+		throw e;
+	}
 
 	const { data, currentPage, pageCount } = paginate(
 		user.members,

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

@@ -8,7 +8,6 @@
 	import { Icon } from "@sveltestrap/sveltestrap";
 	import Paginator from "$components/Paginator.svelte";
 	import MemberCard from "$components/profile/user/MemberCard.svelte";
-	import ProfileButtons from "$components/profile/ProfileButtons.svelte";
 
 	type Props = { data: PageData };
 	let { data }: Props = $props();
@@ -29,13 +28,6 @@
 	<ProfileHeader name="@{data.user.username}" profile={data.user} offset={data.user.utc_offset} />
 	<ProfileFields profile={data.user} {allPreferences} />
 
-	<ProfileButtons
-		meUser={data.meUser}
-		user={data.user.username}
-		sid={data.user.sid}
-		reportUrl="/report/{data.user.id}"
-	/>
-
 	{#if data.members.length > 0}
 		<hr />
 		<h2>

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

@@ -1,15 +1,28 @@
 import { apiRequest } from "$api";
+import ApiError, { ErrorCode } from "$api/error.js";
 import type { Member } from "$api/models/member";
+import log from "$lib/log.js";
+import { error } from "@sveltejs/kit";
 
 export const load = async ({ params, fetch, cookies }) => {
-	const member = await apiRequest<Member>(
-		"GET",
-		`/users/${params.username}/members/${params.memberName}`,
-		{
-			fetch,
-			cookies,
-		},
-	);
+	try {
+		const member = await apiRequest<Member>(
+			"GET",
+			`/users/${params.username}/members/${params.memberName}`,
+			{
+				fetch,
+				cookies,
+			},
+		);
 
-	return { member };
+		return { member };
+	} catch (e) {
+		if (e instanceof ApiError) {
+			if (e.code === ErrorCode.UserNotFound) error(404, "User not found");
+			if (e.code === ErrorCode.MemberNotFound) error(404, "Member not found");
+		}
+
+		log.error("Error fetching user %s/member %s:", params.username, params.memberName, e);
+		throw e;
+	}
 };

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

@@ -6,7 +6,6 @@
 	import ProfileFields from "$components/profile/ProfileFields.svelte";
 	import { Icon } from "@sveltestrap/sveltestrap";
 	import { t } from "$lib/i18n";
-	import ProfileButtons from "$components/profile/ProfileButtons.svelte";
 
 	type Props = { data: PageData };
 	let { data }: Props = $props();
@@ -38,12 +37,4 @@
 
 	<ProfileHeader name="{data.member.name} (@{data.member.user.username})" profile={data.member} />
 	<ProfileFields profile={data.member} {allPreferences} />
-
-	<ProfileButtons
-		meUser={data.meUser}
-		user={data.member.user.username}
-		member={data.member.name}
-		sid={data.member.sid}
-		reportUrl="/report/{data.member.user.id}?member={data.member.id}"
-	/>
 </div>

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

@@ -1,60 +0,0 @@
-import { apiRequest, fastRequest } from "$api";
-import ApiError from "$api/error.js";
-import type { Member } from "$api/models/member.js";
-import { type CreateReportRequest, ReportReason } from "$api/models/moderation.js";
-import type { PartialUser, User } from "$api/models/user.js";
-import log from "$lib/log.js";
-import { redirect } from "@sveltejs/kit";
-
-export const load = async ({ parent, params, fetch, cookies, url }) => {
-	const { meUser } = await parent();
-	if (!meUser) redirect(303, "/");
-
-	let user: PartialUser;
-	let member: Member | null = null;
-	if (url.searchParams.has("member")) {
-		const resp = await apiRequest<Member>(
-			"GET",
-			`/users/${params.id}/members/${url.searchParams.get("member")}`,
-			{ fetch, cookies },
-		);
-
-		user = resp.user;
-		member = resp;
-	} else {
-		user = await apiRequest<User>("GET", `/users/${params.id}`, { fetch, cookies });
-	}
-
-	if (meUser.id === user.id) redirect(303, "/");
-
-	return { user, member };
-};
-
-export const actions = {
-	default: async ({ request, fetch, cookies }) => {
-		const body = await request.formData();
-
-		const targetIsMember = body.get("target-type") === "member";
-		const target = body.get("target-id") as string;
-		const reason = body.get("reason") as ReportReason;
-		const context = body.get("context") as string | null;
-
-		const url = targetIsMember
-			? `/moderation/report-member/${target}`
-			: `/moderation/report-user/${target}`;
-
-		try {
-			await fastRequest<CreateReportRequest>("POST", url, {
-				body: { reason, context },
-				fetch,
-				cookies,
-			});
-
-			return { ok: true, error: null };
-		} catch (e) {
-			if (e instanceof ApiError) return { ok: false, error: e.obj };
-			log.error("error reporting user or member %s:", target, e);
-			throw e;
-		}
-	},
-};

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

@@ -1,72 +0,0 @@
-<script lang="ts">
-	import { ReportReason } from "$api/models/moderation";
-	import FormStatusMarker from "$components/editor/FormStatusMarker.svelte";
-	import RequiredFieldMarker from "$components/RequiredFieldMarker.svelte";
-	import { t } from "$lib/i18n";
-	import type { ActionData, PageData } from "./$types";
-
-	type Props = { data: PageData; form: ActionData };
-	let { data, form }: Props = $props();
-
-	let name = $derived(
-		data.member ? `${data.member.name} (@${data.user.username})` : "@" + data.user.username,
-	);
-
-	let link = $derived(
-		data.member ? `/@${data.user.username}/${data.member.name}` : `/@${data.user.username}`,
-	);
-
-	console.log(data.user, !!data.member);
-
-	let reasons = $derived.by(() => {
-		const reasons = [];
-		for (const value of Object.values(ReportReason)) {
-			const key = "report." + value.toLowerCase().replaceAll("_", "-");
-			reasons.push({ key, value });
-		}
-		return reasons;
-	});
-</script>
-
-<svelte:head>
-	<title>{$t("report.title", { name })} • pronouns.cc</title>
-</svelte:head>
-
-<div class="container">
-	<form method="POST" class="w-lg-75 mx-auto">
-		<h3>{$t("report.title", { name })}</h3>
-		<FormStatusMarker {form} successMessage={$t("report.success")} />
-		<input type="hidden" name="target-type" value={data.member ? "member" : "user"} />
-		<input type="hidden" name="target-id" value={data.member ? data.member.id : data.user.id} />
-
-		<h4 class="mt-3">{$t("report.reason-label")} <RequiredFieldMarker required /></h4>
-		<div class="row row-cols-1 row-cols-lg-2">
-			{#each reasons as reason}
-				<div class="col">
-					<div class="form-check">
-						<input
-							class="form-check-input"
-							type="radio"
-							name="reason"
-							value={reason.value}
-							id="reason-{reason.value}"
-							required
-						/>
-						<label class="form-check-label" for="reason-{reason.value}">{$t(reason.key)}</label>
-					</div>
-				</div>
-			{/each}
-		</div>
-
-		<h4 class="mt-3">
-			{$t("report.context-label")}
-			<RequiredFieldMarker />
-		</h4>
-		<textarea class="form-control" name="context" style="height: 100px;" maxlength={512}></textarea>
-
-		<div class="mt-3">
-			<button type="submit" class="btn btn-danger">{$t("report.submit-button")}</button>
-			<a href={link} class="btn btn-secondary">{$t("cancel")}</a>
-		</div>
-	</form>
-</div>

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

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { Snippet } from "svelte";
-	import { page } from "$app/state";
+	import { page } from "$app/stores";
 	import { t } from "$lib/i18n";
 	import { Nav, NavLink } from "@sveltestrap/sveltestrap";
 
@@ -10,11 +10,11 @@
 	const isActive = (path: string | string[], prefix: boolean = false) =>
 		typeof path === "string"
 			? prefix
-				? page.url.pathname.startsWith(path)
-				: page.url.pathname === path
+				? $page.url.pathname.startsWith(path)
+				: $page.url.pathname === path
 			: prefix
-				? path.some((p) => page.url.pathname.startsWith(p))
-				: path.some((p) => page.url.pathname === p);
+				? path.some((p) => $page.url.pathname.startsWith(p))
+				: path.some((p) => $page.url.pathname === p);
 </script>
 
 <svelte:head>

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

@@ -1,13 +1,13 @@
 <script lang="ts">
 	import type { Snippet } from "svelte";
-	import { page } from "$app/state";
+	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;
+	const isActive = (path: string) => $page.url.pathname === path;
 
 	let name = $derived(
 		data.member.display_name === data.member.name

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

@@ -1,13 +1,13 @@
 <script lang="ts">
 	import type { Snippet } from "svelte";
-	import { page } from "$app/state";
+	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;
+	const isActive = (path: string) => $page.url.pathname === path;
 </script>
 
 <svelte:head>