{item.description}
{/if} - {#if item.secondaryDescription}{item.secondaryDescription}
{/if} + {#if item.variant === 'talent'} +
+ TIER I
+ TIER II
+
+ {:else}
+ {#if item.description}{item.description ?? 'Description is not available.'}
{item.secondaryDescription ?? 'Description is not available.'}
{item.description}
{/if} + {#if item.secondaryDescription}{item.secondaryDescription}
{/if} + {/if} {#if item.afterLines?.length}{#each item.afterLines as line}
{/if}
diff --git a/src/lib/components/ItemIconRail.svelte b/src/lib/components/ItemIconRail.svelte
index 770db18..e637084 100644
--- a/src/lib/components/ItemIconRail.svelte
+++ b/src/lib/components/ItemIconRail.svelte
@@ -1,6 +1,7 @@
-{line.label}{line.value}
{/each} { if (event.target === event.currentTarget) selected = null; }}>
-
-
-
-
-
- {#if selected.preview.badges?.length}
- {#if selected.preview.lines?.length}
+ {
+ const row = await (await database.prepare(
+ 'SELECT user_id FROM user_profiles WHERE display_name_key=? AND user_id<>?'
+ )).get(displayNameKey(displayName), exceptUserId);
+ return !row;
+}
+
+export async function createAvailableDisplayName(
+ database: Database,
+ preferredName: string,
+ userId: string,
+ placeholder = false
+): Promise {
+ if (!placeholder && await displayNameIsAvailable(database, preferredName)) return preferredName;
+ if (placeholder) {
+ const names = await (await database.prepare(
+ "SELECT display_name FROM user_profiles WHERE display_name LIKE 'Agent %'"
+ )).all();
+ let sequence = names.reduce((highest, row) => {
+ const match = /^Agent ([1-9]\d*)$/.exec(String(row.display_name));
+ return match ? Math.max(highest, Number(match[1])) : highest;
+ }, 0) + 1;
+ while (!(await displayNameIsAvailable(database, newAgentDisplayName(sequence)))) sequence += 1;
+ return newAgentDisplayName(sequence);
+ }
+ for (let suffixLength = 5; suffixLength <= 12; suffixLength += 1) {
+ const candidate = `${preferredName} ${userId.replaceAll('-', '').slice(0, suffixLength).toLowerCase()}`;
+ if (await displayNameIsAvailable(database, candidate)) return candidate;
+ }
+ throw new Error('Unable to allocate a unique display name.');
+}
+
+export async function createPublicProfileSlug(
+ database: Database,
+ displayName: string,
+ userId: string
+): Promise {
+ const base = publicProfileSlugBase(displayName, userId);
+ const existing = await (await database.prepare(
+ 'SELECT user_id FROM user_profiles WHERE public_slug=?'
+ )).get(base);
+ if (!existing || String(existing.user_id) === userId) return base;
+ return `${base.slice(0, 55).replace(/-+$/g, '')}~${userId.replaceAll('-', '').slice(0, 8).toLowerCase()}`;
+}
+
+export async function insertUserProfile(
+ database: Database,
+ userId: string,
+ preferredName: string,
+ updatedAt: string,
+ options: { placeholder?: boolean; resolveCollision?: boolean } = {}
+): Promise<{ displayName: string; publicSlug: string }> {
+ const displayName = options.placeholder || options.resolveCollision
+ ? await createAvailableDisplayName(database, preferredName, userId, Boolean(options.placeholder))
+ : preferredName;
+ const publicSlug = await createPublicProfileSlug(database, displayName, userId);
+ await (await database.prepare(`INSERT INTO user_profiles
+ (user_id,display_name,display_name_key,public_slug,updated_at) VALUES(?,?,?,?,?)`))
+ .run(userId, displayName, displayNameKey(displayName), publicSlug, updatedAt);
+ return { displayName, publicSlug };
+}
+
+export async function resolveAgentProfile(
+ database: Database,
+ identifier: string
+): Promise<{ id: string; publicSlug: string; displayName: string } | null> {
+ const row = await (await database.prepare(`SELECT users.id,
+ COALESCE(profile.public_slug,users.id) AS public_slug,
+ COALESCE(profile.display_name,users.username) AS display_name
+ FROM users LEFT JOIN user_profiles profile ON profile.user_id=users.id
+ WHERE users.id=? OR profile.public_slug=?
+ ORDER BY CASE WHEN profile.public_slug=? THEN 0 ELSE 1 END
+ LIMIT 1`)).get(identifier, identifier, identifier);
+ return row ? {
+ id: String(row.id),
+ publicSlug: String(row.public_slug),
+ displayName: String(row.display_name)
+ } : null;
+}
diff --git a/src/lib/server/auth/account-deletion.ts b/src/lib/server/auth/account-deletion.ts
index 8735644..cf33e7f 100644
--- a/src/lib/server/auth/account-deletion.ts
+++ b/src/lib/server/auth/account-deletion.ts
@@ -1,6 +1,7 @@
import type { Database } from '@tursodatabase/database';
import { randomUUID } from 'node:crypto';
import { deleteUploadedAvatar } from '$lib/server/avatars';
+import { displayNameKey } from '$lib/agents';
export async function softDeleteAccount(
database: Database,
@@ -18,6 +19,7 @@ export async function softDeleteAccount(
if (!user || user.deleted_at) return false;
const now = new Date().toISOString();
const deletedUsername = `deleted-agent-${userId.slice(0, 12)}`;
+ const deletedDisplayName = `Deleted Agent ${userId.replaceAll('-', '').slice(0, 8)}`;
await (await database.prepare(
'INSERT INTO deleted_accounts(user_id,original_username,deleted_at,deleted_by,reason) VALUES(?,?,?,?,?)'
@@ -26,15 +28,16 @@ export async function softDeleteAccount(
`UPDATE users SET username=?,login_username=NULL,password_hash=NULL,discord_id=NULL,role='user' WHERE id=?`
)).run(deletedUsername, userId);
await (await database.prepare(
- `INSERT INTO user_profiles(user_id,display_name,bio_markdown,is_public,bio_updated_at,updated_at)
- VALUES(?,?,?,0,?,?)
+ `INSERT INTO user_profiles(user_id,display_name,display_name_key,bio_markdown,is_public,bio_updated_at,updated_at)
+ VALUES(?,?,?,?,0,?,?)
ON CONFLICT(user_id) DO UPDATE SET
display_name=excluded.display_name,
+ display_name_key=excluded.display_name_key,
bio_markdown='',
is_public=0,
bio_updated_at=excluded.bio_updated_at,
updated_at=excluded.updated_at`
- )).run(userId, 'Deleted Agent', '', now, now);
+ )).run(userId, deletedDisplayName, displayNameKey(deletedDisplayName), '', now, now);
await (await database.prepare('DELETE FROM sessions WHERE user_id=?')).run(userId);
await (await database.prepare('DELETE FROM magic_link_tokens WHERE user_id=?')).run(userId);
await (await database.prepare('DELETE FROM webauthn_challenges WHERE user_id=?')).run(userId);
diff --git a/src/lib/server/auth/session.ts b/src/lib/server/auth/session.ts
index 95364b6..bac6da6 100644
--- a/src/lib/server/auth/session.ts
+++ b/src/lib/server/auth/session.ts
@@ -12,6 +12,7 @@ export type AuthUser = {
username: string;
loginUsername: string | null;
displayName: string;
+ publicSlug: string | null;
role: string;
discordLinked: boolean;
avatarUrl: string;
@@ -111,6 +112,7 @@ export async function getSessionUser(cookies: Cookies): Promise
const database = await getDatabase();
const statement = await database.prepare(`
SELECT users.id, users.username, users.login_username, COALESCE(user_profiles.display_name,users.username) AS display_name,
+ user_profiles.public_slug,
users.role, users.discord_id, user_avatars.source AS avatar_source,
user_avatars.value AS avatar_value, user_avatars.updated_at AS avatar_updated_at,
user_status.last_active_at,user_status.blocked_at,user_status.banned_until,
@@ -147,6 +149,7 @@ export async function getSessionUser(cookies: Cookies): Promise
username: String(user.username),
loginUsername: typeof user.login_username === 'string' ? user.login_username : null,
displayName: String(user.display_name),
+ publicSlug: typeof user.public_slug === 'string' ? user.public_slug : null,
role: String(user.role),
discordLinked: typeof user.discord_id === 'string',
avatarUrl: avatarUrl(user.avatar_source, user.avatar_value, String(user.id), user.avatar_updated_at)
diff --git a/src/lib/server/managed-images.test.ts b/src/lib/server/managed-images.test.ts
new file mode 100644
index 0000000..24fd70c
--- /dev/null
+++ b/src/lib/server/managed-images.test.ts
@@ -0,0 +1,139 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const { rmMock } = vi.hoisted(() => ({ rmMock: vi.fn() }));
+
+vi.mock('node:fs/promises', async (importOriginal) => ({
+ ...await importOriginal(),
+ rm: rmMock
+}));
+
+import { GAME_ICON_TYPES } from './game-data-icons';
+import { ManagedImageDeletionError, deleteManagedImage } from './managed-images';
+
+type Row = Record;
+
+class FakeDatabase {
+ images = new Map();
+ icons = new Map();
+ executed: string[] = [];
+
+ prepare(sql: string) {
+ return Promise.resolve({
+ get: async (...args: unknown[]) => {
+ if (sql.startsWith('SELECT * FROM managed_images')) return this.images.get(String(args[0]));
+ if (sql.startsWith('SELECT * FROM game_data_icons')) {
+ return this.icons.get(`${String(args[0])}:${String(args[1])}`);
+ }
+ throw new Error(`Unexpected get: ${sql}`);
+ },
+ run: async (...args: unknown[]) => {
+ if (sql.startsWith('DELETE FROM game_data_icons')) {
+ const key = `${String(args[0])}:${String(args[1])}`;
+ const row = this.icons.get(key);
+ if (row?.storage_key === args[2]) this.icons.delete(key);
+ return;
+ }
+ if (sql.startsWith('DELETE FROM managed_images')) {
+ const row = this.images.get(String(args[0]));
+ if (row?.storage_key === args[1]) this.images.delete(String(args[0]));
+ return;
+ }
+ throw new Error(`Unexpected run: ${sql}`);
+ }
+ });
+ }
+
+ async exec(sql: string) {
+ this.executed.push(sql);
+ }
+}
+
+const imageId = '11111111-1111-4111-8111-111111111111';
+const sourceId = '22222222-2222-4222-8222-222222222222';
+
+describe('deleteManagedImage', () => {
+ beforeEach(() => rmMock.mockReset().mockResolvedValue(undefined));
+
+ it.each(GAME_ICON_TYPES)('detaches and deletes an assigned %s image', async (sourceType) => {
+ const database = new FakeDatabase();
+ const storageKey = `${sourceType}-${sourceId}.webp`;
+ database.images.set(imageId, {
+ id: imageId, storage_key: storageKey,
+ source_entity_type: sourceType, source_entity_id: sourceId
+ });
+ database.icons.set(`${sourceType}:${sourceId}`, {
+ entity_type: sourceType, entity_id: sourceId, storage_key: storageKey
+ });
+
+ const deleted = await deleteManagedImage(database as never, imageId);
+
+ expect(deleted?.sourceIcon).toMatchObject({ entity_type: sourceType, entity_id: sourceId });
+ expect(database.images.has(imageId)).toBe(false);
+ expect(database.icons.has(`${sourceType}:${sourceId}`)).toBe(false);
+ expect(database.executed).toEqual(['BEGIN', 'COMMIT']);
+ expect(rmMock).toHaveBeenCalledOnce();
+ });
+
+ it('deletes a standalone library image', async () => {
+ const database = new FakeDatabase();
+ database.images.set(imageId, {
+ id: imageId, storage_key: `library-${imageId}.webp`,
+ source_entity_type: null, source_entity_id: null
+ });
+
+ const deleted = await deleteManagedImage(database as never, imageId);
+
+ expect(deleted?.sourceIcon).toBeNull();
+ expect(database.images.has(imageId)).toBe(false);
+ expect(database.icons.size).toBe(0);
+ expect(rmMock).toHaveBeenCalledOnce();
+ });
+
+ it('deletes an orphaned linked image without touching another assignment', async () => {
+ const database = new FakeDatabase();
+ database.images.set(imageId, {
+ id: imageId, storage_key: `talent-${sourceId}.webp`,
+ source_entity_type: 'talent', source_entity_id: sourceId
+ });
+
+ const deleted = await deleteManagedImage(database as never, imageId);
+
+ expect(deleted?.sourceIcon).toBeNull();
+ expect(database.images.has(imageId)).toBe(false);
+ expect(database.executed).toEqual(['BEGIN', 'COMMIT']);
+ });
+
+ it('fails closed when the library and source rows reference different files', async () => {
+ const database = new FakeDatabase();
+ database.images.set(imageId, {
+ id: imageId, storage_key: `talent-${sourceId}.webp`,
+ source_entity_type: 'talent', source_entity_id: sourceId
+ });
+ database.icons.set(`talent:${sourceId}`, {
+ entity_type: 'talent', entity_id: sourceId,
+ storage_key: 'talent-33333333-3333-4333-8333-333333333333.webp'
+ });
+
+ await expect(deleteManagedImage(database as never, imageId)).rejects.toThrow(ManagedImageDeletionError);
+ expect(database.images.has(imageId)).toBe(true);
+ expect(database.icons.has(`talent:${sourceId}`)).toBe(true);
+ expect(database.executed).toEqual([]);
+ expect(rmMock).not.toHaveBeenCalled();
+ });
+
+ it.each([
+ { source_entity_type: 'talent', source_entity_id: null },
+ { source_entity_type: null, source_entity_id: sourceId },
+ { source_entity_type: 'unknown', source_entity_id: sourceId }
+ ])('rejects an invalid source relationship: $source_entity_type / $source_entity_id', async (source) => {
+ const database = new FakeDatabase();
+ database.images.set(imageId, {
+ id: imageId, storage_key: `library-${imageId}.webp`, ...source
+ });
+
+ await expect(deleteManagedImage(database as never, imageId)).rejects.toThrow(ManagedImageDeletionError);
+ expect(database.images.has(imageId)).toBe(true);
+ expect(database.executed).toEqual([]);
+ expect(rmMock).not.toHaveBeenCalled();
+ });
+});
diff --git a/src/lib/server/managed-images.ts b/src/lib/server/managed-images.ts
index f47395b..ffdf71a 100644
--- a/src/lib/server/managed-images.ts
+++ b/src/lib/server/managed-images.ts
@@ -1,7 +1,8 @@
import type { Database } from '@tursodatabase/database';
-import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { mkdir, readFile, rm, writeFile } from 'node:fs/promises';
import path from 'node:path';
import sharp from 'sharp';
+import { GAME_ICON_TYPES, type GameDataIconType } from './game-data-icons';
import { BackgroundRemovalError, removeBackgroundPreview } from './remove-background';
export const MANAGED_IMAGE_CATEGORIES = [
@@ -14,6 +15,7 @@ const ID_PATTERN = /^[0-9a-f-]{36}$/i;
const KEY_PATTERN = /^(?:library|talent|brand_set|os_protocol|skill_chip|specialization|specialization_ability|specialization_node)-[0-9a-f-]{36}\.webp$/i;
export class ManagedImageValidationError extends Error {}
+export class ManagedImageDeletionError extends Error {}
export function managedImageStorageDirectory() {
return path.resolve(process.env.TDR_GAME_ICON_STORAGE_PATH || path.join(process.cwd(), 'data', 'game-icons'));
@@ -102,6 +104,44 @@ export async function saveManagedImageFile(id: string, output: Buffer) {
return key;
}
+export async function deleteManagedImage(database: Database, id: string) {
+ const image = await (await database.prepare('SELECT * FROM managed_images WHERE id=?')).get(id);
+ if (!image) return null;
+ if (typeof image.storage_key !== 'string') throw new ManagedImageDeletionError('Managed image is missing its storage key.');
+
+ const sourceType = typeof image.source_entity_type === 'string' ? image.source_entity_type : null;
+ const sourceId = typeof image.source_entity_id === 'string' ? image.source_entity_id : null;
+ if (Boolean(sourceType) !== Boolean(sourceId)) {
+ throw new ManagedImageDeletionError('This image has an incomplete source assignment and cannot be deleted safely.');
+ }
+ if (sourceType && !GAME_ICON_TYPES.includes(sourceType as GameDataIconType)) {
+ throw new ManagedImageDeletionError('This image has an unsupported source assignment and cannot be deleted safely.');
+ }
+
+ const sourceIcon = sourceType && sourceId
+ ? await (await database.prepare('SELECT * FROM game_data_icons WHERE entity_type=? AND entity_id=?')).get(sourceType, sourceId) ?? null
+ : null;
+ if (sourceIcon && sourceIcon.storage_key !== image.storage_key) {
+ throw new ManagedImageDeletionError('The library image and its source assignment reference different files. Resolve the assignment before deleting.');
+ }
+
+ await database.exec('BEGIN');
+ try {
+ if (sourceIcon && sourceType && sourceId) {
+ await (await database.prepare(
+ 'DELETE FROM game_data_icons WHERE entity_type=? AND entity_id=? AND storage_key=?'
+ )).run(sourceType, sourceId, image.storage_key);
+ }
+ await (await database.prepare('DELETE FROM managed_images WHERE id=? AND storage_key=?')).run(id, image.storage_key);
+ await database.exec('COMMIT');
+ } catch (error) {
+ await database.exec('ROLLBACK').catch(() => undefined);
+ throw error;
+ }
+ await rm(storagePath(image.storage_key), { force: true });
+ return { image, sourceIcon };
+}
+
export async function readManagedImage(database: Database, id: string) {
if (!ID_PATTERN.test(id)) return null;
const row = await (await database.prepare('SELECT storage_key FROM managed_images WHERE id=?')).get(id);
diff --git a/src/lib/server/notification-sort.test.ts b/src/lib/server/notification-sort.test.ts
new file mode 100644
index 0000000..d21daca
--- /dev/null
+++ b/src/lib/server/notification-sort.test.ts
@@ -0,0 +1,22 @@
+import { describe, expect, it } from 'vitest';
+import { notificationOrderBy, parseNotificationSort, parseNotificationState } from './notification-sort';
+
+describe('notification sorting', () => {
+ it('defaults unknown and missing filters to unread oldest-first', () => {
+ expect(parseNotificationState('unexpected')).toBe('unread');
+ expect(parseNotificationState(null)).toBe('unread');
+ expect(parseNotificationSort('unexpected')).toBe('oldest');
+ expect(parseNotificationSort(null)).toBe('oldest');
+ });
+
+ it('maps newest and oldest to chronological timestamp directions', () => {
+ expect(notificationOrderBy('newest')).toContain('unixepoch(n.created_at) DESC');
+ expect(notificationOrderBy('oldest')).toContain('unixepoch(n.created_at) ASC');
+ });
+
+ it('keeps unread messages first and sorts each state newest first', () => {
+ const expression = notificationOrderBy('unread');
+ expect(expression).toContain('CASE WHEN n.read_at IS NULL THEN 0 ELSE 1 END');
+ expect(expression).toContain('unixepoch(n.created_at) DESC');
+ });
+});
diff --git a/src/lib/server/notification-sort.ts b/src/lib/server/notification-sort.ts
new file mode 100644
index 0000000..217f38e
--- /dev/null
+++ b/src/lib/server/notification-sort.ts
@@ -0,0 +1,27 @@
+export const NOTIFICATION_SORTS = ['newest', 'oldest', 'unread'] as const;
+export const NOTIFICATION_STATES = ['all', 'unread', 'read'] as const;
+
+export type NotificationSort = (typeof NOTIFICATION_SORTS)[number];
+export type NotificationState = (typeof NOTIFICATION_STATES)[number];
+
+export function parseNotificationSort(value: unknown): NotificationSort {
+ const requested = String(value ?? '');
+ return NOTIFICATION_SORTS.includes(requested as NotificationSort)
+ ? requested as NotificationSort
+ : 'oldest';
+}
+
+export function parseNotificationState(value: unknown): NotificationState {
+ const requested = String(value ?? '');
+ return NOTIFICATION_STATES.includes(requested as NotificationState)
+ ? requested as NotificationState
+ : 'unread';
+}
+
+export function notificationOrderBy(sort: NotificationSort) {
+ return {
+ newest: 'unixepoch(n.created_at) DESC, n.created_at DESC, n.id DESC',
+ oldest: 'unixepoch(n.created_at) ASC, n.created_at ASC, n.id ASC',
+ unread: 'CASE WHEN n.read_at IS NULL THEN 0 ELSE 1 END, unixepoch(n.created_at) DESC, n.created_at DESC, n.id DESC'
+ }[sort];
+}
diff --git a/src/routes/account/+page.server.ts b/src/routes/account/+page.server.ts
index f613128..eb31f48 100644
--- a/src/routes/account/+page.server.ts
+++ b/src/routes/account/+page.server.ts
@@ -16,6 +16,11 @@ import {
moderateCommunityText,
recordCommunityModerationScan
} from '$lib/server/community-moderation';
+import { agentProfileHref, displayNameKey } from '$lib/agents';
+import {
+ createPublicProfileSlug,
+ displayNameIsAvailable
+} from '$lib/server/agent-profiles';
export const load: PageServerLoad = async ({ cookies, url }) => {
const user = await getSessionUser(cookies);
@@ -39,7 +44,7 @@ export const load: PageServerLoad = async ({ cookies, url }) => {
(await database.prepare(`SELECT COUNT(*) AS count FROM notifications n
LEFT JOIN notification_preferences p ON p.user_id=n.user_id AND p.category=n.category
WHERE n.user_id=? AND n.read_at IS NULL AND (n.mandatory=1 OR COALESCE(p.in_app_enabled,1)=1)`)).get(user.id),
- (await database.prepare(`SELECT profile.bio_markdown,profile.is_public,profile.bio_updated_at,
+ (await database.prepare(`SELECT profile.bio_markdown,profile.is_public,profile.bio_updated_at,profile.public_slug,
COALESCE(moderation.bio_hidden,0) AS bio_hidden,moderation.reason AS moderation_reason
FROM user_profiles profile
LEFT JOIN profile_moderation moderation ON moderation.user_id=profile.user_id
@@ -112,7 +117,10 @@ export const load: PageServerLoad = async ({ cookies, url }) => {
bioReviewReason: pendingBioRevision?.reason ? String(pendingBioRevision.reason) : null,
pendingBioSubmittedAt: pendingBioRevision?.created_at ? String(pendingBioRevision.created_at) : null,
bioUpdatedAt: profile?.bio_updated_at ? String(profile.bio_updated_at) : null,
- href: `/agents/${encodeURIComponent(user.id)}`
+ href: agentProfileHref({
+ id: user.id,
+ publicSlug: typeof profile?.public_slug === 'string' ? profile.public_slug : null
+ })
}
};
};
@@ -334,9 +342,18 @@ export const actions: Actions = {
return fail(400, { displayNameError: 'Use 2–40 visible characters on one line.' });
}
const now = new Date().toISOString(), database = await getDatabase();
- await (await database.prepare(`INSERT INTO user_profiles(user_id,display_name,updated_at) VALUES(?,?,?)
- ON CONFLICT(user_id) DO UPDATE SET display_name=excluded.display_name,updated_at=excluded.updated_at`))
- .run(user.id, displayName, now);
+ if (!(await displayNameIsAvailable(database, displayName, user.id))) {
+ return fail(409, { displayNameError: 'That display name is already in use.' });
+ }
+ const publicSlug = await createPublicProfileSlug(database, displayName, user.id);
+ await (await database.prepare(`INSERT INTO user_profiles
+ (user_id,display_name,display_name_key,public_slug,updated_at) VALUES(?,?,?,?,?)
+ ON CONFLICT(user_id) DO UPDATE SET
+ display_name=excluded.display_name,
+ display_name_key=excluded.display_name_key,
+ public_slug=excluded.public_slug,
+ updated_at=excluded.updated_at`))
+ .run(user.id, displayName, displayNameKey(displayName), publicSlug, now);
return { displayNameChanged: true };
},
changePassword: async ({ request, cookies }) => {
diff --git a/src/routes/account/+page.svelte b/src/routes/account/+page.svelte
index 0d1954c..58684ad 100644
--- a/src/routes/account/+page.svelte
+++ b/src/routes/account/+page.svelte
@@ -107,7 +107,7 @@
{user.displayName} — SHD.build
- 
+
{#if data.chooseDisplayName}
Visible to other agents. Unicode, spaces, and non-ASCII writing systems are supported.{#if form?.displayNameError}
+ Unique across SHD.build and used to create your readable public-profile address. Unicode, spaces, and non-ASCII writing systems are supported.{#if form?.displayNameError}
| null | undefined) => {
return !row || Boolean(row.deleted_at || row.blocked_at || banned);
};
-const commentHref = (targetType: string, slug: unknown, targetId: string) => {
- if (targetType === 'profile') return `/agents/${encodeURIComponent(targetId)}#profile-comments`;
+const commentHref = (targetType: string, slug: unknown, targetId: string, targetPublicSlug: unknown) => {
+ if (targetType === 'profile') {
+ return agentProfileHref({
+ id: targetId,
+ publicSlug: typeof targetPublicSlug === 'string' ? targetPublicSlug : null
+ }, 'profile-comments');
+ }
return `/builds/${encodeURIComponent(String(slug ?? ''))}#comments`;
};
export const load: PageServerLoad = async ({ params, cookies }) => {
const database = await getDatabase();
const viewer = await getSessionUser(cookies);
+ const resolved = await resolveAgentProfile(database, params.id);
+ if (!resolved) error(404, 'Agent profile not found');
+ const agentId = resolved.id;
const agent = await (await database.prepare(`SELECT users.id,
COALESCE(profile.display_name,users.username) AS display_name,
- profile.bio_markdown,profile.is_public,profile.bio_updated_at,
+ profile.public_slug,profile.bio_markdown,profile.is_public,profile.bio_updated_at,
COALESCE(moderation.bio_hidden,0) AS bio_hidden,
avatar.source AS avatar_source,avatar.value AS avatar_value,avatar.updated_at AS avatar_updated_at,
status.blocked_at,status.banned_until,deleted.deleted_at
@@ -42,26 +52,34 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
LEFT JOIN user_avatars avatar ON avatar.user_id=users.id
LEFT JOIN user_status status ON status.user_id=users.id
LEFT JOIN deleted_accounts deleted ON deleted.user_id=users.id
- WHERE users.id=?`)).get(params.id);
- const isSelf = viewer?.id === params.id;
+ WHERE users.id=?`)).get(agentId);
+ const isSelf = viewer?.id === agentId;
if (
unavailable(agent)
|| (!Boolean(agent?.is_public) && !isSelf)
) error(404, 'Agent profile not found');
+ if (params.id !== String(agent.public_slug)) {
+ redirect(308, agentProfileHref({ id: agentId, publicSlug: String(agent.public_slug) }));
+ }
- const [buildRows, guideRows, authoredCommentRows, profileCommentRows, authoredCount, profileCommentCount, contentCounts] =
+ const [roleRows, buildRows, guideRows, authoredCommentRows, profileCommentRows, authoredCount, profileCommentCount, contentCounts] =
await Promise.all([
+ (await database.prepare(`SELECT roles.name FROM user_roles
+ JOIN roles ON roles.id=user_roles.role_id
+ WHERE user_roles.user_id=?
+ ORDER BY roles.name COLLATE NOCASE,roles.id`)).all(agentId),
(await database.prepare(`SELECT id,slug,title,COALESCE(summary,'') AS summary,updated_at
FROM builds WHERE owner_id=? AND visibility='public'
AND (guide_body IS NULL OR length(trim(guide_body))=0)
- ORDER BY updated_at DESC LIMIT 60`)).all(params.id),
+ ORDER BY updated_at DESC LIMIT 60`)).all(agentId),
(await database.prepare(`SELECT id,slug,title,COALESCE(summary,'') AS summary,updated_at
FROM builds WHERE owner_id=? AND visibility='public'
AND guide_body IS NOT NULL AND length(trim(guide_body))>0
- ORDER BY updated_at DESC LIMIT 60`)).all(params.id),
+ ORDER BY updated_at DESC LIMIT 60`)).all(agentId),
(await database.prepare(`SELECT comments.id,comments.body_markdown,comments.created_at,
thread.target_type,thread.target_id,builds.title AS build_title,builds.slug,
- COALESCE(target_profile.display_name,target_user.username) AS target_display_name
+ COALESCE(target_profile.display_name,target_user.username) AS target_display_name,
+ target_profile.public_slug AS target_public_slug
FROM comments
JOIN comment_threads thread ON thread.id=comments.thread_id
LEFT JOIN builds ON builds.id=thread.target_id AND thread.target_type IN ('build','guide')
@@ -75,9 +93,10 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
AND target_deleted.user_id IS NULL AND target_status.blocked_at IS NULL
AND (target_status.banned_until IS NULL OR target_status.banned_until<=?))
)
- ORDER BY comments.created_at DESC LIMIT 50`)).all(params.id, new Date().toISOString()),
+ ORDER BY comments.created_at DESC LIMIT 50`)).all(agentId, new Date().toISOString()),
(await database.prepare(`SELECT comments.id,comments.author_id,comments.body_markdown,
comments.created_at,COALESCE(profile.display_name,users.username,'Deleted Agent') AS display_name,
+ profile.public_slug,
avatar.source AS avatar_source,avatar.value AS avatar_value,avatar.updated_at AS avatar_updated_at
FROM comment_threads thread
JOIN comments ON comments.thread_id=thread.id AND comments.status='visible'
@@ -85,7 +104,7 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
LEFT JOIN user_profiles profile ON profile.user_id=users.id
LEFT JOIN user_avatars avatar ON avatar.user_id=users.id
WHERE thread.target_type='profile' AND thread.target_id=?
- ORDER BY comments.created_at DESC LIMIT 100`)).all(params.id),
+ ORDER BY comments.created_at DESC LIMIT 100`)).all(agentId),
(await database.prepare(`SELECT COUNT(*) AS count FROM comments
JOIN comment_threads thread ON thread.id=comments.thread_id
LEFT JOIN builds ON builds.id=thread.target_id AND thread.target_type IN ('build','guide')
@@ -98,28 +117,30 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
OR (thread.target_type='profile' AND COALESCE(target_profile.is_public,0)=1
AND target_deleted.user_id IS NULL AND target_status.blocked_at IS NULL
AND (target_status.banned_until IS NULL OR target_status.banned_until<=?))
- )`)).get(params.id, new Date().toISOString()),
+ )`)).get(agentId, new Date().toISOString()),
(await database.prepare(`SELECT COUNT(*) AS count FROM comments
JOIN comment_threads thread ON thread.id=comments.thread_id
WHERE thread.target_type='profile' AND thread.target_id=? AND comments.status='visible'`))
- .get(params.id),
+ .get(agentId),
(await database.prepare(`SELECT
SUM(CASE WHEN guide_body IS NULL OR length(trim(guide_body))=0 THEN 1 ELSE 0 END) AS builds,
SUM(CASE WHEN guide_body IS NOT NULL AND length(trim(guide_body))>0 THEN 1 ELSE 0 END) AS guides
- FROM builds WHERE owner_id=? AND visibility='public'`)).get(params.id)
+ FROM builds WHERE owner_id=? AND visibility='public'`)).get(agentId)
]);
return {
agent: {
id: String(agent.id),
displayName: String(agent.display_name),
+ publicSlug: String(agent.public_slug),
avatarUrl: avatarUrl(
agent.avatar_source,
agent.avatar_value,
String(agent.id),
agent.avatar_updated_at
),
- bioHtml: agent.bio_hidden ? '' : renderUserMarkdown(agent.bio_markdown)
+ bioHtml: agent.bio_hidden ? '' : renderUserMarkdown(agent.bio_markdown),
+ roles: roleRows.map((role) => String(role.name))
},
counts: {
builds: Number(contentCounts?.builds ?? 0),
@@ -152,7 +173,7 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
targetTitle: targetType === 'profile'
? `${String(comment.target_display_name ?? 'Agent')} profile`
: String(comment.build_title ?? 'Community content'),
- targetHref: commentHref(targetType, comment.slug, targetId)
+ targetHref: commentHref(targetType, comment.slug, targetId, comment.target_public_slug)
};
}),
profileComments: profileCommentRows.map((comment) => ({
@@ -162,6 +183,7 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
author: {
id: String(comment.author_id),
displayName: String(comment.display_name),
+ publicSlug: comment.public_slug ? String(comment.public_slug) : null,
avatarUrl: avatarUrl(
comment.avatar_source,
comment.avatar_value,
@@ -195,6 +217,9 @@ export const actions: Actions = {
});
}
const database = await getDatabase();
+ const owner = await resolveAgentProfile(database, params.id);
+ if (!owner) return fail(404, { profileCommentError: 'Agent profile not found.' });
+ const agentId = owner.id;
const moderationPolicy = await getCommunityModerationPolicy();
const now = new Date();
const rows = await (await database.prepare(`SELECT users.id,
@@ -204,9 +229,9 @@ export const actions: Actions = {
LEFT JOIN user_profiles profile ON profile.user_id=users.id
LEFT JOIN user_status status ON status.user_id=users.id
LEFT JOIN deleted_accounts deleted ON deleted.user_id=users.id
- WHERE users.id IN (?,?)`)).all(commenter.id, params.id);
+ WHERE users.id IN (?,?)`)).all(commenter.id, agentId);
const commenterState = rows.find((row) => row.id === commenter.id);
- const ownerState = rows.find((row) => row.id === params.id);
+ const ownerState = rows.find((row) => row.id === agentId);
if (unavailable(commenterState)) {
return fail(403, { profileCommentError: 'This account cannot post comments.' });
}
@@ -218,7 +243,7 @@ export const actions: Actions = {
FROM comments JOIN comment_threads thread ON thread.id=comments.thread_id
WHERE comments.author_id=? AND comments.status IN ('visible','pending_review')
AND thread.target_type='profile' AND thread.target_id=?
- ORDER BY comments.created_at DESC LIMIT 1`)).get(commenter.id, params.id);
+ ORDER BY comments.created_at DESC LIMIT 1`)).get(commenter.id, agentId);
if (typeof recent?.created_at === 'string') {
const elapsed = (now.getTime() - new Date(recent.created_at).getTime()) / 1_000;
if (elapsed < RAPID_COMMENT_SECONDS) {
@@ -239,10 +264,10 @@ export const actions: Actions = {
const proposedThreadId = randomUUID();
await (await database.prepare(`INSERT OR IGNORE INTO comment_threads
(id,target_type,target_id,created_at) VALUES(?,'profile',?,?)`))
- .run(proposedThreadId, params.id, createdAt);
+ .run(proposedThreadId, agentId, createdAt);
const thread = await (await database.prepare(
"SELECT id FROM comment_threads WHERE target_type='profile' AND target_id=?"
- )).get(params.id);
+ )).get(agentId);
if (!thread?.id) return fail(500, { profileCommentError: 'The profile thread could not be opened.' });
const commentId = randomUUID();
await (await database.prepare(`INSERT INTO comments
@@ -255,17 +280,18 @@ export const actions: Actions = {
authorId: commenter.id,
result: moderation
});
- if (commentStatus === 'visible' && commenter.id !== params.id) {
+ if (commentStatus === 'visible' && commenter.id !== agentId) {
+ const profileLink = agentProfileHref(owner, 'profile-comments');
await createNotification({
- userId: params.id,
+ userId: agentId,
category: 'comments',
source: 'agent',
title: 'New profile comment',
body: `${commenter.displayName} posted a comment on your Agent profile.`,
- link: `/agents/${encodeURIComponent(params.id)}#profile-comments`,
+ link: profileLink,
actions: [{
label: 'VIEW COMMENT',
- href: `/agents/${encodeURIComponent(params.id)}#profile-comments`
+ href: profileLink
}]
});
}
@@ -283,10 +309,12 @@ export const actions: Actions = {
const commentId = String((await request.formData()).get('commentId') ?? '').trim();
if (!commentId) return fail(400, { profileCommentError: 'Choose a comment to remove.' });
const database = await getDatabase();
+ const owner = await resolveAgentProfile(database, params.id);
+ if (!owner) return fail(404, { profileCommentError: 'Agent profile not found.' });
const comment = await (await database.prepare(`SELECT comments.id,comments.author_id
FROM comments JOIN comment_threads thread ON thread.id=comments.thread_id
WHERE comments.id=? AND comments.status='visible'
- AND thread.target_type='profile' AND thread.target_id=?`)).get(commentId, params.id);
+ AND thread.target_type='profile' AND thread.target_id=?`)).get(commentId, owner.id);
if (!comment) return fail(404, { profileCommentError: 'That comment is no longer available.' });
if (comment.author_id !== viewer.id) {
return fail(403, { profileCommentError: 'You can remove only your own comment.' });
@@ -326,22 +354,25 @@ export const actions: Actions = {
return failure(400, 'Report details may contain up to 500 visible characters.');
}
const database = await getDatabase();
+ const owner = await resolveAgentProfile(database, params.id);
+ if (!owner) return failure(404, 'Agent profile not found.');
+ const agentId = owner.id;
if (contentType === 'comment') {
const comment = await (await database.prepare(`SELECT comments.author_id
FROM comments JOIN comment_threads thread ON thread.id=comments.thread_id
WHERE comments.id=? AND comments.status='visible'
- AND thread.target_type='profile' AND thread.target_id=?`)).get(contentId, params.id);
+ AND thread.target_type='profile' AND thread.target_id=?`)).get(contentId, agentId);
if (!comment) return failure(404, 'That comment is no longer available.');
if (String(comment.author_id) === reporter.id) return failure(400, 'You cannot report your own comment.');
} else {
- if (contentId !== params.id) return failure(400, 'That profile content does not match this Agent.');
- if (reporter.id === params.id) return failure(400, 'You cannot report your own profile content.');
+ if (contentId !== agentId) return failure(400, 'That profile content does not match this Agent.');
+ if (reporter.id === agentId) return failure(400, 'You cannot report your own profile content.');
const profile = await (await database.prepare(`SELECT profile.bio_markdown,profile.is_public,
COALESCE(moderation.bio_hidden,0) AS bio_hidden,avatar.source AS avatar_source
FROM user_profiles profile
LEFT JOIN profile_moderation moderation ON moderation.user_id=profile.user_id
LEFT JOIN user_avatars avatar ON avatar.user_id=profile.user_id
- WHERE profile.user_id=?`)).get(params.id);
+ WHERE profile.user_id=?`)).get(agentId);
if (!profile?.is_public) return failure(404, 'That profile is no longer available.');
if (contentType === 'profile_bio' && (profile.bio_hidden || !String(profile.bio_markdown ?? '').trim())) {
return failure(404, 'That biography is no longer available.');
@@ -359,7 +390,7 @@ export const actions: Actions = {
});
if (!report) return failure(409, 'You already have a pending report for this content.');
if (contentType === 'avatar') {
- await queueCurrentAvatarReview(database, params.id, { origin: 'user_report' });
+ await queueCurrentAvatarReview(database, agentId, { origin: 'user_report' });
}
return {
userReportSaved: true,
diff --git a/src/routes/agents/[id]/+page.svelte b/src/routes/agents/[id]/+page.svelte
index 6df6c0e..e367fe1 100644
--- a/src/routes/agents/[id]/+page.svelte
+++ b/src/routes/agents/[id]/+page.svelte
@@ -6,12 +6,15 @@
import ModerationDisclosure from '$lib/components/ModerationDisclosure.svelte';
import PageBreadcrumb from '$lib/components/PageBreadcrumb.svelte';
import PendingForm from '$lib/components/PendingForm.svelte';
+ import RoleBadgeList from '$lib/components/RoleBadgeList.svelte';
type PublicAgent = {
id: string;
displayName: string;
+ publicSlug: string;
avatarUrl: string;
bioHtml: string;
+ roles: string[];
};
type PublicContent = {
id: string;
@@ -32,7 +35,7 @@
id: string;
bodyHtml: string;
createdAt: string;
- author: { id: string; displayName: string; avatarUrl: string };
+ author: { id: string; displayName: string; publicSlug: string | null; avatarUrl: string };
canDelete: boolean;
canReport: boolean;
};
@@ -76,7 +79,10 @@
-
DATABASE QUICK VIEW{selected.preview.name}
{selected.preview.kicker}
- {selected.preview.name}
{#each selected.preview.badges as badge}{badge.label}{/each}
{/if}
- {#each selected.preview.lines as line}
{/if}
- {#if selected.preview.description}{line.label}{line.value}
{/each}{selected.preview.description}
{/if} - {#if selected.preview.secondaryDescription}{selected.preview.secondaryDescription}
{/if} - {#if selected.preview.afterLines?.length}{#each selected.preview.afterLines as line}
{/if}
- {#if selected.preview.actions?.length}{/if}
- {line.label}{line.value}
{/each} { if (event.target === event.currentTarget) void closePreview(); }}>
+
{/if}
diff --git a/src/lib/components/RoleBadgeList.svelte b/src/lib/components/RoleBadgeList.svelte
new file mode 100644
index 0000000..84bf8c7
--- /dev/null
+++ b/src/lib/components/RoleBadgeList.svelte
@@ -0,0 +1,31 @@
+
+
+{#if visibleRoles.length}
+
+
DATABASE QUICK VIEW{selected.preview.name}
-
+ {#each visibleRoles as role}
+
- {role} + {/each} +
{data.account.builds.length}BUILDS
{data.account.guides.length}GUIDES
{data.account.favorites.length}FAVORITES
{data.account.ratings.length}RATED
{data.account.notificationUnread}INBOXIDENTITY SETUPChoose the SHD.build display name other agents will see. Unicode characters are supported.
{/if}
@@ -168,7 +168,7 @@
{/if}
PUBLIC IDENTITY
DISPLAY NAME
-{form.displayNameError}
{/if}{form.displayNameError}
{/if}FIELD DOSSIER
PUBLIC BIO
{#if data.profile.bioHidden} diff --git a/src/routes/account/notifications/+page.server.ts b/src/routes/account/notifications/+page.server.ts index b967d35..1415363 100644 --- a/src/routes/account/notifications/+page.server.ts +++ b/src/routes/account/notifications/+page.server.ts @@ -5,16 +5,15 @@ import { getPagination, getRegistrySearch } from '$lib/server/pagination'; import { NOTIFICATION_CATEGORIES } from '$lib/server/notifications'; import { getPermissions } from '$lib/server/auth/authorization'; import { OVERSIGHT_NOTIFICATION_CATEGORIES, OVERSIGHT_NOTIFICATION_FREQUENCIES } from '$lib/server/oversight-notifications'; +import { notificationOrderBy, parseNotificationSort, parseNotificationState } from '$lib/server/notification-sort'; import type { Actions, PageServerLoad } from './$types'; export const load: PageServerLoad = async ({ cookies, url }) => { const user = await getSessionUser(cookies); if (!user) redirect(303, '/sign-in'); const database = await getDatabase(); - const requestedState = String(url.searchParams.get('state') ?? 'all'); - const state = ['all', 'unread', 'read'].includes(requestedState) ? requestedState : 'all'; - const requestedSort = String(url.searchParams.get('sort') ?? 'newest'); - const sort = ['newest', 'oldest', 'unread'].includes(requestedSort) ? requestedSort : 'newest'; + const state = parseNotificationState(url.searchParams.get('state')); + const sort = parseNotificationSort(url.searchParams.get('sort')); const { search, pattern } = getRegistrySearch(url); const conditions = ['n.user_id=?', '(n.mandatory=1 OR COALESCE(p.in_app_enabled,1)=1)']; const args: unknown[] = [user.id]; @@ -27,11 +26,7 @@ export const load: PageServerLoad = async ({ cookies, url }) => { args.push(pattern, pattern, pattern); } const where = `WHERE ${conditions.join(' AND ')}`; - const orderBy = { - newest: 'n.created_at DESC, n.id DESC', - oldest: 'n.created_at ASC, n.id ASC', - unread: 'CASE WHEN n.read_at IS NULL THEN 0 ELSE 1 END, n.created_at DESC, n.id DESC' - }[sort]; + const orderBy = notificationOrderBy(sort); const total = Number((await (await database.prepare(`SELECT COUNT(*) AS total FROM notifications n LEFT JOIN notification_preferences p ON p.user_id=n.user_id AND p.category=n.category ${where}`)).get(...args))?.total ?? 0); const pagination = getPagination(url, total); const notifications = await (await database.prepare(`SELECT n.* FROM notifications n diff --git a/src/routes/agents/[id]/+page.server.ts b/src/routes/agents/[id]/+page.server.ts index 6b29308..42a796d 100644 --- a/src/routes/agents/[id]/+page.server.ts +++ b/src/routes/agents/[id]/+page.server.ts @@ -9,9 +9,11 @@ import { createUserContentReport, recordCommunityModerationScan } from '$lib/server/community-moderation'; -import { error, fail } from '@sveltejs/kit'; +import { error, fail, redirect } from '@sveltejs/kit'; import { randomUUID } from 'node:crypto'; import { queueCurrentAvatarReview } from '$lib/server/avatars'; +import { agentProfileHref } from '$lib/agents'; +import { resolveAgentProfile } from '$lib/server/agent-profiles'; import type { Actions, PageServerLoad } from './$types'; const COMMENT_MAX_CHARACTERS = 2_000; @@ -22,17 +24,25 @@ const unavailable = (row: Record
+
{#if data.viewer.canReportProfile}{/if}
{#if data.viewer.isSelf}EDIT MY PROFILE →{/if}
@@ -221,7 +227,7 @@
diff --git a/src/routes/isac/users/+page.svelte b/src/routes/isac/users/+page.svelte
index 4f1d378..fc99245 100644
--- a/src/routes/isac/users/+page.svelte
+++ b/src/routes/isac/users/+page.svelte
@@ -1,6 +1,7 @@