Fix lint, make design more consistent, add license texts,

big changes

.gitea/workflows/release-draft.yml

@@ -67,8 +67,10 @@ jobs:
 
       - name: Build application
         run: |
-          npx esbuild node_modules/@timephy/rnnoise-wasm/dist/NoiseSuppressorWorklet.js --bundle --format=esm --outfile=public/rnnoise-worklet.js
+          npx esbuild node_modules/@timephy/rnnoise-wasm/dist/NoiseSuppressorWorklet.js --bundle --format=esm --outfile=toju-app/public/rnnoise-worklet.js
+          cd toju-app
           npx ng build --configuration production --base-href='./'
+          cd ..
           npx --package typescript tsc -p tsconfig.electron.json
           cd server
           node ../tools/sync-server-build-version.js
@@ -120,8 +122,10 @@ jobs:
 
       - name: Build application
         run: |
-          npx esbuild node_modules/@timephy/rnnoise-wasm/dist/NoiseSuppressorWorklet.js --bundle --format=esm --outfile=public/rnnoise-worklet.js
+          npx esbuild node_modules/@timephy/rnnoise-wasm/dist/NoiseSuppressorWorklet.js --bundle --format=esm --outfile=toju-app/public/rnnoise-worklet.js
+          Push-Location "toju-app"
           npx ng build --configuration production --base-href='./'
+          Pop-Location
           npx --package typescript tsc -p tsconfig.electron.json
           Push-Location server
           node ../tools/sync-server-build-version.js

.gitignore

@@ -53,3 +53,6 @@ Thumbs.db
 .certs/
 /server/data/variables.json
 dist-server/*
+
+AGENTS.md
+doc/**

dev.sh

@@ -20,12 +20,12 @@ if [ "$SSL" = "true" ]; then
     "$DIR/generate-cert.sh"
   fi
 
-  NG_SERVE="ng serve --host=0.0.0.0 --ssl --ssl-cert=.certs/localhost.crt --ssl-key=.certs/localhost.key"
+  NG_SERVE="cd toju-app && npx ng serve --host=0.0.0.0 --ssl --ssl-cert=../.certs/localhost.crt --ssl-key=../.certs/localhost.key"
   WAIT_URL="https://localhost:4200"
   HEALTH_URL="https://localhost:3001/api/health"
   export NODE_TLS_REJECT_UNAUTHORIZED=0
 else
-  NG_SERVE="ng serve --host=0.0.0.0"
+  NG_SERVE="cd toju-app && npx ng serve --host=0.0.0.0"
   WAIT_URL="http://localhost:4200"
   HEALTH_URL="http://localhost:3001/api/health"
 fi

electron/app/lifecycle.ts

@@ -7,7 +7,13 @@ import {
   destroyDatabase,
   getDataSource
 } from '../db/database';
-import { createWindow, getDockIconPath } from '../window/create-window';
+import {
+  createWindow,
+  getDockIconPath,
+  getMainWindow,
+  prepareWindowForAppQuit,
+  showMainWindow
+} from '../window/create-window';
 import {
   setupCqrsHandlers,
   setupSystemHandlers,
@@ -30,8 +36,13 @@ export function registerAppLifecycle(): void {
     await createWindow();
 
     app.on('activate', () => {
+      if (getMainWindow()) {
+        void showMainWindow();
+        return;
+      }
+
       if (BrowserWindow.getAllWindows().length === 0)
-        createWindow();
+        void createWindow();
     });
   });
 
@@ -41,6 +52,8 @@ export function registerAppLifecycle(): void {
   });
 
   app.on('before-quit', async (event) => {
+    prepareWindowForAppQuit();
+
     if (getDataSource()?.isInitialized) {
       event.preventDefault();
       shutdownDesktopUpdater();

electron/cqrs/commands/handlers/clearAllData.ts

@@ -3,6 +3,11 @@ import {
   MessageEntity,
   UserEntity,
   RoomEntity,
+  RoomChannelEntity,
+  RoomMemberEntity,
+  RoomRoleEntity,
+  RoomUserRoleEntity,
+  RoomChannelPermissionEntity,
   ReactionEntity,
   BanEntity,
   AttachmentEntity,
@@ -13,6 +18,11 @@ export async function handleClearAllData(dataSource: DataSource): Promise<void>
   await dataSource.getRepository(MessageEntity).clear();
   await dataSource.getRepository(UserEntity).clear();
   await dataSource.getRepository(RoomEntity).clear();
+  await dataSource.getRepository(RoomChannelEntity).clear();
+  await dataSource.getRepository(RoomMemberEntity).clear();
+  await dataSource.getRepository(RoomRoleEntity).clear();
+  await dataSource.getRepository(RoomUserRoleEntity).clear();
+  await dataSource.getRepository(RoomChannelPermissionEntity).clear();
   await dataSource.getRepository(ReactionEntity).clear();
   await dataSource.getRepository(BanEntity).clear();
   await dataSource.getRepository(AttachmentEntity).clear();

electron/cqrs/commands/handlers/deleteRoom.ts

@@ -1,10 +1,25 @@
 import { DataSource } from 'typeorm';
-import { RoomEntity, MessageEntity } from '../../../entities';
+import {
+  RoomChannelPermissionEntity,
+  RoomChannelEntity,
+  RoomEntity,
+  RoomMemberEntity,
+  RoomRoleEntity,
+  RoomUserRoleEntity,
+  MessageEntity
+} from '../../../entities';
 import { DeleteRoomCommand } from '../../types';
 
 export async function handleDeleteRoom(command: DeleteRoomCommand, dataSource: DataSource): Promise<void> {
   const { roomId } = command.payload;
 
-  await dataSource.getRepository(RoomEntity).delete({ id: roomId });
-  await dataSource.getRepository(MessageEntity).delete({ roomId });
+  await dataSource.transaction(async (manager) => {
+    await manager.getRepository(RoomChannelPermissionEntity).delete({ roomId });
+    await manager.getRepository(RoomChannelEntity).delete({ roomId });
+    await manager.getRepository(RoomMemberEntity).delete({ roomId });
+    await manager.getRepository(RoomRoleEntity).delete({ roomId });
+    await manager.getRepository(RoomUserRoleEntity).delete({ roomId });
+    await manager.getRepository(RoomEntity).delete({ id: roomId });
+    await manager.getRepository(MessageEntity).delete({ roomId });
+  });
 }

electron/cqrs/commands/handlers/saveMessage.ts

@@ -1,23 +1,27 @@
 import { DataSource } from 'typeorm';
 import { MessageEntity } from '../../../entities';
+import { replaceMessageReactions } from '../../relations';
 import { SaveMessageCommand } from '../../types';
 
 export async function handleSaveMessage(command: SaveMessageCommand, dataSource: DataSource): Promise<void> {
-  const repo = dataSource.getRepository(MessageEntity);
   const { message } = command.payload;
-  const entity = repo.create({
-    id: message.id,
-    roomId: message.roomId,
-    channelId: message.channelId ?? null,
-    senderId: message.senderId,
-    senderName: message.senderName,
-    content: message.content,
-    timestamp: message.timestamp,
-    editedAt: message.editedAt ?? null,
-    reactions: JSON.stringify(message.reactions ?? []),
-    isDeleted: message.isDeleted ? 1 : 0,
-    replyToId: message.replyToId ?? null
-  });
 
-  await repo.save(entity);
+  await dataSource.transaction(async (manager) => {
+    const repo = manager.getRepository(MessageEntity);
+    const entity = repo.create({
+      id: message.id,
+      roomId: message.roomId,
+      channelId: message.channelId ?? null,
+      senderId: message.senderId,
+      senderName: message.senderName,
+      content: message.content,
+      timestamp: message.timestamp,
+      editedAt: message.editedAt ?? null,
+      isDeleted: message.isDeleted ? 1 : 0,
+      replyToId: message.replyToId ?? null
+    });
+
+    await repo.save(entity);
+    await replaceMessageReactions(manager, message.id, message.reactions ?? []);
+  });
 }

electron/cqrs/commands/handlers/saveRoom.ts

@@ -1,31 +1,55 @@
 import { DataSource } from 'typeorm';
 import { RoomEntity } from '../../../entities';
+import { replaceRoomRelations } from '../../relations';
 import { SaveRoomCommand } from '../../types';
 
-export async function handleSaveRoom(command: SaveRoomCommand, dataSource: DataSource): Promise<void> {
-  const repo = dataSource.getRepository(RoomEntity);
-  const { room } = command.payload;
-  const entity = repo.create({
-    id: room.id,
-    name: room.name,
-    description: room.description ?? null,
-    topic: room.topic ?? null,
-    hostId: room.hostId,
-    password: room.password ?? null,
-    hasPassword: room.hasPassword ? 1 : 0,
-    isPrivate: room.isPrivate ? 1 : 0,
-    createdAt: room.createdAt,
-    userCount: room.userCount ?? 0,
-    maxUsers: room.maxUsers ?? null,
-    icon: room.icon ?? null,
-    iconUpdatedAt: room.iconUpdatedAt ?? null,
-    permissions: room.permissions != null ? JSON.stringify(room.permissions) : null,
-    channels: room.channels != null ? JSON.stringify(room.channels) : null,
-    members: room.members != null ? JSON.stringify(room.members) : null,
-    sourceId: room.sourceId ?? null,
-    sourceName: room.sourceName ?? null,
-    sourceUrl: room.sourceUrl ?? null
-  });
+function extractSlowModeInterval(room: SaveRoomCommand['payload']['room']): number {
+  if (typeof room.slowModeInterval === 'number' && Number.isFinite(room.slowModeInterval)) {
+    return room.slowModeInterval;
+  }
 
-  await repo.save(entity);
+  const permissions = room.permissions && typeof room.permissions === 'object'
+    ? room.permissions as { slowModeInterval?: unknown }
+    : null;
+
+  return typeof permissions?.slowModeInterval === 'number' && Number.isFinite(permissions.slowModeInterval)
+    ? permissions.slowModeInterval
+    : 0;
+}
+
+export async function handleSaveRoom(command: SaveRoomCommand, dataSource: DataSource): Promise<void> {
+  const { room } = command.payload;
+
+  await dataSource.transaction(async (manager) => {
+    const repo = manager.getRepository(RoomEntity);
+    const entity = repo.create({
+      id: room.id,
+      name: room.name,
+      description: room.description ?? null,
+      topic: room.topic ?? null,
+      hostId: room.hostId,
+      password: room.password ?? null,
+      hasPassword: room.hasPassword ? 1 : 0,
+      isPrivate: room.isPrivate ? 1 : 0,
+      createdAt: room.createdAt,
+      userCount: room.userCount ?? 0,
+      maxUsers: room.maxUsers ?? null,
+      icon: room.icon ?? null,
+      iconUpdatedAt: room.iconUpdatedAt ?? null,
+      slowModeInterval: extractSlowModeInterval(room),
+      sourceId: room.sourceId ?? null,
+      sourceName: room.sourceName ?? null,
+      sourceUrl: room.sourceUrl ?? null
+    });
+
+    await repo.save(entity);
+    await replaceRoomRelations(manager, room.id, {
+      channels: room.channels ?? [],
+      members: room.members ?? [],
+      roles: room.roles ?? [],
+      roleAssignments: room.roleAssignments ?? [],
+      channelPermissions: room.channelPermissions ?? [],
+      permissions: room.permissions
+    });
+  });
 }

electron/cqrs/commands/handlers/updateMessage.ts

@@ -1,41 +1,46 @@
 import { DataSource } from 'typeorm';
 import { MessageEntity } from '../../../entities';
+import { replaceMessageReactions } from '../../relations';
 import { UpdateMessageCommand } from '../../types';
 
 export async function handleUpdateMessage(command: UpdateMessageCommand, dataSource: DataSource): Promise<void> {
-  const repo = dataSource.getRepository(MessageEntity);
   const { messageId, updates } = command.payload;
-  const existing = await repo.findOne({ where: { id: messageId } });
 
-  if (!existing)
-    return;
+  await dataSource.transaction(async (manager) => {
+    const repo = manager.getRepository(MessageEntity);
+    const existing = await repo.findOne({ where: { id: messageId } });
 
-  if (updates.channelId !== undefined)
-    existing.channelId = updates.channelId ?? null;
+    if (!existing)
+      return;
 
-  if (updates.senderId !== undefined)
-    existing.senderId = updates.senderId;
+    if (updates.channelId !== undefined)
+      existing.channelId = updates.channelId ?? null;
 
-  if (updates.senderName !== undefined)
-    existing.senderName = updates.senderName;
+    if (updates.senderId !== undefined)
+      existing.senderId = updates.senderId;
 
-  if (updates.content !== undefined)
-    existing.content = updates.content;
+    if (updates.senderName !== undefined)
+      existing.senderName = updates.senderName;
 
-  if (updates.timestamp !== undefined)
-    existing.timestamp = updates.timestamp;
+    if (updates.content !== undefined)
+      existing.content = updates.content;
 
-  if (updates.editedAt !== undefined)
-    existing.editedAt = updates.editedAt ?? null;
+    if (updates.timestamp !== undefined)
+      existing.timestamp = updates.timestamp;
 
-  if (updates.reactions !== undefined)
-    existing.reactions = JSON.stringify(updates.reactions ?? []);
+    if (updates.editedAt !== undefined)
+      existing.editedAt = updates.editedAt ?? null;
 
-  if (updates.isDeleted !== undefined)
-    existing.isDeleted = updates.isDeleted ? 1 : 0;
+    if (updates.isDeleted !== undefined)
+      existing.isDeleted = updates.isDeleted ? 1 : 0;
 
-  if (updates.replyToId !== undefined)
-    existing.replyToId = updates.replyToId ?? null;
+    if (updates.replyToId !== undefined)
+      existing.replyToId = updates.replyToId ?? null;
 
-  await repo.save(existing);
+    await repo.save(existing);
+
+    if (updates.reactions !== undefined) {
+      await replaceMessageReactions(manager, messageId, updates.reactions ?? []);
+    }
+  });
 }

electron/cqrs/commands/handlers/updateRoom.ts

@@ -1,31 +1,68 @@
 import { DataSource } from 'typeorm';
 import { RoomEntity } from '../../../entities';
+import { replaceRoomRelations } from '../../relations';
 import { UpdateRoomCommand } from '../../types';
 import {
   applyUpdates,
   boolToInt,
-  jsonOrNull,
   TransformMap
 } from './utils/applyUpdates';
 
 const ROOM_TRANSFORMS: TransformMap = {
   hasPassword: boolToInt,
   isPrivate: boolToInt,
-  userCount: (val) => (val ?? 0),
-  permissions: jsonOrNull,
-  channels: jsonOrNull,
-  members: jsonOrNull
+  userCount: (val) => (val ?? 0)
 };
 
-export async function handleUpdateRoom(command: UpdateRoomCommand, dataSource: DataSource): Promise<void> {
-  const repo = dataSource.getRepository(RoomEntity);
-  const { roomId, updates } = command.payload;
-  const existing = await repo.findOne({ where: { id: roomId } });
+function extractSlowModeInterval(updates: UpdateRoomCommand['payload']['updates']): number | undefined {
+  if (typeof updates.slowModeInterval === 'number' && Number.isFinite(updates.slowModeInterval)) {
+    return updates.slowModeInterval;
+  }
 
-  if (!existing)
-    return;
+  const permissions = updates.permissions && typeof updates.permissions === 'object'
+    ? updates.permissions as { slowModeInterval?: unknown }
+    : null;
 
-  applyUpdates(existing, updates, ROOM_TRANSFORMS);
-  await repo.save(existing);
+  return typeof permissions?.slowModeInterval === 'number' && Number.isFinite(permissions.slowModeInterval)
+    ? permissions.slowModeInterval
+    : undefined;
+}
+
+export async function handleUpdateRoom(command: UpdateRoomCommand, dataSource: DataSource): Promise<void> {
+  const { roomId, updates } = command.payload;
+
+  await dataSource.transaction(async (manager) => {
+    const repo = manager.getRepository(RoomEntity);
+    const existing = await repo.findOne({ where: { id: roomId } });
+
+    if (!existing)
+      return;
+
+    const {
+      channels,
+      members,
+      roles,
+      roleAssignments,
+      channelPermissions,
+      permissions: rawPermissions,
+      ...entityUpdates
+    } = updates;
+    const slowModeInterval = extractSlowModeInterval(updates);
+
+    if (slowModeInterval !== undefined) {
+      entityUpdates.slowModeInterval = slowModeInterval;
+    }
+
+    applyUpdates(existing, entityUpdates, ROOM_TRANSFORMS);
+    await repo.save(existing);
+    await replaceRoomRelations(manager, roomId, {
+      channels,
+      members,
+      roles,
+      roleAssignments,
+      channelPermissions,
+      permissions: rawPermissions
+    });
+  });
 }
 

electron/cqrs/mappers.ts

@@ -9,10 +9,19 @@ import { RoomEntity } from '../entities/RoomEntity';
 import { ReactionEntity } from '../entities/ReactionEntity';
 import { BanEntity } from '../entities/BanEntity';
 import { AttachmentEntity } from '../entities/AttachmentEntity';
+import { ReactionPayload } from './types';
+import {
+  relationRecordToRoomPayload,
+  RoomChannelPermissionRecord,
+  RoomChannelRecord,
+  RoomMemberRecord,
+  RoomRoleAssignmentRecord,
+  RoomRoleRecord
+} from './relations';
 
 const DELETED_MESSAGE_CONTENT = '[Message deleted]';
 
-export function rowToMessage(row: MessageEntity) {
+export function rowToMessage(row: MessageEntity, reactions: ReactionPayload[] = []) {
   const isDeleted = !!row.isDeleted;
 
   return {
@@ -24,7 +33,7 @@ export function rowToMessage(row: MessageEntity) {
     content: isDeleted ? DELETED_MESSAGE_CONTENT : row.content,
     timestamp: row.timestamp,
     editedAt: row.editedAt ?? undefined,
-    reactions: isDeleted ? [] : JSON.parse(row.reactions || '[]') as unknown[],
+    reactions: isDeleted ? [] : reactions,
     isDeleted,
     replyToId: row.replyToId ?? undefined
   };
@@ -49,7 +58,30 @@ export function rowToUser(row: UserEntity) {
   };
 }
 
-export function rowToRoom(row: RoomEntity) {
+export function rowToRoom(
+  row: RoomEntity,
+  relations: {
+    channels?: RoomChannelRecord[];
+    members?: RoomMemberRecord[];
+    roles?: RoomRoleRecord[];
+    roleAssignments?: RoomRoleAssignmentRecord[];
+    channelPermissions?: RoomChannelPermissionRecord[];
+  } = {
+    channels: [],
+    members: [],
+    roles: [],
+    roleAssignments: [],
+    channelPermissions: []
+  }
+) {
+  const relationPayload = relationRecordToRoomPayload({ slowModeInterval: row.slowModeInterval }, {
+    channels: relations.channels ?? [],
+    members: relations.members ?? [],
+    roles: relations.roles ?? [],
+    roleAssignments: relations.roleAssignments ?? [],
+    channelPermissions: relations.channelPermissions ?? []
+  });
+
   return {
     id: row.id,
     name: row.name,
@@ -64,9 +96,13 @@ export function rowToRoom(row: RoomEntity) {
     maxUsers: row.maxUsers ?? undefined,
     icon: row.icon ?? undefined,
     iconUpdatedAt: row.iconUpdatedAt ?? undefined,
-    permissions: row.permissions ? JSON.parse(row.permissions) : undefined,
-    channels: row.channels ? JSON.parse(row.channels) : undefined,
-    members: row.members ? JSON.parse(row.members) : undefined,
+    slowModeInterval: row.slowModeInterval,
+    permissions: relationPayload.permissions,
+    channels: relationPayload.channels,
+    members: relationPayload.members,
+    roles: relationPayload.roles,
+    roleAssignments: relationPayload.roleAssignments,
+    channelPermissions: relationPayload.channelPermissions,
     sourceId: row.sourceId ?? undefined,
     sourceName: row.sourceName ?? undefined,
     sourceUrl: row.sourceUrl ?? undefined

electron/cqrs/queries/handlers/getAllRooms.ts

@@ -1,10 +1,12 @@
 import { DataSource } from 'typeorm';
 import { RoomEntity } from '../../../entities';
 import { rowToRoom } from '../../mappers';
+import { loadRoomRelationsMap } from '../../relations';
 
 export async function handleGetAllRooms(dataSource: DataSource) {
   const repo = dataSource.getRepository(RoomEntity);
   const rows = await repo.find();
+  const relationsByRoomId = await loadRoomRelationsMap(dataSource, rows.map((row) => row.id));
 
-  return rows.map(rowToRoom);
+  return rows.map((row) => rowToRoom(row, relationsByRoomId.get(row.id)));
 }

electron/cqrs/queries/handlers/getMessageById.ts

@@ -2,10 +2,17 @@ import { DataSource } from 'typeorm';
 import { MessageEntity } from '../../../entities';
 import { GetMessageByIdQuery } from '../../types';
 import { rowToMessage } from '../../mappers';
+import { loadMessageReactionsMap } from '../../relations';
 
 export async function handleGetMessageById(query: GetMessageByIdQuery, dataSource: DataSource) {
   const repo = dataSource.getRepository(MessageEntity);
   const row = await repo.findOne({ where: { id: query.payload.messageId } });
 
-  return row ? rowToMessage(row) : null;
+  if (!row) {
+    return null;
+  }
+
+  const reactionsByMessageId = await loadMessageReactionsMap(dataSource, [row.id]);
+
+  return rowToMessage(row, reactionsByMessageId.get(row.id) ?? []);
 }

electron/cqrs/queries/handlers/getMessages.ts

@@ -2,6 +2,7 @@ import { DataSource } from 'typeorm';
 import { MessageEntity } from '../../../entities';
 import { GetMessagesQuery } from '../../types';
 import { rowToMessage } from '../../mappers';
+import { loadMessageReactionsMap } from '../../relations';
 
 export async function handleGetMessages(query: GetMessagesQuery, dataSource: DataSource) {
   const repo = dataSource.getRepository(MessageEntity);
@@ -12,6 +13,7 @@ export async function handleGetMessages(query: GetMessagesQuery, dataSource: Dat
     take: limit,
     skip: offset
   });
+  const reactionsByMessageId = await loadMessageReactionsMap(dataSource, rows.map((row) => row.id));
 
-  return rows.map(rowToMessage);
+  return rows.map((row) => rowToMessage(row, reactionsByMessageId.get(row.id) ?? []));
 }

electron/cqrs/queries/handlers/getMessagesSince.ts

@@ -0,0 +1,20 @@
+import { DataSource, MoreThan } from 'typeorm';
+import { MessageEntity } from '../../../entities';
+import { GetMessagesSinceQuery } from '../../types';
+import { rowToMessage } from '../../mappers';
+import { loadMessageReactionsMap } from '../../relations';
+
+export async function handleGetMessagesSince(query: GetMessagesSinceQuery, dataSource: DataSource) {
+  const repo = dataSource.getRepository(MessageEntity);
+  const { roomId, sinceTimestamp } = query.payload;
+  const rows = await repo.find({
+    where: {
+      roomId,
+      timestamp: MoreThan(sinceTimestamp)
+    },
+    order: { timestamp: 'ASC' }
+  });
+  const reactionsByMessageId = await loadMessageReactionsMap(dataSource, rows.map((row) => row.id));
+
+  return rows.map((row) => rowToMessage(row, reactionsByMessageId.get(row.id) ?? []));
+}

electron/cqrs/queries/handlers/getRoom.ts

@@ -2,10 +2,17 @@ import { DataSource } from 'typeorm';
 import { RoomEntity } from '../../../entities';
 import { GetRoomQuery } from '../../types';
 import { rowToRoom } from '../../mappers';
+import { loadRoomRelationsMap } from '../../relations';
 
 export async function handleGetRoom(query: GetRoomQuery, dataSource: DataSource) {
   const repo = dataSource.getRepository(RoomEntity);
   const row = await repo.findOne({ where: { id: query.payload.roomId } });
 
-  return row ? rowToRoom(row) : null;
+  if (!row) {
+    return null;
+  }
+
+  const relationsByRoomId = await loadRoomRelationsMap(dataSource, [row.id]);
+
+  return rowToRoom(row, relationsByRoomId.get(row.id));
 }

electron/cqrs/queries/index.ts

@@ -4,6 +4,7 @@ import {
   QueryTypeKey,
   Query,
   GetMessagesQuery,
+  GetMessagesSinceQuery,
   GetMessageByIdQuery,
   GetReactionsForMessageQuery,
   GetUserQuery,
@@ -13,6 +14,7 @@ import {
   GetAttachmentsForMessageQuery
 } from '../types';
 import { handleGetMessages } from './handlers/getMessages';
+import { handleGetMessagesSince } from './handlers/getMessagesSince';
 import { handleGetMessageById } from './handlers/getMessageById';
 import { handleGetReactionsForMessage } from './handlers/getReactionsForMessage';
 import { handleGetUser } from './handlers/getUser';
@@ -27,6 +29,7 @@ import { handleGetAllAttachments } from './handlers/getAllAttachments';
 
 export const buildQueryHandlers = (dataSource: DataSource): Record<QueryTypeKey, (query: Query) => Promise<unknown>> => ({
   [QueryType.GetMessages]:              (query) => handleGetMessages(query as GetMessagesQuery, dataSource),
+  [QueryType.GetMessagesSince]:         (query) => handleGetMessagesSince(query as GetMessagesSinceQuery, dataSource),
   [QueryType.GetMessageById]:           (query) => handleGetMessageById(query as GetMessageByIdQuery, dataSource),
   [QueryType.GetReactionsForMessage]:   (query) => handleGetReactionsForMessage(query as GetReactionsForMessageQuery, dataSource),
   [QueryType.GetUser]:                  (query) => handleGetUser(query as GetUserQuery, dataSource),

electron/cqrs/types.ts

@@ -22,6 +22,7 @@ export type CommandTypeKey = typeof CommandType[keyof typeof CommandType];
 
 export const QueryType = {
   GetMessages: 'get-messages',
+  GetMessagesSince: 'get-messages-since',
   GetMessageById: 'get-message-by-id',
   GetReactionsForMessage: 'get-reactions-for-message',
   GetUser: 'get-user',
@@ -60,6 +61,44 @@ export interface ReactionPayload {
   timestamp: number;
 }
 
+export type PermissionStatePayload = 'allow' | 'deny' | 'inherit';
+
+export type RoomPermissionKeyPayload =
+  | 'manageServer'
+  | 'manageRoles'
+  | 'manageChannels'
+  | 'manageIcon'
+  | 'kickMembers'
+  | 'banMembers'
+  | 'manageBans'
+  | 'deleteMessages'
+  | 'joinVoice'
+  | 'shareScreen'
+  | 'uploadFiles';
+
+export interface AccessRolePayload {
+  id: string;
+  name: string;
+  color?: string;
+  position: number;
+  isSystem?: boolean;
+  permissions?: Partial<Record<RoomPermissionKeyPayload, PermissionStatePayload>>;
+}
+
+export interface RoleAssignmentPayload {
+  userId: string;
+  oderId?: string;
+  roleIds: string[];
+}
+
+export interface ChannelPermissionPayload {
+  channelId: string;
+  targetType: 'role' | 'user';
+  targetId: string;
+  permission: RoomPermissionKeyPayload;
+  value: PermissionStatePayload;
+}
+
 export interface UserPayload {
   id: string;
   oderId?: string;
@@ -91,9 +130,13 @@ export interface RoomPayload {
   maxUsers?: number;
   icon?: string;
   iconUpdatedAt?: number;
+  slowModeInterval?: number;
   permissions?: unknown;
   channels?: unknown[];
   members?: unknown[];
+  roles?: AccessRolePayload[];
+  roleAssignments?: RoleAssignmentPayload[];
+  channelPermissions?: ChannelPermissionPayload[];
   sourceId?: string;
   sourceName?: string;
   sourceUrl?: string;
@@ -160,6 +203,7 @@ export type Command =
   | ClearAllDataCommand;
 
 export interface GetMessagesQuery { type: typeof QueryType.GetMessages; payload: { roomId: string; limit?: number; offset?: number } }
+export interface GetMessagesSinceQuery { type: typeof QueryType.GetMessagesSince; payload: { roomId: string; sinceTimestamp: number } }
 export interface GetMessageByIdQuery { type: typeof QueryType.GetMessageById; payload: { messageId: string } }
 export interface GetReactionsForMessageQuery { type: typeof QueryType.GetReactionsForMessage; payload: { messageId: string } }
 export interface GetUserQuery { type: typeof QueryType.GetUser; payload: { userId: string } }
@@ -174,6 +218,7 @@ export interface GetAllAttachmentsQuery { type: typeof QueryType.GetAllAttachmen
 
 export type Query =
   | GetMessagesQuery
+  | GetMessagesSinceQuery
   | GetMessageByIdQuery
   | GetReactionsForMessageQuery
   | GetUserQuery

electron/data-source.ts

@@ -17,6 +17,11 @@ import {
   MessageEntity,
   UserEntity,
   RoomEntity,
+  RoomChannelEntity,
+  RoomMemberEntity,
+  RoomRoleEntity,
+  RoomUserRoleEntity,
+  RoomChannelPermissionEntity,
   ReactionEntity,
   BanEntity,
   AttachmentEntity,
@@ -38,6 +43,11 @@ export const AppDataSource = new DataSource({
     MessageEntity,
     UserEntity,
     RoomEntity,
+    RoomChannelEntity,
+    RoomMemberEntity,
+    RoomRoleEntity,
+    RoomUserRoleEntity,
+    RoomChannelPermissionEntity,
     ReactionEntity,
     BanEntity,
     AttachmentEntity,

electron/db/database.ts

@@ -7,6 +7,11 @@ import {
   MessageEntity,
   UserEntity,
   RoomEntity,
+  RoomChannelEntity,
+  RoomMemberEntity,
+  RoomRoleEntity,
+  RoomUserRoleEntity,
+  RoomChannelPermissionEntity,
   ReactionEntity,
   BanEntity,
   AttachmentEntity,
@@ -40,6 +45,11 @@ export async function initializeDatabase(): Promise<void> {
       MessageEntity,
       UserEntity,
       RoomEntity,
+      RoomChannelEntity,
+      RoomMemberEntity,
+      RoomRoleEntity,
+      RoomUserRoleEntity,
+      RoomChannelPermissionEntity,
       ReactionEntity,
       BanEntity,
       AttachmentEntity,

electron/desktop-settings.ts

@@ -7,6 +7,7 @@ export type AutoUpdateMode = 'auto' | 'off' | 'version';
 export interface DesktopSettings {
   autoUpdateMode: AutoUpdateMode;
   autoStart: boolean;
+  closeToTray: boolean;
   hardwareAcceleration: boolean;
   manifestUrls: string[];
   preferredVersion: string | null;
@@ -21,6 +22,7 @@ export interface DesktopSettingsSnapshot extends DesktopSettings {
 const DEFAULT_DESKTOP_SETTINGS: DesktopSettings = {
   autoUpdateMode: 'auto',
   autoStart: true,
+  closeToTray: true,
   hardwareAcceleration: true,
   manifestUrls: [],
   preferredVersion: null,
@@ -86,6 +88,9 @@ export function readDesktopSettings(): DesktopSettings {
       autoStart: typeof parsed.autoStart === 'boolean'
         ? parsed.autoStart
         : DEFAULT_DESKTOP_SETTINGS.autoStart,
+      closeToTray: typeof parsed.closeToTray === 'boolean'
+        ? parsed.closeToTray
+        : DEFAULT_DESKTOP_SETTINGS.closeToTray,
       vaapiVideoEncode: typeof parsed.vaapiVideoEncode === 'boolean'
         ? parsed.vaapiVideoEncode
         : DEFAULT_DESKTOP_SETTINGS.vaapiVideoEncode,
@@ -110,6 +115,9 @@ export function updateDesktopSettings(patch: Partial<DesktopSettings>): DesktopS
     autoStart: typeof mergedSettings.autoStart === 'boolean'
       ? mergedSettings.autoStart
       : DEFAULT_DESKTOP_SETTINGS.autoStart,
+    closeToTray: typeof mergedSettings.closeToTray === 'boolean'
+      ? mergedSettings.closeToTray
+      : DEFAULT_DESKTOP_SETTINGS.closeToTray,
     hardwareAcceleration: typeof mergedSettings.hardwareAcceleration === 'boolean'
       ? mergedSettings.hardwareAcceleration
       : DEFAULT_DESKTOP_SETTINGS.hardwareAcceleration,

electron/entities/MessageEntity.ts

@@ -30,9 +30,6 @@ export class MessageEntity {
   @Column('integer', { nullable: true })
   editedAt!: number | null;
 
-  @Column('text', { default: '[]' })
-  reactions!: string;
-
   @Column('integer', { default: 0 })
   isDeleted!: number;
 

electron/entities/RoomChannelEntity.ts

@@ -0,0 +1,23 @@
+import {
+  Entity,
+  PrimaryColumn,
+  Column
+} from 'typeorm';
+
+@Entity('room_channels')
+export class RoomChannelEntity {
+  @PrimaryColumn('text')
+  roomId!: string;
+
+  @PrimaryColumn('text')
+  channelId!: string;
+
+  @Column('text')
+  name!: string;
+
+  @Column('text')
+  type!: 'text' | 'voice';
+
+  @Column('integer')
+  position!: number;
+}

electron/entities/RoomChannelPermissionEntity.ts

@@ -0,0 +1,26 @@
+import {
+  Column,
+  Entity,
+  PrimaryColumn
+} from 'typeorm';
+
+@Entity('room_channel_permissions')
+export class RoomChannelPermissionEntity {
+  @PrimaryColumn('text')
+  roomId!: string;
+
+  @PrimaryColumn('text')
+  channelId!: string;
+
+  @PrimaryColumn('text')
+  targetType!: 'role' | 'user';
+
+  @PrimaryColumn('text')
+  targetId!: string;
+
+  @PrimaryColumn('text')
+  permission!: string;
+
+  @Column('text')
+  value!: 'allow' | 'deny' | 'inherit';
+}

electron/entities/RoomEntity.ts

@@ -45,14 +45,8 @@ export class RoomEntity {
   @Column('integer', { nullable: true })
   iconUpdatedAt!: number | null;
 
-  @Column('text', { nullable: true })
-  permissions!: string | null;
-
-  @Column('text', { nullable: true })
-  channels!: string | null;
-
-  @Column('text', { nullable: true })
-  members!: string | null;
+  @Column('integer', { default: 0 })
+  slowModeInterval!: number;
 
   @Column('text', { nullable: true })
   sourceId!: string | null;

electron/entities/RoomMemberEntity.ts

@@ -0,0 +1,38 @@
+import {
+  Entity,
+  PrimaryColumn,
+  Column
+} from 'typeorm';
+
+@Entity('room_members')
+export class RoomMemberEntity {
+  @PrimaryColumn('text')
+  roomId!: string;
+
+  @PrimaryColumn('text')
+  memberKey!: string;
+
+  @Column('text')
+  id!: string;
+
+  @Column('text', { nullable: true })
+  oderId!: string | null;
+
+  @Column('text')
+  username!: string;
+
+  @Column('text')
+  displayName!: string;
+
+  @Column('text', { nullable: true })
+  avatarUrl!: string | null;
+
+  @Column('text')
+  role!: 'host' | 'admin' | 'moderator' | 'member';
+
+  @Column('integer')
+  joinedAt!: number;
+
+  @Column('integer')
+  lastSeenAt!: number;
+}

electron/entities/RoomRoleEntity.ts

@@ -0,0 +1,59 @@
+import {
+  Column,
+  Entity,
+  PrimaryColumn
+} from 'typeorm';
+
+@Entity('room_roles')
+export class RoomRoleEntity {
+  @PrimaryColumn('text')
+  roomId!: string;
+
+  @PrimaryColumn('text')
+  roleId!: string;
+
+  @Column('text')
+  name!: string;
+
+  @Column('text', { nullable: true })
+  color!: string | null;
+
+  @Column('integer')
+  position!: number;
+
+  @Column('integer', { default: 0 })
+  isSystem!: number;
+
+  @Column('text', { default: 'inherit' })
+  manageServer!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  manageRoles!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  manageChannels!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  manageIcon!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  kickMembers!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  banMembers!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  manageBans!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  deleteMessages!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  joinVoice!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  shareScreen!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  uploadFiles!: 'allow' | 'deny' | 'inherit';
+}

electron/entities/RoomUserRoleEntity.ts

@@ -0,0 +1,23 @@
+import {
+  Column,
+  Entity,
+  PrimaryColumn
+} from 'typeorm';
+
+@Entity('room_user_roles')
+export class RoomUserRoleEntity {
+  @PrimaryColumn('text')
+  roomId!: string;
+
+  @PrimaryColumn('text')
+  userKey!: string;
+
+  @PrimaryColumn('text')
+  roleId!: string;
+
+  @Column('text')
+  userId!: string;
+
+  @Column('text', { nullable: true })
+  oderId!: string | null;
+}

electron/entities/index.ts

@@ -1,6 +1,11 @@
 export { MessageEntity } from './MessageEntity';
 export { UserEntity } from './UserEntity';
 export { RoomEntity } from './RoomEntity';
+export { RoomChannelEntity } from './RoomChannelEntity';
+export { RoomMemberEntity } from './RoomMemberEntity';
+export { RoomRoleEntity } from './RoomRoleEntity';
+export { RoomUserRoleEntity } from './RoomUserRoleEntity';
+export { RoomChannelPermissionEntity } from './RoomChannelPermissionEntity';
 export { ReactionEntity } from './ReactionEntity';
 export { BanEntity } from './BanEntity';
 export { AttachmentEntity } from './AttachmentEntity';

electron/ipc/system.ts

@@ -4,6 +4,7 @@ import {
   desktopCapturer,
   dialog,
   ipcMain,
+  Notification,
   shell
 } from 'electron';
 import * as fs from 'fs';
@@ -28,10 +29,23 @@ import {
   getDesktopUpdateState,
   handleDesktopSettingsChanged,
   restartToApplyUpdate,
+  readDesktopUpdateServerHealth,
   type DesktopUpdateServerContext
 } from '../update/desktop-updater';
 import { consumePendingDeepLink } from '../app/deep-links';
 import { synchronizeAutoStartSetting } from '../app/auto-start';
+import {
+  getMainWindow,
+  getWindowIconPath,
+  updateCloseToTraySetting
+} from '../window/create-window';
+import {
+  deleteSavedTheme,
+  getSavedThemesPath,
+  listSavedThemes,
+  readSavedTheme,
+  writeSavedTheme
+} from '../theme-library';
 
 const DEFAULT_MIME_TYPE = 'application/octet-stream';
 const FILE_CLIPBOARD_FORMATS = [
@@ -85,6 +99,12 @@ interface ClipboardFilePayload {
   path?: string;
 }
 
+interface DesktopNotificationPayload {
+  body: string;
+  requestAttention?: boolean;
+  title: string;
+}
+
 function resolveLinuxDisplayServer(): string {
   if (process.platform !== 'linux') {
     return 'N/A';
@@ -312,11 +332,91 @@ export function setupSystemHandlers(): void {
   });
 
   ipcMain.handle('get-app-data-path', () => app.getPath('userData'));
+  ipcMain.handle('get-saved-themes-path', async () => await getSavedThemesPath());
+  ipcMain.handle('list-saved-themes', async () => await listSavedThemes());
+  ipcMain.handle('read-saved-theme', async (_event, fileName: string) => await readSavedTheme(fileName));
+  ipcMain.handle('write-saved-theme', async (_event, fileName: string, text: string) => {
+    return await writeSavedTheme(fileName, text);
+  });
+
+  ipcMain.handle('delete-saved-theme', async (_event, fileName: string) => {
+    return await deleteSavedTheme(fileName);
+  });
 
   ipcMain.handle('get-desktop-settings', () => getDesktopSettingsSnapshot());
 
+  ipcMain.handle('show-desktop-notification', async (_event, payload: DesktopNotificationPayload) => {
+    const title = typeof payload?.title === 'string' ? payload.title.trim() : '';
+    const body = typeof payload?.body === 'string' ? payload.body : '';
+    const mainWindow = getMainWindow();
+    const suppressSystemNotification = mainWindow?.isVisible() === true
+      && !mainWindow.isMinimized()
+      && mainWindow.isMaximized();
+
+    if (!title) {
+      return false;
+    }
+
+    if (!suppressSystemNotification && Notification.isSupported()) {
+      try {
+        const notification = new Notification({
+          title,
+          body,
+          icon: getWindowIconPath(),
+          silent: true
+        });
+
+        notification.on('click', () => {
+          if (!mainWindow) {
+            return;
+          }
+
+          if (mainWindow.isMinimized()) {
+            mainWindow.restore();
+          }
+
+          if (!mainWindow.isVisible()) {
+            mainWindow.show();
+          }
+
+          mainWindow.focus();
+        });
+
+        notification.show();
+      } catch {
+        // Ignore notification center failures and still attempt taskbar attention.
+      }
+    }
+
+    if (payload?.requestAttention && mainWindow && (mainWindow.isMinimized() || !mainWindow.isFocused())) {
+      mainWindow.flashFrame(true);
+    }
+
+    return true;
+  });
+
+  ipcMain.handle('request-window-attention', () => {
+    const mainWindow = getMainWindow();
+
+    if (!mainWindow || (!mainWindow.isMinimized() && mainWindow.isFocused())) {
+      return false;
+    }
+
+    mainWindow.flashFrame(true);
+    return true;
+  });
+
+  ipcMain.handle('clear-window-attention', () => {
+    getMainWindow()?.flashFrame(false);
+    return true;
+  });
+
   ipcMain.handle('get-auto-update-state', () => getDesktopUpdateState());
 
+  ipcMain.handle('get-auto-update-server-health', async (_event, serverUrl: string) => {
+    return await readDesktopUpdateServerHealth(serverUrl);
+  });
+
   ipcMain.handle('configure-auto-update-context', async (_event, context: Partial<DesktopUpdateServerContext>) => {
     return await configureDesktopUpdaterContext(context);
   });
@@ -331,6 +431,7 @@ export function setupSystemHandlers(): void {
     const snapshot = updateDesktopSettings(patch);
 
     await synchronizeAutoStartSetting(snapshot.autoStart);
+    updateCloseToTraySetting(snapshot.closeToTray);
     await handleDesktopSettingsChanged();
     return snapshot;
   });

electron/migrations/1000000000003-NormalizeArrayColumns.ts

@@ -0,0 +1,396 @@
+import { randomUUID } from 'crypto';
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+type LegacyMessageRow = {
+  id: string;
+  reactions: string | null;
+};
+
+type LegacyRoomRow = {
+  id: string;
+  channels: string | null;
+  members: string | null;
+};
+
+type ChannelType = 'text' | 'voice';
+type RoomMemberRole = 'host' | 'admin' | 'moderator' | 'member';
+
+type LegacyReaction = {
+  id?: unknown;
+  oderId?: unknown;
+  userId?: unknown;
+  emoji?: unknown;
+  timestamp?: unknown;
+};
+
+type LegacyRoomChannel = {
+  id?: unknown;
+  name?: unknown;
+  type?: unknown;
+  position?: unknown;
+};
+
+type LegacyRoomMember = {
+  id?: unknown;
+  oderId?: unknown;
+  username?: unknown;
+  displayName?: unknown;
+  avatarUrl?: unknown;
+  role?: unknown;
+  joinedAt?: unknown;
+  lastSeenAt?: unknown;
+};
+
+function parseArray<T>(raw: string | null): T[] {
+  try {
+    const parsed = JSON.parse(raw || '[]');
+
+    return Array.isArray(parsed) ? parsed as T[] : [];
+  } catch {
+    return [];
+  }
+}
+
+function isFiniteNumber(value: unknown): value is number {
+  return typeof value === 'number' && Number.isFinite(value);
+}
+
+function normalizeChannelName(name: string): string {
+  return name.trim().replace(/\s+/g, ' ');
+}
+
+function channelNameKey(type: ChannelType, name: string): string {
+  return `${type}:${normalizeChannelName(name).toLocaleLowerCase()}`;
+}
+
+function memberKey(member: { id?: string; oderId?: string }): string {
+  return member.oderId?.trim() || member.id?.trim() || '';
+}
+
+function fallbackDisplayName(member: Partial<{ displayName: string; username: string; oderId: string; id: string }>): string {
+  return member.displayName || member.username || member.oderId || member.id || 'User';
+}
+
+function fallbackUsername(member: Partial<{ displayName: string; username: string; oderId: string; id: string }>): string {
+  const base = fallbackDisplayName(member)
+    .trim()
+    .toLowerCase()
+    .replace(/\s+/g, '_');
+
+  return base || member.oderId || member.id || 'user';
+}
+
+function normalizeRoomMemberRole(value: unknown): RoomMemberRole {
+  return value === 'host' || value === 'admin' || value === 'moderator' || value === 'member'
+    ? value
+    : 'member';
+}
+
+function mergeRoomMemberRole(
+  existingRole: RoomMemberRole,
+  incomingRole: RoomMemberRole,
+  preferIncoming: boolean
+): RoomMemberRole {
+  if (existingRole === incomingRole) {
+    return existingRole;
+  }
+
+  if (incomingRole === 'member' && existingRole !== 'member') {
+    return existingRole;
+  }
+
+  if (existingRole === 'member' && incomingRole !== 'member') {
+    return incomingRole;
+  }
+
+  return preferIncoming ? incomingRole : existingRole;
+}
+
+function compareRoomMembers(
+  firstMember: {
+    id: string;
+    oderId?: string;
+    displayName: string;
+  },
+  secondMember: {
+    id: string;
+    oderId?: string;
+    displayName: string;
+  }
+): number {
+  const displayNameCompare = firstMember.displayName.localeCompare(secondMember.displayName, undefined, { sensitivity: 'base' });
+
+  if (displayNameCompare !== 0) {
+    return displayNameCompare;
+  }
+
+  return memberKey(firstMember).localeCompare(memberKey(secondMember));
+}
+
+function normalizeMessageReactions(messageId: string, raw: string | null) {
+  const reactions = parseArray<LegacyReaction>(raw);
+  const seen = new Set<string>();
+
+  return reactions.flatMap((reaction) => {
+    const emoji = typeof reaction.emoji === 'string' ? reaction.emoji : '';
+    const userId = typeof reaction.userId === 'string' ? reaction.userId : '';
+    const dedupeKey = `${userId}:${emoji}`;
+
+    if (!emoji || seen.has(dedupeKey)) {
+      return [];
+    }
+
+    seen.add(dedupeKey);
+
+    return [{
+      id: typeof reaction.id === 'string' && reaction.id.trim() ? reaction.id : randomUUID(),
+      messageId,
+      oderId: typeof reaction.oderId === 'string' ? reaction.oderId : null,
+      userId: userId || null,
+      emoji,
+      timestamp: isFiniteNumber(reaction.timestamp) ? reaction.timestamp : 0
+    }];
+  });
+}
+
+function normalizeRoomChannels(raw: string | null) {
+  const channels = parseArray<LegacyRoomChannel>(raw);
+  const seenIds = new Set<string>();
+  const seenNames = new Set<string>();
+
+  return channels.flatMap((channel, index) => {
+    const id = typeof channel.id === 'string' ? channel.id.trim() : '';
+    const name = typeof channel.name === 'string' ? normalizeChannelName(channel.name) : '';
+    const type = channel.type === 'text' || channel.type === 'voice' ? channel.type : null;
+    const position = isFiniteNumber(channel.position) ? channel.position : index;
+    const nameKey = type ? channelNameKey(type, name) : '';
+
+    if (!id || !name || !type || seenIds.has(id) || seenNames.has(nameKey)) {
+      return [];
+    }
+
+    seenIds.add(id);
+    seenNames.add(nameKey);
+
+    return [{
+      channelId: id,
+      name,
+      type,
+      position
+    }];
+  });
+}
+
+function normalizeRoomMembers(raw: string | null, now = Date.now()) {
+  const members = parseArray<LegacyRoomMember>(raw);
+  const membersByKey = new Map<string, {
+    id: string;
+    oderId?: string;
+    username: string;
+    displayName: string;
+    avatarUrl?: string;
+    role: RoomMemberRole;
+    joinedAt: number;
+    lastSeenAt: number;
+  }>();
+
+  for (const rawMember of members) {
+    const normalizedId = typeof rawMember.id === 'string' ? rawMember.id.trim() : '';
+    const normalizedOderId = typeof rawMember.oderId === 'string' ? rawMember.oderId.trim() : '';
+    const key = normalizedOderId || normalizedId;
+
+    if (!key) {
+      continue;
+    }
+
+    const lastSeenAt = isFiniteNumber(rawMember.lastSeenAt)
+      ? rawMember.lastSeenAt
+      : isFiniteNumber(rawMember.joinedAt)
+        ? rawMember.joinedAt
+        : now;
+    const joinedAt = isFiniteNumber(rawMember.joinedAt) ? rawMember.joinedAt : lastSeenAt;
+    const username = typeof rawMember.username === 'string' ? rawMember.username.trim() : '';
+    const displayName = typeof rawMember.displayName === 'string' ? rawMember.displayName.trim() : '';
+    const avatarUrl = typeof rawMember.avatarUrl === 'string' ? rawMember.avatarUrl.trim() : '';
+    const nextMember = {
+      id: normalizedId || key,
+      oderId: normalizedOderId || undefined,
+      username: username || fallbackUsername({ id: normalizedId || key, oderId: normalizedOderId || undefined, displayName }),
+      displayName: displayName || fallbackDisplayName({ id: normalizedId || key, oderId: normalizedOderId || undefined, username }),
+      avatarUrl: avatarUrl || undefined,
+      role: normalizeRoomMemberRole(rawMember.role),
+      joinedAt,
+      lastSeenAt
+    };
+    const existingMember = membersByKey.get(key);
+
+    if (!existingMember) {
+      membersByKey.set(key, nextMember);
+      continue;
+    }
+
+    const preferIncoming = nextMember.lastSeenAt >= existingMember.lastSeenAt;
+
+    membersByKey.set(key, {
+      id: existingMember.id || nextMember.id,
+      oderId: nextMember.oderId || existingMember.oderId,
+      username: preferIncoming
+        ? (nextMember.username || existingMember.username)
+        : (existingMember.username || nextMember.username),
+      displayName: preferIncoming
+        ? (nextMember.displayName || existingMember.displayName)
+        : (existingMember.displayName || nextMember.displayName),
+      avatarUrl: preferIncoming
+        ? (nextMember.avatarUrl || existingMember.avatarUrl)
+        : (existingMember.avatarUrl || nextMember.avatarUrl),
+      role: mergeRoomMemberRole(existingMember.role, nextMember.role, preferIncoming),
+      joinedAt: Math.min(existingMember.joinedAt, nextMember.joinedAt),
+      lastSeenAt: Math.max(existingMember.lastSeenAt, nextMember.lastSeenAt)
+    });
+  }
+
+  return Array.from(membersByKey.values()).sort(compareRoomMembers);
+}
+
+export class NormalizeArrayColumns1000000000003 implements MigrationInterface {
+  name = 'NormalizeArrayColumns1000000000003';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS "room_channels" (
+        "roomId"    TEXT NOT NULL,
+        "channelId" TEXT NOT NULL,
+        "name"      TEXT NOT NULL,
+        "type"      TEXT NOT NULL,
+        "position"  INTEGER NOT NULL,
+        PRIMARY KEY ("roomId", "channelId")
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS "idx_room_channels_roomId" ON "room_channels" ("roomId")`);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS "room_members" (
+        "roomId"     TEXT NOT NULL,
+        "memberKey"  TEXT NOT NULL,
+        "id"         TEXT NOT NULL,
+        "oderId"     TEXT,
+        "username"   TEXT NOT NULL,
+        "displayName" TEXT NOT NULL,
+        "avatarUrl"  TEXT,
+        "role"       TEXT NOT NULL,
+        "joinedAt"   INTEGER NOT NULL,
+        "lastSeenAt" INTEGER NOT NULL,
+        PRIMARY KEY ("roomId", "memberKey")
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS "idx_room_members_roomId" ON "room_members" ("roomId")`);
+
+    const messageRows = await queryRunner.query(`SELECT "id", "reactions" FROM "messages"`) as LegacyMessageRow[];
+
+    for (const row of messageRows) {
+      const reactions = normalizeMessageReactions(row.id, row.reactions);
+
+      for (const reaction of reactions) {
+        const existing = await queryRunner.query(
+          `SELECT 1 FROM "reactions" WHERE "messageId" = ? AND "userId" IS ? AND "emoji" = ? LIMIT 1`,
+          [reaction.messageId, reaction.userId, reaction.emoji]
+        ) as Array<{ 1: number }>;
+
+        if (existing.length > 0) {
+          continue;
+        }
+
+        await queryRunner.query(
+          `INSERT INTO "reactions" ("id", "messageId", "oderId", "userId", "emoji", "timestamp") VALUES (?, ?, ?, ?, ?, ?)`,
+          [reaction.id, reaction.messageId, reaction.oderId, reaction.userId, reaction.emoji, reaction.timestamp]
+        );
+      }
+    }
+
+    const roomRows = await queryRunner.query(`SELECT "id", "channels", "members" FROM "rooms"`) as LegacyRoomRow[];
+
+    for (const row of roomRows) {
+      for (const channel of normalizeRoomChannels(row.channels)) {
+        await queryRunner.query(
+          `INSERT OR REPLACE INTO "room_channels" ("roomId", "channelId", "name", "type", "position") VALUES (?, ?, ?, ?, ?)`,
+          [row.id, channel.channelId, channel.name, channel.type, channel.position]
+        );
+      }
+
+      for (const member of normalizeRoomMembers(row.members)) {
+        await queryRunner.query(
+          `INSERT OR REPLACE INTO "room_members" ("roomId", "memberKey", "id", "oderId", "username", "displayName", "avatarUrl", "role", "joinedAt", "lastSeenAt") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+          [
+            row.id,
+            memberKey(member),
+            member.id,
+            member.oderId ?? null,
+            member.username,
+            member.displayName,
+            member.avatarUrl ?? null,
+            member.role,
+            member.joinedAt,
+            member.lastSeenAt
+          ]
+        );
+      }
+    }
+
+    await queryRunner.query(`
+      CREATE TABLE "messages_next" (
+        "id"         TEXT PRIMARY KEY NOT NULL,
+        "roomId"     TEXT NOT NULL,
+        "channelId"  TEXT,
+        "senderId"   TEXT NOT NULL,
+        "senderName" TEXT NOT NULL,
+        "content"    TEXT NOT NULL,
+        "timestamp"  INTEGER NOT NULL,
+        "editedAt"   INTEGER,
+        "isDeleted"  INTEGER NOT NULL DEFAULT 0,
+        "replyToId"  TEXT
+      )
+    `);
+    await queryRunner.query(`
+      INSERT INTO "messages_next" ("id", "roomId", "channelId", "senderId", "senderName", "content", "timestamp", "editedAt", "isDeleted", "replyToId")
+      SELECT "id", "roomId", "channelId", "senderId", "senderName", "content", "timestamp", "editedAt", "isDeleted", "replyToId"
+      FROM "messages"
+    `);
+    await queryRunner.query(`DROP TABLE "messages"`);
+    await queryRunner.query(`ALTER TABLE "messages_next" RENAME TO "messages"`);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS "idx_messages_roomId" ON "messages" ("roomId")`);
+
+    await queryRunner.query(`
+      CREATE TABLE "rooms_next" (
+        "id"            TEXT PRIMARY KEY NOT NULL,
+        "name"          TEXT NOT NULL,
+        "description"   TEXT,
+        "topic"         TEXT,
+        "hostId"        TEXT NOT NULL,
+        "password"      TEXT,
+        "isPrivate"     INTEGER NOT NULL DEFAULT 0,
+        "createdAt"     INTEGER NOT NULL,
+        "userCount"     INTEGER NOT NULL DEFAULT 0,
+        "maxUsers"      INTEGER,
+        "icon"          TEXT,
+        "iconUpdatedAt" INTEGER,
+        "permissions"   TEXT,
+        "hasPassword"   INTEGER NOT NULL DEFAULT 0,
+        "sourceId"      TEXT,
+        "sourceName"    TEXT,
+        "sourceUrl"     TEXT
+      )
+    `);
+    await queryRunner.query(`
+      INSERT INTO "rooms_next" ("id", "name", "description", "topic", "hostId", "password", "isPrivate", "createdAt", "userCount", "maxUsers", "icon", "iconUpdatedAt", "permissions", "hasPassword", "sourceId", "sourceName", "sourceUrl")
+      SELECT "id", "name", "description", "topic", "hostId", "password", "isPrivate", "createdAt", "userCount", "maxUsers", "icon", "iconUpdatedAt", "permissions", "hasPassword", "sourceId", "sourceName", "sourceUrl"
+      FROM "rooms"
+    `);
+    await queryRunner.query(`DROP TABLE "rooms"`);
+    await queryRunner.query(`ALTER TABLE "rooms_next" RENAME TO "rooms"`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS "room_members"`);
+    await queryRunner.query(`DROP TABLE IF EXISTS "room_channels"`);
+  }
+}

electron/migrations/1000000000004-NormalizeRoomAccessControl.ts

@@ -0,0 +1,310 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+type LegacyRoomRow = {
+  id: string;
+  name: string;
+  description: string | null;
+  topic: string | null;
+  hostId: string;
+  password: string | null;
+  hasPassword: number;
+  isPrivate: number;
+  createdAt: number;
+  userCount: number;
+  maxUsers: number | null;
+  icon: string | null;
+  iconUpdatedAt: number | null;
+  permissions: string | null;
+  sourceId: string | null;
+  sourceName: string | null;
+  sourceUrl: string | null;
+};
+
+type RoomMemberRow = {
+  roomId: string;
+  memberKey: string;
+  id: string;
+  oderId: string | null;
+  role: string;
+};
+
+type LegacyRoomPermissions = {
+  adminsManageRooms?: boolean;
+  moderatorsManageRooms?: boolean;
+  adminsManageIcon?: boolean;
+  moderatorsManageIcon?: boolean;
+  allowVoice?: boolean;
+  allowScreenShare?: boolean;
+  allowFileUploads?: boolean;
+  slowModeInterval?: number;
+};
+
+const SYSTEM_ROLE_IDS = {
+  everyone: 'system-everyone',
+  moderator: 'system-moderator',
+  admin: 'system-admin'
+} as const;
+
+function parseLegacyPermissions(rawPermissions: string | null): LegacyRoomPermissions {
+  try {
+    const parsed = JSON.parse(rawPermissions || '{}') as Record<string, unknown>;
+
+    return {
+      adminsManageRooms: parsed['adminsManageRooms'] === true,
+      moderatorsManageRooms: parsed['moderatorsManageRooms'] === true,
+      adminsManageIcon: parsed['adminsManageIcon'] === true,
+      moderatorsManageIcon: parsed['moderatorsManageIcon'] === true,
+      allowVoice: parsed['allowVoice'] !== false,
+      allowScreenShare: parsed['allowScreenShare'] !== false,
+      allowFileUploads: parsed['allowFileUploads'] !== false,
+      slowModeInterval: typeof parsed['slowModeInterval'] === 'number' && Number.isFinite(parsed['slowModeInterval'])
+        ? parsed['slowModeInterval']
+        : 0
+    };
+  } catch {
+    return {
+      allowVoice: true,
+      allowScreenShare: true,
+      allowFileUploads: true,
+      slowModeInterval: 0
+    };
+  }
+}
+
+function buildDefaultRoomRoles(legacyPermissions: LegacyRoomPermissions) {
+  return [
+    {
+      roleId: SYSTEM_ROLE_IDS.everyone,
+      name: '@everyone',
+      color: '#6b7280',
+      position: 0,
+      isSystem: 1,
+      manageServer: 'inherit',
+      manageRoles: 'inherit',
+      manageChannels: 'inherit',
+      manageIcon: 'inherit',
+      kickMembers: 'inherit',
+      banMembers: 'inherit',
+      manageBans: 'inherit',
+      deleteMessages: 'inherit',
+      joinVoice: legacyPermissions.allowVoice === false ? 'deny' : 'allow',
+      shareScreen: legacyPermissions.allowScreenShare === false ? 'deny' : 'allow',
+      uploadFiles: legacyPermissions.allowFileUploads === false ? 'deny' : 'allow'
+    },
+    {
+      roleId: SYSTEM_ROLE_IDS.moderator,
+      name: 'Moderator',
+      color: '#10b981',
+      position: 200,
+      isSystem: 1,
+      manageServer: 'inherit',
+      manageRoles: 'inherit',
+      manageChannels: legacyPermissions.moderatorsManageRooms ? 'allow' : 'inherit',
+      manageIcon: legacyPermissions.moderatorsManageIcon ? 'allow' : 'inherit',
+      kickMembers: 'allow',
+      banMembers: 'inherit',
+      manageBans: 'inherit',
+      deleteMessages: 'allow',
+      joinVoice: 'inherit',
+      shareScreen: 'inherit',
+      uploadFiles: 'inherit'
+    },
+    {
+      roleId: SYSTEM_ROLE_IDS.admin,
+      name: 'Admin',
+      color: '#60a5fa',
+      position: 300,
+      isSystem: 1,
+      manageServer: 'inherit',
+      manageRoles: 'inherit',
+      manageChannels: legacyPermissions.adminsManageRooms ? 'allow' : 'inherit',
+      manageIcon: legacyPermissions.adminsManageIcon ? 'allow' : 'inherit',
+      kickMembers: 'allow',
+      banMembers: 'allow',
+      manageBans: 'allow',
+      deleteMessages: 'allow',
+      joinVoice: 'inherit',
+      shareScreen: 'inherit',
+      uploadFiles: 'inherit'
+    }
+  ];
+}
+
+function roleIdsForMemberRole(role: string): string[] {
+  if (role === 'admin') {
+    return [SYSTEM_ROLE_IDS.admin];
+  }
+
+  if (role === 'moderator') {
+    return [SYSTEM_ROLE_IDS.moderator];
+  }
+
+  return [];
+}
+
+export class NormalizeRoomAccessControl1000000000004 implements MigrationInterface {
+  name = 'NormalizeRoomAccessControl1000000000004';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS "room_roles" (
+        "roomId" TEXT NOT NULL,
+        "roleId" TEXT NOT NULL,
+        "name" TEXT NOT NULL,
+        "color" TEXT,
+        "position" INTEGER NOT NULL,
+        "isSystem" INTEGER NOT NULL DEFAULT 0,
+        "manageServer" TEXT NOT NULL DEFAULT 'inherit',
+        "manageRoles" TEXT NOT NULL DEFAULT 'inherit',
+        "manageChannels" TEXT NOT NULL DEFAULT 'inherit',
+        "manageIcon" TEXT NOT NULL DEFAULT 'inherit',
+        "kickMembers" TEXT NOT NULL DEFAULT 'inherit',
+        "banMembers" TEXT NOT NULL DEFAULT 'inherit',
+        "manageBans" TEXT NOT NULL DEFAULT 'inherit',
+        "deleteMessages" TEXT NOT NULL DEFAULT 'inherit',
+        "joinVoice" TEXT NOT NULL DEFAULT 'inherit',
+        "shareScreen" TEXT NOT NULL DEFAULT 'inherit',
+        "uploadFiles" TEXT NOT NULL DEFAULT 'inherit',
+        PRIMARY KEY ("roomId", "roleId")
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS "idx_room_roles_roomId" ON "room_roles" ("roomId")`);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS "room_user_roles" (
+        "roomId" TEXT NOT NULL,
+        "userKey" TEXT NOT NULL,
+        "roleId" TEXT NOT NULL,
+        "userId" TEXT NOT NULL,
+        "oderId" TEXT,
+        PRIMARY KEY ("roomId", "userKey", "roleId")
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS "idx_room_user_roles_roomId" ON "room_user_roles" ("roomId")`);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS "room_channel_permissions" (
+        "roomId" TEXT NOT NULL,
+        "channelId" TEXT NOT NULL,
+        "targetType" TEXT NOT NULL,
+        "targetId" TEXT NOT NULL,
+        "permission" TEXT NOT NULL,
+        "value" TEXT NOT NULL,
+        PRIMARY KEY ("roomId", "channelId", "targetType", "targetId", "permission")
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS "idx_room_channel_permissions_roomId" ON "room_channel_permissions" ("roomId")`);
+
+    const rooms = await queryRunner.query(`
+      SELECT "id", "name", "description", "topic", "hostId", "password", "hasPassword", "isPrivate", "createdAt", "userCount", "maxUsers", "icon", "iconUpdatedAt", "permissions", "sourceId", "sourceName", "sourceUrl"
+      FROM "rooms"
+    `) as LegacyRoomRow[];
+    const members = await queryRunner.query(`
+      SELECT "roomId", "memberKey", "id", "oderId", "role"
+      FROM "room_members"
+    `) as RoomMemberRow[];
+
+    for (const room of rooms) {
+      const legacyPermissions = parseLegacyPermissions(room.permissions);
+      const roles = buildDefaultRoomRoles(legacyPermissions);
+
+      for (const role of roles) {
+        await queryRunner.query(
+          `INSERT OR REPLACE INTO "room_roles" ("roomId", "roleId", "name", "color", "position", "isSystem", "manageServer", "manageRoles", "manageChannels", "manageIcon", "kickMembers", "banMembers", "manageBans", "deleteMessages", "joinVoice", "shareScreen", "uploadFiles") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+          [
+            room.id,
+            role.roleId,
+            role.name,
+            role.color,
+            role.position,
+            role.isSystem,
+            role.manageServer,
+            role.manageRoles,
+            role.manageChannels,
+            role.manageIcon,
+            role.kickMembers,
+            role.banMembers,
+            role.manageBans,
+            role.deleteMessages,
+            role.joinVoice,
+            role.shareScreen,
+            role.uploadFiles
+          ]
+        );
+      }
+
+      for (const member of members.filter((candidateMember) => candidateMember.roomId === room.id)) {
+        for (const roleId of roleIdsForMemberRole(member.role)) {
+          await queryRunner.query(
+            `INSERT OR REPLACE INTO "room_user_roles" ("roomId", "userKey", "roleId", "userId", "oderId") VALUES (?, ?, ?, ?, ?)`,
+            [
+              room.id,
+              member.memberKey,
+              roleId,
+              member.id,
+              member.oderId
+            ]
+          );
+        }
+      }
+    }
+
+    await queryRunner.query(`
+      CREATE TABLE "rooms_next" (
+        "id" TEXT PRIMARY KEY NOT NULL,
+        "name" TEXT NOT NULL,
+        "description" TEXT,
+        "topic" TEXT,
+        "hostId" TEXT NOT NULL,
+        "password" TEXT,
+        "hasPassword" INTEGER NOT NULL DEFAULT 0,
+        "isPrivate" INTEGER NOT NULL DEFAULT 0,
+        "createdAt" INTEGER NOT NULL,
+        "userCount" INTEGER NOT NULL DEFAULT 0,
+        "maxUsers" INTEGER,
+        "icon" TEXT,
+        "iconUpdatedAt" INTEGER,
+        "slowModeInterval" INTEGER NOT NULL DEFAULT 0,
+        "sourceId" TEXT,
+        "sourceName" TEXT,
+        "sourceUrl" TEXT
+      )
+    `);
+
+    for (const room of rooms) {
+      const legacyPermissions = parseLegacyPermissions(room.permissions);
+
+      await queryRunner.query(
+        `INSERT INTO "rooms_next" ("id", "name", "description", "topic", "hostId", "password", "hasPassword", "isPrivate", "createdAt", "userCount", "maxUsers", "icon", "iconUpdatedAt", "slowModeInterval", "sourceId", "sourceName", "sourceUrl") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        [
+          room.id,
+          room.name,
+          room.description,
+          room.topic,
+          room.hostId,
+          room.password,
+          room.hasPassword,
+          room.isPrivate,
+          room.createdAt,
+          room.userCount,
+          room.maxUsers,
+          room.icon,
+          room.iconUpdatedAt,
+          legacyPermissions.slowModeInterval ?? 0,
+          room.sourceId,
+          room.sourceName,
+          room.sourceUrl
+        ]
+      );
+    }
+
+    await queryRunner.query(`DROP TABLE "rooms"`);
+    await queryRunner.query(`ALTER TABLE "rooms_next" RENAME TO "rooms"`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS "room_channel_permissions"`);
+    await queryRunner.query(`DROP TABLE IF EXISTS "room_user_roles"`);
+    await queryRunner.query(`DROP TABLE IF EXISTS "room_roles"`);
+  }
+}

electron/preload.ts

@@ -5,6 +5,7 @@ const LINUX_SCREEN_SHARE_MONITOR_AUDIO_CHUNK_CHANNEL = 'linux-screen-share-monit
 const LINUX_SCREEN_SHARE_MONITOR_AUDIO_ENDED_CHANNEL = 'linux-screen-share-monitor-audio-ended';
 const AUTO_UPDATE_STATE_CHANGED_CHANNEL = 'auto-update-state-changed';
 const DEEP_LINK_RECEIVED_CHANNEL = 'deep-link-received';
+const WINDOW_STATE_CHANGED_CHANNEL = 'window-state-changed';
 
 export interface LinuxScreenShareAudioRoutingInfo {
   available: boolean;
@@ -50,6 +51,12 @@ export interface DesktopUpdateServerContext {
   serverVersionStatus: DesktopUpdateServerVersionStatus;
 }
 
+export interface DesktopUpdateServerHealthSnapshot {
+  manifestUrl: string | null;
+  serverVersion: string | null;
+  serverVersionStatus: DesktopUpdateServerVersionStatus;
+}
+
 export interface DesktopUpdateState {
   autoUpdateMode: 'auto' | 'off' | 'version';
   availableVersions: string[];
@@ -84,6 +91,23 @@ export interface DesktopUpdateState {
   targetVersion: string | null;
 }
 
+export interface DesktopNotificationPayload {
+  body: string;
+  requestAttention: boolean;
+  title: string;
+}
+
+export interface WindowStateSnapshot {
+  isFocused: boolean;
+  isMinimized: boolean;
+}
+
+export interface SavedThemeFileDescriptor {
+  fileName: string;
+  modifiedAt: number;
+  path: string;
+}
+
 function readLinuxDisplayServer(): string {
   if (process.platform !== 'linux') {
     return 'N/A';
@@ -116,17 +140,28 @@ export interface ElectronAPI {
   onLinuxScreenShareMonitorAudioChunk: (listener: (payload: LinuxScreenShareMonitorAudioChunkPayload) => void) => () => void;
   onLinuxScreenShareMonitorAudioEnded: (listener: (payload: LinuxScreenShareMonitorAudioEndedPayload) => void) => () => void;
   getAppDataPath: () => Promise<string>;
+  getSavedThemesPath: () => Promise<string>;
+  listSavedThemes: () => Promise<SavedThemeFileDescriptor[]>;
+  readSavedTheme: (fileName: string) => Promise<string>;
+  writeSavedTheme: (fileName: string, text: string) => Promise<boolean>;
+  deleteSavedTheme: (fileName: string) => Promise<boolean>;
   consumePendingDeepLink: () => Promise<string | null>;
   getDesktopSettings: () => Promise<{
     autoUpdateMode: 'auto' | 'off' | 'version';
     autoStart: boolean;
+    closeToTray: boolean;
     hardwareAcceleration: boolean;
     manifestUrls: string[];
     preferredVersion: string | null;
     runtimeHardwareAcceleration: boolean;
     restartRequired: boolean;
   }>;
+  showDesktopNotification: (payload: DesktopNotificationPayload) => Promise<boolean>;
+  requestWindowAttention: () => Promise<boolean>;
+  clearWindowAttention: () => Promise<boolean>;
+  onWindowStateChanged: (listener: (state: WindowStateSnapshot) => void) => () => void;
   getAutoUpdateState: () => Promise<DesktopUpdateState>;
+  getAutoUpdateServerHealth: (serverUrl: string) => Promise<DesktopUpdateServerHealthSnapshot>;
   configureAutoUpdateContext: (context: Partial<DesktopUpdateServerContext>) => Promise<DesktopUpdateState>;
   checkForAppUpdates: () => Promise<DesktopUpdateState>;
   restartToApplyUpdate: () => Promise<boolean>;
@@ -134,6 +169,7 @@ export interface ElectronAPI {
   setDesktopSettings: (patch: {
     autoUpdateMode?: 'auto' | 'off' | 'version';
     autoStart?: boolean;
+    closeToTray?: boolean;
     hardwareAcceleration?: boolean;
     manifestUrls?: string[];
     preferredVersion?: string | null;
@@ -141,6 +177,7 @@ export interface ElectronAPI {
   }) => Promise<{
     autoUpdateMode: 'auto' | 'off' | 'version';
     autoStart: boolean;
+    closeToTray: boolean;
     hardwareAcceleration: boolean;
     manifestUrls: string[];
     preferredVersion: string | null;
@@ -204,9 +241,29 @@ const electronAPI: ElectronAPI = {
     };
   },
   getAppDataPath: () => ipcRenderer.invoke('get-app-data-path'),
+  getSavedThemesPath: () => ipcRenderer.invoke('get-saved-themes-path'),
+  listSavedThemes: () => ipcRenderer.invoke('list-saved-themes'),
+  readSavedTheme: (fileName) => ipcRenderer.invoke('read-saved-theme', fileName),
+  writeSavedTheme: (fileName, text) => ipcRenderer.invoke('write-saved-theme', fileName, text),
+  deleteSavedTheme: (fileName) => ipcRenderer.invoke('delete-saved-theme', fileName),
   consumePendingDeepLink: () => ipcRenderer.invoke('consume-pending-deep-link'),
   getDesktopSettings: () => ipcRenderer.invoke('get-desktop-settings'),
+  showDesktopNotification: (payload) => ipcRenderer.invoke('show-desktop-notification', payload),
+  requestWindowAttention: () => ipcRenderer.invoke('request-window-attention'),
+  clearWindowAttention: () => ipcRenderer.invoke('clear-window-attention'),
+  onWindowStateChanged: (listener) => {
+    const wrappedListener = (_event: Electron.IpcRendererEvent, state: WindowStateSnapshot) => {
+      listener(state);
+    };
+
+    ipcRenderer.on(WINDOW_STATE_CHANGED_CHANNEL, wrappedListener);
+
+    return () => {
+      ipcRenderer.removeListener(WINDOW_STATE_CHANGED_CHANNEL, wrappedListener);
+    };
+  },
   getAutoUpdateState: () => ipcRenderer.invoke('get-auto-update-state'),
+  getAutoUpdateServerHealth: (serverUrl) => ipcRenderer.invoke('get-auto-update-server-health', serverUrl),
   configureAutoUpdateContext: (context) => ipcRenderer.invoke('configure-auto-update-context', context),
   checkForAppUpdates: () => ipcRenderer.invoke('check-for-app-updates'),
   restartToApplyUpdate: () => ipcRenderer.invoke('restart-to-apply-update'),

electron/theme-library.ts

@@ -0,0 +1,91 @@
+import { app } from 'electron';
+import * as fsp from 'fs/promises';
+import * as path from 'path';
+
+export interface SavedThemeFileDescriptor {
+  fileName: string;
+  modifiedAt: number;
+  path: string;
+}
+
+const SAVED_THEME_FILE_NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]*\.json$/;
+
+function resolveSavedThemesPath(): string {
+  return path.join(app.getPath('userData'), 'themes');
+}
+
+async function ensureSavedThemesPath(): Promise<string> {
+  const themesPath = resolveSavedThemesPath();
+
+  await fsp.mkdir(themesPath, { recursive: true });
+
+  return themesPath;
+}
+
+function assertSavedThemeFileName(fileName: string): string {
+  const normalized = typeof fileName === 'string'
+    ? fileName.trim()
+    : '';
+
+  if (!SAVED_THEME_FILE_NAME_PATTERN.test(normalized) || normalized.includes('..')) {
+    throw new Error('Invalid saved theme file name.');
+  }
+
+  return normalized;
+}
+
+async function resolveSavedThemeFilePath(fileName: string): Promise<string> {
+  const themesPath = await ensureSavedThemesPath();
+
+  return path.join(themesPath, assertSavedThemeFileName(fileName));
+}
+
+export async function getSavedThemesPath(): Promise<string> {
+  return await ensureSavedThemesPath();
+}
+
+export async function listSavedThemes(): Promise<SavedThemeFileDescriptor[]> {
+  const themesPath = await ensureSavedThemesPath();
+  const entries = await fsp.readdir(themesPath, { withFileTypes: true });
+  const files = entries.filter((entry) => entry.isFile() && entry.name.toLowerCase().endsWith('.json'));
+  const descriptors = await Promise.all(files.map(async (entry) => {
+    const filePath = path.join(themesPath, entry.name);
+    const stats = await fsp.stat(filePath);
+
+    return {
+      fileName: entry.name,
+      modifiedAt: Math.round(stats.mtimeMs),
+      path: filePath
+    } satisfies SavedThemeFileDescriptor;
+  }));
+
+  return descriptors.sort((left, right) => right.modifiedAt - left.modifiedAt || left.fileName.localeCompare(right.fileName));
+}
+
+export async function readSavedTheme(fileName: string): Promise<string> {
+  const filePath = await resolveSavedThemeFilePath(fileName);
+
+  return await fsp.readFile(filePath, 'utf8');
+}
+
+export async function writeSavedTheme(fileName: string, text: string): Promise<boolean> {
+  const filePath = await resolveSavedThemeFilePath(fileName);
+
+  await fsp.writeFile(filePath, text, 'utf8');
+  return true;
+}
+
+export async function deleteSavedTheme(fileName: string): Promise<boolean> {
+  const filePath = await resolveSavedThemeFilePath(fileName);
+
+  try {
+    await fsp.unlink(filePath);
+    return true;
+  } catch (error) {
+    if ((error as { code?: string }).code === 'ENOENT') {
+      return true;
+    }
+
+    throw error;
+  }
+}

electron/update/desktop-updater.ts

@@ -18,6 +18,11 @@ interface ReleaseManifestEntry {
   version: string;
 }
 
+interface ServerHealthResponse {
+  releaseManifestUrl?: string;
+  serverVersion?: string;
+}
+
 interface UpdateVersionInfo {
   version: string;
 }
@@ -53,6 +58,12 @@ export interface DesktopUpdateServerContext {
   serverVersionStatus: DesktopUpdateServerVersionStatus;
 }
 
+export interface DesktopUpdateServerHealthSnapshot {
+  manifestUrl: string | null;
+  serverVersion: string | null;
+  serverVersionStatus: DesktopUpdateServerVersionStatus;
+}
+
 export interface DesktopUpdateState {
   autoUpdateMode: AutoUpdateMode;
   availableVersions: string[];
@@ -78,6 +89,8 @@ export interface DesktopUpdateState {
 
 export const AUTO_UPDATE_STATE_CHANGED_CHANNEL = 'auto-update-state-changed';
 
+const SERVER_HEALTH_TIMEOUT_MS = 5_000;
+
 let currentCheckPromise: Promise<void> | null = null;
 let currentContext: DesktopUpdateServerContext = {
   manifestUrls: [],
@@ -388,6 +401,47 @@ async function loadReleaseManifest(manifestUrl: string): Promise<ReleaseManifest
   return parseReleaseManifest(payload);
 }
 
+function createUnavailableServerHealthSnapshot(): DesktopUpdateServerHealthSnapshot {
+  return {
+    manifestUrl: null,
+    serverVersion: null,
+    serverVersionStatus: 'unavailable'
+  };
+}
+
+async function loadServerHealth(serverUrl: string): Promise<DesktopUpdateServerHealthSnapshot> {
+  const sanitizedServerUrl = sanitizeHttpUrl(serverUrl);
+
+  if (!sanitizedServerUrl) {
+    return createUnavailableServerHealthSnapshot();
+  }
+
+  try {
+    const response = await net.fetch(`${sanitizedServerUrl}/api/health`, {
+      method: 'GET',
+      headers: {
+        accept: 'application/json'
+      },
+      signal: AbortSignal.timeout(SERVER_HEALTH_TIMEOUT_MS)
+    });
+
+    if (!response.ok) {
+      return createUnavailableServerHealthSnapshot();
+    }
+
+    const payload = await response.json() as ServerHealthResponse;
+    const serverVersion = normalizeSemanticVersion(payload.serverVersion);
+
+    return {
+      manifestUrl: sanitizeHttpUrl(payload.releaseManifestUrl),
+      serverVersion,
+      serverVersionStatus: serverVersion ? 'reported' : 'missing'
+    };
+  } catch {
+    return createUnavailableServerHealthSnapshot();
+  }
+}
+
 function formatManifestLoadErrors(errors: string[]): string {
   if (errors.length === 0) {
     return 'No valid release manifest could be loaded.';
@@ -724,6 +778,12 @@ export async function checkForDesktopUpdates(): Promise<DesktopUpdateState> {
   return desktopUpdateState;
 }
 
+export async function readDesktopUpdateServerHealth(
+  serverUrl: string
+): Promise<DesktopUpdateServerHealthSnapshot> {
+  return await loadServerHealth(serverUrl);
+}
+
 export function restartToApplyUpdate(): boolean {
   if (!desktopUpdateState.restartRequired) {
     return false;

electron/window/create-window.ts

@@ -2,13 +2,21 @@ import {
   app,
   BrowserWindow,
   desktopCapturer,
+  Menu,
   session,
-  shell
+  shell,
+  Tray
 } from 'electron';
 import * as fs from 'fs';
 import * as path from 'path';
+import { readDesktopSettings } from '../desktop-settings';
 
 let mainWindow: BrowserWindow | null = null;
+let tray: Tray | null = null;
+let closeToTrayEnabled = true;
+let appQuitting = false;
+
+const WINDOW_STATE_CHANGED_CHANNEL = 'window-state-changed';
 
 function getAssetPath(...segments: string[]): string {
   const basePath = app.isPackaged
@@ -38,13 +46,124 @@ export function getDockIconPath(): string | undefined {
   return getExistingAssetPath('macos', '1024x1024.png');
 }
 
+function getTrayIconPath(): string | undefined {
+  if (process.platform === 'win32')
+    return getExistingAssetPath('windows', 'icon.ico');
+
+  return getExistingAssetPath('icon.png');
+}
+
+export { getWindowIconPath };
+
 export function getMainWindow(): BrowserWindow | null {
   return mainWindow;
 }
 
+function destroyTray(): void {
+  if (!tray) {
+    return;
+  }
+
+  tray.destroy();
+  tray = null;
+}
+
+function requestAppQuit(): void {
+  prepareWindowForAppQuit();
+  app.quit();
+}
+
+function ensureTray(): void {
+  if (tray) {
+    return;
+  }
+
+  const trayIconPath = getTrayIconPath();
+
+  if (!trayIconPath) {
+    return;
+  }
+
+  tray = new Tray(trayIconPath);
+  tray.setToolTip('MetoYou');
+  tray.setContextMenu(
+    Menu.buildFromTemplate([
+      {
+        label: 'Open MetoYou',
+        click: () => {
+          void showMainWindow();
+        }
+      },
+      {
+        type: 'separator'
+      },
+      {
+        label: 'Close MetoYou',
+        click: () => {
+          requestAppQuit();
+        }
+      }
+    ])
+  );
+
+  tray.on('click', () => {
+    void showMainWindow();
+  });
+}
+
+function hideWindowToTray(): void {
+  if (!mainWindow || mainWindow.isDestroyed()) {
+    return;
+  }
+
+  mainWindow.hide();
+  emitWindowState();
+}
+
+export function updateCloseToTraySetting(enabled: boolean): void {
+  closeToTrayEnabled = enabled;
+}
+
+export function prepareWindowForAppQuit(): void {
+  appQuitting = true;
+  destroyTray();
+}
+
+export async function showMainWindow(): Promise<void> {
+  if (!mainWindow || mainWindow.isDestroyed()) {
+    await createWindow();
+    return;
+  }
+
+  if (mainWindow.isMinimized()) {
+    mainWindow.restore();
+  }
+
+  if (!mainWindow.isVisible()) {
+    mainWindow.show();
+  }
+
+  mainWindow.focus();
+  emitWindowState();
+}
+
+function emitWindowState(): void {
+  if (!mainWindow || mainWindow.isDestroyed()) {
+    return;
+  }
+
+  mainWindow.webContents.send(WINDOW_STATE_CHANGED_CHANNEL, {
+    isFocused: mainWindow.isFocused(),
+    isMinimized: mainWindow.isMinimized()
+  });
+}
+
 export async function createWindow(): Promise<void> {
   const windowIconPath = getWindowIconPath();
 
+  closeToTrayEnabled = readDesktopSettings().closeToTray;
+  ensureTray();
+
   mainWindow = new BrowserWindow({
     width: 1400,
     height: 900,
@@ -105,10 +224,46 @@ export async function createWindow(): Promise<void> {
     await mainWindow.loadFile(path.join(__dirname, '..', '..', 'client', 'browser', 'index.html'));
   }
 
+  mainWindow.on('close', (event) => {
+    if (appQuitting || !closeToTrayEnabled) {
+      return;
+    }
+
+    event.preventDefault();
+    hideWindowToTray();
+  });
+
   mainWindow.on('closed', () => {
     mainWindow = null;
   });
 
+  mainWindow.on('focus', () => {
+    mainWindow?.flashFrame(false);
+    emitWindowState();
+  });
+
+  mainWindow.on('blur', () => {
+    emitWindowState();
+  });
+
+  mainWindow.on('minimize', () => {
+    emitWindowState();
+  });
+
+  mainWindow.on('restore', () => {
+    emitWindowState();
+  });
+
+  mainWindow.on('show', () => {
+    emitWindowState();
+  });
+
+  mainWindow.on('hide', () => {
+    emitWindowState();
+  });
+
+  emitWindowState();
+
   mainWindow.webContents.setWindowOpenHandler(({ url }) => {
     shell.openExternal(url);
     return { action: 'deny' };

eslint.config.js

@@ -199,7 +199,7 @@ module.exports = tseslint.config(
   },
   // HTML template formatting rules (external Angular templates only)
   {
-    files: ['src/app/**/*.html'],
+    files: ['toju-app/src/app/**/*.html'],
     plugins: { 'no-dashes': noDashPlugin },
     extends: [...angular.configs.templateRecommended, ...angular.configs.templateAccessibility],
     rules: {

package-lock.json

@@ -14,6 +14,12 @@
         "@angular/forms": "^21.0.0",
         "@angular/platform-browser": "^21.0.0",
         "@angular/router": "^21.0.0",
+        "@codemirror/commands": "^6.10.3",
+        "@codemirror/lang-json": "^6.0.2",
+        "@codemirror/language": "^6.12.3",
+        "@codemirror/state": "^6.6.0",
+        "@codemirror/theme-one-dark": "^6.1.3",
+        "@codemirror/view": "^6.41.0",
         "@ng-icons/core": "^33.0.0",
         "@ng-icons/lucide": "^33.0.0",
         "@ngrx/effects": "^21.0.1",
@@ -27,6 +33,7 @@
         "auto-launch": "^5.0.6",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
+        "codemirror": "^6.0.2",
         "cytoscape": "^3.33.1",
         "electron-updater": "^6.6.2",
         "mermaid": "^11.12.3",
@@ -2697,6 +2704,109 @@
       "integrity": "sha512-4mudFAQ6H+MqBTfqLmU7G1ZwRzCLfJEooL/fsF6rCX5eePMbGhoy5n4g+G4vlh2muDcsCTJtL+uKbOzWxs5LHA==",
       "license": "Apache-2.0"
     },
+    "node_modules/@codemirror/autocomplete": {
+      "version": "6.20.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.20.1.tgz",
+      "integrity": "sha512-1cvg3Vz1dSSToCNlJfRA2WSI4ht3K+WplO0UMOgmUYPivCyy2oueZY6Lx7M9wThm7SDUBViRmuT+OG/i8+ON9A==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.17.0",
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/commands": {
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.10.3.tgz",
+      "integrity": "sha512-JFRiqhKu+bvSkDLI+rUhJwSxQxYb759W5GBezE8Uc8mHLqC9aV/9aTC7yJSqCtB3F00pylrLCwnyS91Ap5ej4Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.6.0",
+        "@codemirror/view": "^6.27.0",
+        "@lezer/common": "^1.1.0"
+      }
+    },
+    "node_modules/@codemirror/lang-json": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.2.tgz",
+      "integrity": "sha512-x2OtO+AvwEHrEwR0FyyPtfDUiloG3rnVTSZV1W8UteaLL8/MajQd8DpvUb2YVzC+/T18aSDv0H9mu+xw0EStoQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@lezer/json": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/language": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.12.3.tgz",
+      "integrity": "sha512-QwCZW6Tt1siP37Jet9Tb02Zs81TQt6qQrZR2H+eGMcFsL1zMrk2/b9CLC7/9ieP1fjIUMgviLWMmgiHoJrj+ZA==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.23.0",
+        "@lezer/common": "^1.5.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0",
+        "style-mod": "^4.0.0"
+      }
+    },
+    "node_modules/@codemirror/lint": {
+      "version": "6.9.5",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.9.5.tgz",
+      "integrity": "sha512-GElsbU9G7QT9xXhpUg1zWGmftA/7jamh+7+ydKRuT0ORpWS3wOSP0yT1FOlIZa7mIJjpVPipErsyvVqB9cfTFA==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.35.0",
+        "crelt": "^1.0.5"
+      }
+    },
+    "node_modules/@codemirror/search": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.6.0.tgz",
+      "integrity": "sha512-koFuNXcDvyyotWcgOnZGmY7LZqEOXZaaxD/j6n18TCLx2/9HieZJ5H6hs1g8FiRxBD0DNfs0nXn17g872RmYdw==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.37.0",
+        "crelt": "^1.0.5"
+      }
+    },
+    "node_modules/@codemirror/state": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.6.0.tgz",
+      "integrity": "sha512-4nbvra5R5EtiCzr9BTHiTLc+MLXK2QGiAVYMyi8PkQd3SR+6ixar/Q/01Fa21TBIDOZXgeWV4WppsQolSreAPQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@marijn/find-cluster-break": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/theme-one-dark": {
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.3.tgz",
+      "integrity": "sha512-NzBdIvEJmx6fjeremiGp3t/okrLPYT0d9orIc7AFun8oZcRk58aejkqhv6spnz4MLAevrKNPMQYXEWMg4s+sKA==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/highlight": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/view": {
+      "version": "6.41.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.41.0.tgz",
+      "integrity": "sha512-6H/qadXsVuDY219Yljhohglve8xf4B8xJkVOEWfA5uiYKiTFppjqsvsfR5iPA0RbvRBoOyTZpbLIxe9+0UR8xA==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/state": "^6.6.0",
+        "crelt": "^1.0.6",
+        "style-mod": "^4.1.0",
+        "w3c-keyname": "^2.2.4"
+      }
+    },
     "node_modules/@develar/schema-utils": {
       "version": "2.6.5",
       "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.6.5.tgz",
@@ -5672,6 +5782,41 @@
       "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
       "license": "MIT"
     },
+    "node_modules/@lezer/common": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.1.tgz",
+      "integrity": "sha512-6YRVG9vBkaY7p1IVxL4s44n5nUnaNnGM2/AckNgYOnxTG2kWh1vR8BMxPseWPjRNpb5VtXnMpeYAEAADoRV1Iw==",
+      "license": "MIT"
+    },
+    "node_modules/@lezer/highlight": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.3.tgz",
+      "integrity": "sha512-qXdH7UqTvGfdVBINrgKhDsVTJTxactNNxLk7+UMwZhU13lMHaOBlJe9Vqp907ya56Y3+ed2tlqzys7jDkTmW0g==",
+      "license": "MIT",
+      "dependencies": {
+        "@lezer/common": "^1.3.0"
+      }
+    },
+    "node_modules/@lezer/json": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@lezer/json/-/json-1.0.3.tgz",
+      "integrity": "sha512-BP9KzdF9Y35PDpv04r0VeSTKDeox5vVr3efE7eBbx3r4s3oNLfunchejZhjArmeieBH+nVOpgIiBJpEAv8ilqQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@lezer/common": "^1.2.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
+      }
+    },
+    "node_modules/@lezer/lr": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.8.tgz",
+      "integrity": "sha512-bPWa0Pgx69ylNlMlPvBPryqeLYQjyJjqPx+Aupm5zydLIF3NE+6MMLT8Yi23Bd9cif9VS00aUebn+6fDIGBcDA==",
+      "license": "MIT",
+      "dependencies": {
+        "@lezer/common": "^1.0.0"
+      }
+    },
     "node_modules/@listr2/prompt-adapter-inquirer": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-3.0.5.tgz",
@@ -5865,6 +6010,12 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/@marijn/find-cluster-break": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
+      "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
+      "license": "MIT"
+    },
     "node_modules/@mermaid-js/parser": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-1.0.0.tgz",
@@ -14138,6 +14289,21 @@
       "integrity": "sha512-Oofo0pq3IKnsFtuHqSF7TqBfr71aeyZDVJ0HpmqB7FBM2qEigL0iPONSCZSO9pE9dZTAxANe5XHG9Uy0YMv8cg==",
       "license": "MIT"
     },
+    "node_modules/codemirror": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.2.tgz",
+      "integrity": "sha512-VhydHotNW5w1UGK0Qj96BwSk/Zqbp9WbnyK2W/eVMv4QyF41INRGpjUhFJY7/uDNuudSc33a/PKr4iDqRduvHw==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/commands": "^6.0.0",
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/lint": "^6.0.0",
+        "@codemirror/search": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -14766,6 +14932,12 @@
         "ieee754": "^1.1.13"
       }
     },
+    "node_modules/crelt": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
+      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+      "license": "MIT"
+    },
     "node_modules/cron-parser": {
       "version": "4.9.0",
       "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz",
@@ -27782,6 +27954,12 @@
         "webpack": "^5.0.0"
       }
     },
+    "node_modules/style-mod": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz",
+      "integrity": "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==",
+      "license": "MIT"
+    },
     "node_modules/stylehacks": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.1.1.tgz",
@@ -30374,6 +30552,12 @@
       "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
       "license": "MIT"
     },
+    "node_modules/w3c-keyname": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
+      "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
+      "license": "MIT"
+    },
     "node_modules/wait-on": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.2.0.tgz",

package.json

@@ -7,22 +7,22 @@
   "homepage": "https://git.azaaxin.com/myxelium/Toju",
   "main": "dist/electron/main.js",
   "scripts": {
-    "ng": "ng",
+    "ng": "cd \"toju-app\" && ng",
     "prebuild": "npm run bundle:rnnoise",
     "prestart": "npm run bundle:rnnoise",
-    "bundle:rnnoise": "esbuild node_modules/@timephy/rnnoise-wasm/dist/NoiseSuppressorWorklet.js --bundle --format=esm --outfile=public/rnnoise-worklet.js",
-    "start": "ng serve",
-    "build": "ng build",
+    "bundle:rnnoise": "esbuild node_modules/@timephy/rnnoise-wasm/dist/NoiseSuppressorWorklet.js --bundle --format=esm --outfile=toju-app/public/rnnoise-worklet.js",
+    "start": "cd \"toju-app\" && ng serve",
+    "build": "cd \"toju-app\" && ng build",
     "build:electron": "tsc -p tsconfig.electron.json",
     "build:all": "npm run build && npm run build:electron && cd server && npm run build",
-    "build:prod": "ng build --configuration production --base-href='./'",
-    "watch": "ng build --watch --configuration development",
-    "test": "ng test",
+    "build:prod": "cd \"toju-app\" && ng build --configuration production --base-href='./'",
+    "watch": "cd \"toju-app\" && ng build --watch --configuration development",
+    "test": "cd \"toju-app\" && ng test",
     "server:build": "cd server && npm run build",
     "server:start": "cd server && npm start",
     "server:dev": "cd server && npm run dev",
-    "electron": "ng build && npm run build:electron && node tools/launch-electron.js . --no-sandbox --disable-dev-shm-usage",
-    "electron:dev": "concurrently \"ng serve\" \"wait-on http://localhost:4200 && npm run build:electron && cross-env NODE_ENV=development node tools/launch-electron.js . --no-sandbox --disable-dev-shm-usage\"",
+    "electron": "npm run build && npm run build:electron && node tools/launch-electron.js . --no-sandbox --disable-dev-shm-usage",
+    "electron:dev": "concurrently \"npm run start\" \"wait-on http://localhost:4200 && npm run build:electron && cross-env NODE_ENV=development node tools/launch-electron.js . --no-sandbox --disable-dev-shm-usage\"",
     "electron:full": "./dev.sh",
     "electron:full:build": "npm run build:all && concurrently --kill-others \"cd server && npm start\" \"cross-env NODE_ENV=production node tools/launch-electron.js . --no-sandbox --disable-dev-shm-usage\"",
     "migration:generate": "typeorm migration:generate electron/migrations/Auto -d dist/electron/data-source.js",
@@ -40,8 +40,8 @@
     "dev:app": "npm run electron:dev",
     "lint": "eslint .",
     "lint:fix": "npm run format && npm run sort:props && eslint . --fix",
-    "format": "prettier --write \"src/app/**/*.html\"",
-    "format:check": "prettier --check \"src/app/**/*.html\"",
+    "format": "prettier --write \"toju-app/src/app/**/*.html\"",
+    "format:check": "prettier --check \"toju-app/src/app/**/*.html\"",
     "release:build:linux": "npm run build:prod:all && electron-builder --linux && npm run server:bundle:linux",
     "release:build:win": "npm run build:prod:all && electron-builder --win && npm run server:bundle:win",
     "release:manifest": "node tools/generate-release-manifest.js",
@@ -60,6 +60,12 @@
     "@angular/forms": "^21.0.0",
     "@angular/platform-browser": "^21.0.0",
     "@angular/router": "^21.0.0",
+    "@codemirror/commands": "^6.10.3",
+    "@codemirror/lang-json": "^6.0.2",
+    "@codemirror/language": "^6.12.3",
+    "@codemirror/state": "^6.6.0",
+    "@codemirror/theme-one-dark": "^6.1.3",
+    "@codemirror/view": "^6.41.0",
     "@ng-icons/core": "^33.0.0",
     "@ng-icons/lucide": "^33.0.0",
     "@ngrx/effects": "^21.0.1",
@@ -73,6 +79,7 @@
     "auto-launch": "^5.0.6",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
+    "codemirror": "^6.0.2",
     "cytoscape": "^3.33.1",
     "electron-updater": "^6.6.2",
     "mermaid": "^11.12.3",

server/src/cqrs/commands/handlers/deleteServer.ts

@@ -1,6 +1,11 @@
 import { DataSource } from 'typeorm';
 import {
+  ServerChannelPermissionEntity,
+  ServerChannelEntity,
   ServerEntity,
+  ServerRoleEntity,
+  ServerTagEntity,
+  ServerUserRoleEntity,
   JoinRequestEntity,
   ServerMembershipEntity,
   ServerInviteEntity,
@@ -11,9 +16,16 @@ import { DeleteServerCommand } from '../../types';
 export async function handleDeleteServer(command: DeleteServerCommand, dataSource: DataSource): Promise<void> {
   const { serverId } = command.payload;
 
-  await dataSource.getRepository(JoinRequestEntity).delete({ serverId });
-  await dataSource.getRepository(ServerMembershipEntity).delete({ serverId });
-  await dataSource.getRepository(ServerInviteEntity).delete({ serverId });
-  await dataSource.getRepository(ServerBanEntity).delete({ serverId });
-  await dataSource.getRepository(ServerEntity).delete(serverId);
+  await dataSource.transaction(async (manager) => {
+    await manager.getRepository(ServerTagEntity).delete({ serverId });
+    await manager.getRepository(ServerChannelEntity).delete({ serverId });
+    await manager.getRepository(ServerRoleEntity).delete({ serverId });
+    await manager.getRepository(ServerUserRoleEntity).delete({ serverId });
+    await manager.getRepository(ServerChannelPermissionEntity).delete({ serverId });
+    await manager.getRepository(JoinRequestEntity).delete({ serverId });
+    await manager.getRepository(ServerMembershipEntity).delete({ serverId });
+    await manager.getRepository(ServerInviteEntity).delete({ serverId });
+    await manager.getRepository(ServerBanEntity).delete({ serverId });
+    await manager.getRepository(ServerEntity).delete(serverId);
+  });
 }

server/src/cqrs/commands/handlers/upsertServer.ts

@@ -1,24 +1,35 @@
 import { DataSource } from 'typeorm';
 import { ServerEntity } from '../../../entities';
+import { replaceServerRelations } from '../../relations';
 import { UpsertServerCommand } from '../../types';
 
 export async function handleUpsertServer(command: UpsertServerCommand, dataSource: DataSource): Promise<void> {
-  const repo = dataSource.getRepository(ServerEntity);
   const { server } = command.payload;
-  const entity = repo.create({
-    id: server.id,
-    name: server.name,
-    description: server.description ?? null,
-    ownerId: server.ownerId,
-    ownerPublicKey: server.ownerPublicKey,
-    passwordHash: server.passwordHash ?? null,
-    isPrivate: server.isPrivate ? 1 : 0,
-    maxUsers: server.maxUsers,
-    currentUsers: server.currentUsers,
-    tags: JSON.stringify(server.tags),
-    createdAt: server.createdAt,
-    lastSeen: server.lastSeen
-  });
 
-  await repo.save(entity);
+  await dataSource.transaction(async (manager) => {
+    const repo = manager.getRepository(ServerEntity);
+    const entity = repo.create({
+      id: server.id,
+      name: server.name,
+      description: server.description ?? null,
+      ownerId: server.ownerId,
+      ownerPublicKey: server.ownerPublicKey,
+      passwordHash: server.passwordHash ?? null,
+      isPrivate: server.isPrivate ? 1 : 0,
+      maxUsers: server.maxUsers,
+      currentUsers: server.currentUsers,
+      slowModeInterval: server.slowModeInterval ?? 0,
+      createdAt: server.createdAt,
+      lastSeen: server.lastSeen
+    });
+
+    await repo.save(entity);
+    await replaceServerRelations(manager, server.id, {
+      tags: server.tags,
+      channels: server.channels ?? [],
+      roles: server.roles ?? [],
+      roleAssignments: server.roleAssignments ?? [],
+      channelPermissions: server.channelPermissions ?? []
+    });
+  });
 }

server/src/cqrs/mappers.ts

@@ -6,6 +6,7 @@ import {
   ServerPayload,
   JoinRequestPayload
 } from './types';
+import { relationRecordToServerPayload } from './relations';
 
 export function rowToAuthUser(row: AuthUserEntity): AuthUserPayload {
   return {
@@ -17,7 +18,24 @@ export function rowToAuthUser(row: AuthUserEntity): AuthUserPayload {
   };
 }
 
-export function rowToServer(row: ServerEntity): ServerPayload {
+export function rowToServer(
+  row: ServerEntity,
+  relations: Pick<ServerPayload, 'tags' | 'channels' | 'roles' | 'roleAssignments' | 'channelPermissions'> = {
+    tags: [],
+    channels: [],
+    roles: [],
+    roleAssignments: [],
+    channelPermissions: []
+  }
+): ServerPayload {
+  const relationPayload = relationRecordToServerPayload({ slowModeInterval: row.slowModeInterval }, {
+    tags: relations.tags ?? [],
+    channels: relations.channels ?? [],
+    roles: relations.roles ?? [],
+    roleAssignments: relations.roleAssignments ?? [],
+    channelPermissions: relations.channelPermissions ?? []
+  });
+
   return {
     id: row.id,
     name: row.name,
@@ -29,7 +47,12 @@ export function rowToServer(row: ServerEntity): ServerPayload {
     isPrivate: !!row.isPrivate,
     maxUsers: row.maxUsers,
     currentUsers: row.currentUsers,
-    tags: JSON.parse(row.tags || '[]'),
+    slowModeInterval: relationPayload.slowModeInterval,
+    tags: relationPayload.tags,
+    channels: relationPayload.channels,
+    roles: relationPayload.roles,
+    roleAssignments: relationPayload.roleAssignments,
+    channelPermissions: relationPayload.channelPermissions,
     createdAt: row.createdAt,
     lastSeen: row.lastSeen
   };

server/src/cqrs/queries/handlers/getAllPublicServers.ts

@@ -1,10 +1,12 @@
 import { DataSource } from 'typeorm';
 import { ServerEntity } from '../../../entities';
 import { rowToServer } from '../../mappers';
+import { loadServerRelationsMap } from '../../relations';
 
 export async function handleGetAllPublicServers(dataSource: DataSource) {
   const repo = dataSource.getRepository(ServerEntity);
   const rows = await repo.find({ where: { isPrivate: 0 } });
+  const relationsByServerId = await loadServerRelationsMap(dataSource, rows.map((row) => row.id));
 
-  return rows.map(rowToServer);
+  return rows.map((row) => rowToServer(row, relationsByServerId.get(row.id)));
 }

server/src/cqrs/queries/handlers/getServerById.ts

@@ -2,10 +2,17 @@ import { DataSource } from 'typeorm';
 import { ServerEntity } from '../../../entities';
 import { GetServerByIdQuery } from '../../types';
 import { rowToServer } from '../../mappers';
+import { loadServerRelationsMap } from '../../relations';
 
 export async function handleGetServerById(query: GetServerByIdQuery, dataSource: DataSource) {
   const repo = dataSource.getRepository(ServerEntity);
   const row = await repo.findOne({ where: { id: query.payload.serverId } });
 
-  return row ? rowToServer(row) : null;
+  if (!row) {
+    return null;
+  }
+
+  const relationsByServerId = await loadServerRelationsMap(dataSource, [row.id]);
+
+  return rowToServer(row, relationsByServerId.get(row.id));
 }

server/src/cqrs/relations.ts

@@ -0,0 +1,603 @@
+import {
+  DataSource,
+  EntityManager,
+  In
+} from 'typeorm';
+import {
+  ServerChannelEntity,
+  ServerTagEntity,
+  ServerRoleEntity,
+  ServerUserRoleEntity,
+  ServerChannelPermissionEntity
+} from '../entities';
+import {
+  AccessRolePayload,
+  ChannelPermissionPayload,
+  RoleAssignmentPayload,
+  ServerChannelPayload,
+  ServerPayload,
+  ServerPermissionKeyPayload,
+  PermissionStatePayload
+} from './types';
+
+const SERVER_PERMISSION_KEYS: ServerPermissionKeyPayload[] = [
+  'manageServer',
+  'manageRoles',
+  'manageChannels',
+  'manageIcon',
+  'kickMembers',
+  'banMembers',
+  'manageBans',
+  'deleteMessages',
+  'joinVoice',
+  'shareScreen',
+  'uploadFiles'
+];
+const SYSTEM_ROLE_IDS = {
+  everyone: 'system-everyone',
+  moderator: 'system-moderator',
+  admin: 'system-admin'
+} as const;
+
+interface ServerRelationRecord {
+  tags: string[];
+  channels: ServerChannelPayload[];
+  roles: AccessRolePayload[];
+  roleAssignments: RoleAssignmentPayload[];
+  channelPermissions: ChannelPermissionPayload[];
+}
+
+function normalizeChannelName(name: string): string {
+  return name.trim().replace(/\s+/g, ' ');
+}
+
+function channelNameKey(type: ServerChannelPayload['type'], name: string): string {
+  return `${type}:${normalizeChannelName(name).toLocaleLowerCase()}`;
+}
+
+function compareText(firstValue: string, secondValue: string): number {
+  return firstValue.localeCompare(secondValue, undefined, { sensitivity: 'base' });
+}
+
+function isFiniteNumber(value: unknown): value is number {
+  return typeof value === 'number' && Number.isFinite(value);
+}
+
+function uniqueStrings(values: readonly string[] | undefined): string[] {
+  return Array.from(new Set((values ?? [])
+    .filter((value): value is string => typeof value === 'string' && value.trim().length > 0)
+    .map((value) => value.trim())));
+}
+
+function normalizePermissionState(value: unknown): PermissionStatePayload {
+  return value === 'allow' || value === 'deny' || value === 'inherit'
+    ? value
+    : 'inherit';
+}
+
+function normalizePermissionMatrix(rawMatrix: unknown): Partial<Record<ServerPermissionKeyPayload, PermissionStatePayload>> {
+  const matrix = rawMatrix && typeof rawMatrix === 'object'
+    ? rawMatrix as Record<string, unknown>
+    : {};
+  const normalized: Partial<Record<ServerPermissionKeyPayload, PermissionStatePayload>> = {};
+
+  for (const key of SERVER_PERMISSION_KEYS) {
+    const value = normalizePermissionState(matrix[key]);
+
+    if (value !== 'inherit') {
+      normalized[key] = value;
+    }
+  }
+
+  return normalized;
+}
+
+function buildDefaultServerRoles(): AccessRolePayload[] {
+  return [
+    {
+      id: SYSTEM_ROLE_IDS.everyone,
+      name: '@everyone',
+      color: '#6b7280',
+      position: 0,
+      isSystem: true,
+      permissions: {
+        joinVoice: 'allow',
+        shareScreen: 'allow',
+        uploadFiles: 'allow'
+      }
+    },
+    {
+      id: SYSTEM_ROLE_IDS.moderator,
+      name: 'Moderator',
+      color: '#10b981',
+      position: 200,
+      isSystem: true,
+      permissions: {
+        kickMembers: 'allow',
+        deleteMessages: 'allow'
+      }
+    },
+    {
+      id: SYSTEM_ROLE_IDS.admin,
+      name: 'Admin',
+      color: '#60a5fa',
+      position: 300,
+      isSystem: true,
+      permissions: {
+        kickMembers: 'allow',
+        banMembers: 'allow',
+        manageBans: 'allow',
+        deleteMessages: 'allow',
+        manageChannels: 'allow',
+        manageIcon: 'allow'
+      }
+    }
+  ];
+}
+
+function normalizeServerRole(rawRole: Partial<AccessRolePayload>, fallbackRole?: AccessRolePayload): AccessRolePayload | null {
+  const id = typeof rawRole.id === 'string' ? rawRole.id.trim() : fallbackRole?.id ?? '';
+  const name = typeof rawRole.name === 'string' ? rawRole.name.trim().replace(/\s+/g, ' ') : fallbackRole?.name ?? '';
+
+  if (!id || !name) {
+    return null;
+  }
+
+  return {
+    id,
+    name,
+    color: typeof rawRole.color === 'string' && rawRole.color.trim() ? rawRole.color.trim() : fallbackRole?.color,
+    position: isFiniteNumber(rawRole.position) ? rawRole.position : fallbackRole?.position ?? 0,
+    isSystem: typeof rawRole.isSystem === 'boolean' ? rawRole.isSystem : fallbackRole?.isSystem,
+    permissions: normalizePermissionMatrix(rawRole.permissions ?? fallbackRole?.permissions)
+  };
+}
+
+function compareRoles(firstRole: AccessRolePayload, secondRole: AccessRolePayload): number {
+  if (firstRole.position !== secondRole.position) {
+    return firstRole.position - secondRole.position;
+  }
+
+  return compareText(firstRole.name, secondRole.name);
+}
+
+function compareAssignments(firstAssignment: RoleAssignmentPayload, secondAssignment: RoleAssignmentPayload): number {
+  return compareText(firstAssignment.oderId || firstAssignment.userId, secondAssignment.oderId || secondAssignment.userId);
+}
+
+export function normalizeServerTags(rawTags: unknown): string[] {
+  if (!Array.isArray(rawTags)) {
+    return [];
+  }
+
+  return rawTags
+    .filter((tag): tag is string => typeof tag === 'string')
+    .map((tag) => tag.trim())
+    .filter(Boolean);
+}
+
+export function normalizeServerChannels(rawChannels: unknown): ServerChannelPayload[] {
+  if (!Array.isArray(rawChannels)) {
+    return [];
+  }
+
+  const seenIds = new Set<string>();
+  const seenNames = new Set<string>();
+  const channels: ServerChannelPayload[] = [];
+
+  for (const [index, rawChannel] of rawChannels.entries()) {
+    if (!rawChannel || typeof rawChannel !== 'object') {
+      continue;
+    }
+
+    const channel = rawChannel as Record<string, unknown>;
+    const id = typeof channel['id'] === 'string' ? channel['id'].trim() : '';
+    const name = typeof channel['name'] === 'string' ? normalizeChannelName(channel['name']) : '';
+    const type = channel['type'] === 'text' || channel['type'] === 'voice' ? channel['type'] : null;
+    const position = isFiniteNumber(channel['position']) ? channel['position'] : index;
+    const nameKey = type ? channelNameKey(type, name) : '';
+
+    if (!id || !name || !type || seenIds.has(id) || seenNames.has(nameKey)) {
+      continue;
+    }
+
+    seenIds.add(id);
+    seenNames.add(nameKey);
+    channels.push({
+      id,
+      name,
+      type,
+      position
+    });
+  }
+
+  return channels;
+}
+
+export function normalizeServerRoles(rawRoles: unknown): AccessRolePayload[] {
+  const rolesById = new Map<string, AccessRolePayload>();
+
+  if (Array.isArray(rawRoles)) {
+    for (const rawRole of rawRoles) {
+      if (!rawRole || typeof rawRole !== 'object') {
+        continue;
+      }
+
+      const normalizedRole = normalizeServerRole(rawRole as Record<string, unknown>);
+
+      if (normalizedRole) {
+        rolesById.set(normalizedRole.id, normalizedRole);
+      }
+    }
+  }
+
+  for (const defaultRole of buildDefaultServerRoles()) {
+    const mergedRole = normalizeServerRole(rolesById.get(defaultRole.id) ?? defaultRole, defaultRole) ?? defaultRole;
+
+    rolesById.set(defaultRole.id, mergedRole);
+  }
+
+  return Array.from(rolesById.values()).sort(compareRoles);
+}
+
+export function normalizeServerRoleAssignments(rawAssignments: unknown, roles: readonly AccessRolePayload[]): RoleAssignmentPayload[] {
+  const validRoleIds = new Set(roles.map((role) => role.id).filter((roleId) => roleId !== SYSTEM_ROLE_IDS.everyone));
+  const assignmentsByKey = new Map<string, RoleAssignmentPayload>();
+
+  if (!Array.isArray(rawAssignments)) {
+    return [];
+  }
+
+  for (const rawAssignment of rawAssignments) {
+    if (!rawAssignment || typeof rawAssignment !== 'object') {
+      continue;
+    }
+
+    const assignment = rawAssignment as Record<string, unknown>;
+    const userId = typeof assignment['userId'] === 'string' ? assignment['userId'].trim() : '';
+    const oderId = typeof assignment['oderId'] === 'string' ? assignment['oderId'].trim() : undefined;
+    const key = oderId || userId;
+
+    if (!key) {
+      continue;
+    }
+
+    const roleIds = uniqueStrings(Array.isArray(assignment['roleIds']) ? assignment['roleIds'] as string[] : undefined)
+      .filter((roleId) => validRoleIds.has(roleId));
+
+    if (roleIds.length === 0) {
+      continue;
+    }
+
+    assignmentsByKey.set(key, {
+      userId: userId || key,
+      oderId,
+      roleIds
+    });
+  }
+
+  return Array.from(assignmentsByKey.values()).sort(compareAssignments);
+}
+
+export function normalizeServerChannelPermissions(
+  rawChannelPermissions: unknown,
+  roles: readonly AccessRolePayload[]
+): ChannelPermissionPayload[] {
+  if (!Array.isArray(rawChannelPermissions)) {
+    return [];
+  }
+
+  const validRoleIds = new Set(roles.map((role) => role.id));
+  const overridesByKey = new Map<string, ChannelPermissionPayload>();
+
+  for (const rawOverride of rawChannelPermissions) {
+    if (!rawOverride || typeof rawOverride !== 'object') {
+      continue;
+    }
+
+    const override = rawOverride as Record<string, unknown>;
+    const channelId = typeof override['channelId'] === 'string' ? override['channelId'].trim() : '';
+    const targetType = override['targetType'] === 'role' || override['targetType'] === 'user' ? override['targetType'] : null;
+    const targetId = typeof override['targetId'] === 'string' ? override['targetId'].trim() : '';
+    const permission = SERVER_PERMISSION_KEYS.find((key) => key === override['permission']);
+    const value = normalizePermissionState(override['value']);
+
+    if (!channelId || !targetType || !targetId || !permission || value === 'inherit') {
+      continue;
+    }
+
+    if (targetType === 'role' && !validRoleIds.has(targetId)) {
+      continue;
+    }
+
+    const key = `${channelId}:${targetType}:${targetId}:${permission}`;
+
+    overridesByKey.set(key, {
+      channelId,
+      targetType,
+      targetId,
+      permission,
+      value
+    });
+  }
+
+  return Array.from(overridesByKey.values()).sort((firstOverride, secondOverride) => {
+    const channelCompare = compareText(firstOverride.channelId, secondOverride.channelId);
+
+    if (channelCompare !== 0) {
+      return channelCompare;
+    }
+
+    if (firstOverride.targetType !== secondOverride.targetType) {
+      return compareText(firstOverride.targetType, secondOverride.targetType);
+    }
+
+    const targetCompare = compareText(firstOverride.targetId, secondOverride.targetId);
+
+    if (targetCompare !== 0) {
+      return targetCompare;
+    }
+
+    return compareText(firstOverride.permission, secondOverride.permission);
+  });
+}
+
+export async function replaceServerRelations(
+  manager: EntityManager,
+  serverId: string,
+  options: {
+    tags: unknown;
+    channels: unknown;
+    roles?: unknown;
+    roleAssignments?: unknown;
+    channelPermissions?: unknown;
+  }
+): Promise<void> {
+  const tagRepo = manager.getRepository(ServerTagEntity);
+  const channelRepo = manager.getRepository(ServerChannelEntity);
+  const roleRepo = manager.getRepository(ServerRoleEntity);
+  const userRoleRepo = manager.getRepository(ServerUserRoleEntity);
+  const channelPermissionRepo = manager.getRepository(ServerChannelPermissionEntity);
+  const tags = normalizeServerTags(options.tags);
+  const channels = normalizeServerChannels(options.channels);
+  const roles = options.roles !== undefined ? normalizeServerRoles(options.roles) : [];
+
+  await tagRepo.delete({ serverId });
+  await channelRepo.delete({ serverId });
+
+  if (options.roles !== undefined) {
+    await roleRepo.delete({ serverId });
+  }
+
+  if (options.roleAssignments !== undefined) {
+    await userRoleRepo.delete({ serverId });
+  }
+
+  if (options.channelPermissions !== undefined) {
+    await channelPermissionRepo.delete({ serverId });
+  }
+
+  if (tags.length > 0) {
+    await tagRepo.insert(
+      tags.map((tag, position) => ({
+        serverId,
+        position,
+        value: tag
+      }))
+    );
+  }
+
+  if (channels.length > 0) {
+    await channelRepo.insert(
+      channels.map((channel) => ({
+        serverId,
+        channelId: channel.id,
+        name: channel.name,
+        type: channel.type,
+        position: channel.position
+      }))
+    );
+  }
+
+  if (options.roles !== undefined && roles.length > 0) {
+    await roleRepo.insert(
+      roles.map((role) => ({
+        serverId,
+        roleId: role.id,
+        name: role.name,
+        color: role.color ?? null,
+        position: role.position,
+        isSystem: role.isSystem ? 1 : 0,
+        manageServer: normalizePermissionState(role.permissions?.manageServer),
+        manageRoles: normalizePermissionState(role.permissions?.manageRoles),
+        manageChannels: normalizePermissionState(role.permissions?.manageChannels),
+        manageIcon: normalizePermissionState(role.permissions?.manageIcon),
+        kickMembers: normalizePermissionState(role.permissions?.kickMembers),
+        banMembers: normalizePermissionState(role.permissions?.banMembers),
+        manageBans: normalizePermissionState(role.permissions?.manageBans),
+        deleteMessages: normalizePermissionState(role.permissions?.deleteMessages),
+        joinVoice: normalizePermissionState(role.permissions?.joinVoice),
+        shareScreen: normalizePermissionState(role.permissions?.shareScreen),
+        uploadFiles: normalizePermissionState(role.permissions?.uploadFiles)
+      }))
+    );
+  }
+
+  if (options.roleAssignments !== undefined) {
+    const roleAssignments = normalizeServerRoleAssignments(options.roleAssignments, roles.length > 0 ? roles : normalizeServerRoles([]));
+    const rows = roleAssignments.flatMap((assignment) =>
+      assignment.roleIds.map((roleId) => ({
+        serverId,
+        userId: assignment.userId,
+        roleId,
+        oderId: assignment.oderId ?? null
+      }))
+    );
+
+    if (rows.length > 0) {
+      await userRoleRepo.insert(rows);
+    }
+  }
+
+  if (options.channelPermissions !== undefined) {
+    const channelPermissions = normalizeServerChannelPermissions(
+      options.channelPermissions,
+      roles.length > 0 ? roles : normalizeServerRoles([])
+    );
+
+    if (channelPermissions.length > 0) {
+      await channelPermissionRepo.insert(
+        channelPermissions.map((channelPermission) => ({
+          serverId,
+          channelId: channelPermission.channelId,
+          targetType: channelPermission.targetType,
+          targetId: channelPermission.targetId,
+          permission: channelPermission.permission,
+          value: channelPermission.value
+        }))
+      );
+    }
+  }
+}
+
+export async function loadServerRelationsMap(
+  dataSource: DataSource,
+  serverIds: readonly string[]
+): Promise<Map<string, ServerRelationRecord>> {
+  const groupedRelations = new Map<string, ServerRelationRecord>();
+
+  if (serverIds.length === 0) {
+    return groupedRelations;
+  }
+
+  const [
+    tagRows,
+    channelRows,
+    roleRows,
+    userRoleRows,
+    channelPermissionRows
+  ] = await Promise.all([
+    dataSource.getRepository(ServerTagEntity).find({
+      where: { serverId: In([...serverIds]) }
+    }),
+    dataSource.getRepository(ServerChannelEntity).find({
+      where: { serverId: In([...serverIds]) }
+    }),
+    dataSource.getRepository(ServerRoleEntity).find({
+      where: { serverId: In([...serverIds]) }
+    }),
+    dataSource.getRepository(ServerUserRoleEntity).find({
+      where: { serverId: In([...serverIds]) }
+    }),
+    dataSource.getRepository(ServerChannelPermissionEntity).find({
+      where: { serverId: In([...serverIds]) }
+    })
+  ]);
+
+  for (const serverId of serverIds) {
+    groupedRelations.set(serverId, {
+      tags: [],
+      channels: [],
+      roles: [],
+      roleAssignments: [],
+      channelPermissions: []
+    });
+  }
+
+  for (const row of tagRows) {
+    groupedRelations.get(row.serverId)?.tags.push(row.value);
+  }
+
+  for (const row of channelRows) {
+    groupedRelations.get(row.serverId)?.channels.push({
+      id: row.channelId,
+      name: row.name,
+      type: row.type,
+      position: row.position
+    });
+  }
+
+  for (const row of roleRows) {
+    groupedRelations.get(row.serverId)?.roles.push({
+      id: row.roleId,
+      name: row.name,
+      color: row.color ?? undefined,
+      position: row.position,
+      isSystem: !!row.isSystem,
+      permissions: normalizePermissionMatrix({
+        manageServer: row.manageServer,
+        manageRoles: row.manageRoles,
+        manageChannels: row.manageChannels,
+        manageIcon: row.manageIcon,
+        kickMembers: row.kickMembers,
+        banMembers: row.banMembers,
+        manageBans: row.manageBans,
+        deleteMessages: row.deleteMessages,
+        joinVoice: row.joinVoice,
+        shareScreen: row.shareScreen,
+        uploadFiles: row.uploadFiles
+      })
+    });
+  }
+
+  for (const row of userRoleRows) {
+    const relation = groupedRelations.get(row.serverId);
+
+    if (!relation) {
+      continue;
+    }
+
+    const existing = relation.roleAssignments.find((assignment) => assignment.userId === row.userId || assignment.oderId === row.oderId);
+
+    if (existing) {
+      existing.roleIds = uniqueStrings([...existing.roleIds, row.roleId]);
+      continue;
+    }
+
+    relation.roleAssignments.push({
+      userId: row.userId,
+      oderId: row.oderId ?? undefined,
+      roleIds: [row.roleId]
+    });
+  }
+
+  for (const row of channelPermissionRows) {
+    groupedRelations.get(row.serverId)?.channelPermissions.push({
+      channelId: row.channelId,
+      targetType: row.targetType,
+      targetId: row.targetId,
+      permission: row.permission as ServerPermissionKeyPayload,
+      value: normalizePermissionState(row.value)
+    });
+  }
+
+  for (const [serverId, relation] of groupedRelations) {
+    relation.tags = tagRows
+      .filter((row) => row.serverId === serverId)
+      .sort((firstTag, secondTag) => firstTag.position - secondTag.position)
+      .map((row) => row.value);
+
+    relation.channels.sort(
+      (firstChannel, secondChannel) => firstChannel.position - secondChannel.position || compareText(firstChannel.name, secondChannel.name)
+    );
+
+    relation.roles.sort(compareRoles);
+    relation.roleAssignments.sort(compareAssignments);
+  }
+
+  return groupedRelations;
+}
+
+export function relationRecordToServerPayload(
+  row: Pick<ServerPayload, 'slowModeInterval'>,
+  relations: ServerRelationRecord
+): Pick<ServerPayload, 'tags' | 'channels' | 'roles' | 'roleAssignments' | 'channelPermissions' | 'slowModeInterval'> {
+  return {
+    tags: relations.tags,
+    channels: relations.channels,
+    roles: relations.roles,
+    roleAssignments: relations.roleAssignments,
+    channelPermissions: relations.channelPermissions,
+    slowModeInterval: row.slowModeInterval ?? 0
+  };
+}

server/src/cqrs/types.ts

@@ -28,6 +28,53 @@ export interface AuthUserPayload {
   createdAt: number;
 }
 
+export type ServerChannelType = 'text' | 'voice';
+
+export interface ServerChannelPayload {
+  id: string;
+  name: string;
+  type: ServerChannelType;
+  position: number;
+}
+
+export type PermissionStatePayload = 'allow' | 'deny' | 'inherit';
+
+export type ServerPermissionKeyPayload =
+  | 'manageServer'
+  | 'manageRoles'
+  | 'manageChannels'
+  | 'manageIcon'
+  | 'kickMembers'
+  | 'banMembers'
+  | 'manageBans'
+  | 'deleteMessages'
+  | 'joinVoice'
+  | 'shareScreen'
+  | 'uploadFiles';
+
+export interface AccessRolePayload {
+  id: string;
+  name: string;
+  color?: string;
+  position: number;
+  isSystem?: boolean;
+  permissions?: Partial<Record<ServerPermissionKeyPayload, PermissionStatePayload>>;
+}
+
+export interface RoleAssignmentPayload {
+  userId: string;
+  oderId?: string;
+  roleIds: string[];
+}
+
+export interface ChannelPermissionPayload {
+  channelId: string;
+  targetType: 'role' | 'user';
+  targetId: string;
+  permission: ServerPermissionKeyPayload;
+  value: PermissionStatePayload;
+}
+
 export interface ServerPayload {
   id: string;
   name: string;
@@ -39,7 +86,12 @@ export interface ServerPayload {
   isPrivate: boolean;
   maxUsers: number;
   currentUsers: number;
+  slowModeInterval?: number;
   tags: string[];
+  channels: ServerChannelPayload[];
+  roles?: AccessRolePayload[];
+  roleAssignments?: RoleAssignmentPayload[];
+  channelPermissions?: ChannelPermissionPayload[];
   createdAt: number;
   lastSeen: number;
 }

server/src/db/database.ts

@@ -4,6 +4,11 @@ import { DataSource } from 'typeorm';
 import {
   AuthUserEntity,
   ServerEntity,
+  ServerTagEntity,
+  ServerChannelEntity,
+  ServerRoleEntity,
+  ServerUserRoleEntity,
+  ServerChannelPermissionEntity,
   JoinRequestEntity,
   ServerMembershipEntity,
   ServerInviteEntity,
@@ -54,6 +59,11 @@ export async function initDatabase(): Promise<void> {
       entities: [
         AuthUserEntity,
         ServerEntity,
+        ServerTagEntity,
+        ServerChannelEntity,
+        ServerRoleEntity,
+        ServerUserRoleEntity,
+        ServerChannelPermissionEntity,
         JoinRequestEntity,
         ServerMembershipEntity,
         ServerInviteEntity,

server/src/entities/ServerChannelEntity.ts

@@ -0,0 +1,23 @@
+import {
+  Entity,
+  PrimaryColumn,
+  Column
+} from 'typeorm';
+
+@Entity('server_channels')
+export class ServerChannelEntity {
+  @PrimaryColumn('text')
+  serverId!: string;
+
+  @PrimaryColumn('text')
+  channelId!: string;
+
+  @Column('text')
+  name!: string;
+
+  @Column('text')
+  type!: 'text' | 'voice';
+
+  @Column('integer')
+  position!: number;
+}

server/src/entities/ServerChannelPermissionEntity.ts

@@ -0,0 +1,26 @@
+import {
+  Column,
+  Entity,
+  PrimaryColumn
+} from 'typeorm';
+
+@Entity('server_channel_permissions')
+export class ServerChannelPermissionEntity {
+  @PrimaryColumn('text')
+  serverId!: string;
+
+  @PrimaryColumn('text')
+  channelId!: string;
+
+  @PrimaryColumn('text')
+  targetType!: 'role' | 'user';
+
+  @PrimaryColumn('text')
+  targetId!: string;
+
+  @PrimaryColumn('text')
+  permission!: string;
+
+  @Column('text')
+  value!: 'allow' | 'deny' | 'inherit';
+}

server/src/entities/ServerEntity.ts

@@ -33,8 +33,8 @@ export class ServerEntity {
   @Column('integer', { default: 0 })
   currentUsers!: number;
 
-  @Column('text', { default: '[]' })
-  tags!: string;
+  @Column('integer', { default: 0 })
+  slowModeInterval!: number;
 
   @Column('integer')
   createdAt!: number;

server/src/entities/ServerRoleEntity.ts

@@ -0,0 +1,59 @@
+import {
+  Column,
+  Entity,
+  PrimaryColumn
+} from 'typeorm';
+
+@Entity('server_roles')
+export class ServerRoleEntity {
+  @PrimaryColumn('text')
+  serverId!: string;
+
+  @PrimaryColumn('text')
+  roleId!: string;
+
+  @Column('text')
+  name!: string;
+
+  @Column('text', { nullable: true })
+  color!: string | null;
+
+  @Column('integer')
+  position!: number;
+
+  @Column('integer', { default: 0 })
+  isSystem!: number;
+
+  @Column('text', { default: 'inherit' })
+  manageServer!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  manageRoles!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  manageChannels!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  manageIcon!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  kickMembers!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  banMembers!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  manageBans!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  deleteMessages!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  joinVoice!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  shareScreen!: 'allow' | 'deny' | 'inherit';
+
+  @Column('text', { default: 'inherit' })
+  uploadFiles!: 'allow' | 'deny' | 'inherit';
+}

server/src/entities/ServerTagEntity.ts

@@ -0,0 +1,17 @@
+import {
+  Entity,
+  PrimaryColumn,
+  Column
+} from 'typeorm';
+
+@Entity('server_tags')
+export class ServerTagEntity {
+  @PrimaryColumn('text')
+  serverId!: string;
+
+  @PrimaryColumn('integer')
+  position!: number;
+
+  @Column('text')
+  value!: string;
+}

server/src/entities/ServerUserRoleEntity.ts

@@ -0,0 +1,20 @@
+import {
+  Column,
+  Entity,
+  PrimaryColumn
+} from 'typeorm';
+
+@Entity('server_user_roles')
+export class ServerUserRoleEntity {
+  @PrimaryColumn('text')
+  serverId!: string;
+
+  @PrimaryColumn('text')
+  userId!: string;
+
+  @PrimaryColumn('text')
+  roleId!: string;
+
+  @Column('text', { nullable: true })
+  oderId!: string | null;
+}

server/src/entities/index.ts

@@ -1,5 +1,10 @@
 export { AuthUserEntity } from './AuthUserEntity';
 export { ServerEntity } from './ServerEntity';
+export { ServerTagEntity } from './ServerTagEntity';
+export { ServerChannelEntity } from './ServerChannelEntity';
+export { ServerRoleEntity } from './ServerRoleEntity';
+export { ServerUserRoleEntity } from './ServerUserRoleEntity';
+export { ServerChannelPermissionEntity } from './ServerChannelPermissionEntity';
 export { JoinRequestEntity } from './JoinRequestEntity';
 export { ServerMembershipEntity } from './ServerMembershipEntity';
 export { ServerInviteEntity } from './ServerInviteEntity';

server/src/migrations/1000000000000-InitialSchema.ts

@@ -25,6 +25,7 @@ export class InitialSchema1000000000000 implements MigrationInterface {
         "maxUsers"       INTEGER NOT NULL DEFAULT 0,
         "currentUsers"   INTEGER NOT NULL DEFAULT 0,
         "tags"           TEXT NOT NULL DEFAULT '[]',
+        "channels"       TEXT NOT NULL DEFAULT '[]',
         "createdAt"      INTEGER NOT NULL,
         "lastSeen"       INTEGER NOT NULL
       )

server/src/migrations/1000000000002-ServerChannels.ts

@@ -0,0 +1,13 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class ServerChannels1000000000002 implements MigrationInterface {
+  name = 'ServerChannels1000000000002';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "servers" ADD COLUMN "channels" TEXT NOT NULL DEFAULT '[]'`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "servers" DROP COLUMN "channels"`);
+  }
+}

server/src/migrations/1000000000003-RepairLegacyVoiceChannels.ts

@@ -0,0 +1,119 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+interface LegacyServerRow {
+  id: string;
+  channels: string | null;
+}
+
+interface LegacyServerChannel {
+  id: string;
+  name: string;
+  type: 'text' | 'voice';
+  position: number;
+}
+
+function normalizeLegacyChannels(raw: string | null): LegacyServerChannel[] {
+  try {
+    const parsed = JSON.parse(raw || '[]');
+
+    if (!Array.isArray(parsed)) {
+      return [];
+    }
+
+    const seenIds = new Set<string>();
+    const seenNames = new Set<string>();
+
+    return parsed
+      .filter((channel): channel is Record<string, unknown> => !!channel && typeof channel === 'object')
+      .map((channel, index) => {
+        const id = typeof channel.id === 'string' ? channel.id.trim() : '';
+        const name = typeof channel.name === 'string' ? channel.name.trim().replace(/\s+/g, ' ') : '';
+        const type = channel.type === 'text' || channel.type === 'voice' ? channel.type : null;
+        const position = typeof channel.position === 'number' ? channel.position : index;
+        const nameKey = type ? `${type}:${name.toLocaleLowerCase()}` : '';
+
+        if (!id || !name || !type || seenIds.has(id) || seenNames.has(nameKey)) {
+          return null;
+        }
+
+        seenIds.add(id);
+        seenNames.add(nameKey);
+
+        return {
+          id,
+          name,
+          type,
+          position
+        } satisfies LegacyServerChannel;
+      })
+      .filter((channel): channel is LegacyServerChannel => !!channel);
+  } catch {
+    return [];
+  }
+}
+
+function shouldRestoreLegacyVoiceGeneral(channels: LegacyServerChannel[]): boolean {
+  const hasTextGeneral = channels.some(
+    (channel) => channel.type === 'text' && (channel.id === 'general' || channel.name.toLocaleLowerCase() === 'general')
+  );
+  const hasVoiceAfk = channels.some(
+    (channel) => channel.type === 'voice' && (channel.id === 'vc-afk' || channel.name.toLocaleLowerCase() === 'afk')
+  );
+  const hasVoiceGeneral = channels.some(
+    (channel) => channel.type === 'voice' && (channel.id === 'vc-general' || channel.name.toLocaleLowerCase() === 'general')
+  );
+
+  return hasTextGeneral && hasVoiceAfk && !hasVoiceGeneral;
+}
+
+function repairLegacyVoiceChannels(channels: LegacyServerChannel[]): LegacyServerChannel[] {
+  if (!shouldRestoreLegacyVoiceGeneral(channels)) {
+    return channels;
+  }
+
+  const textChannels = channels.filter((channel) => channel.type === 'text');
+  const voiceChannels = channels.filter((channel) => channel.type === 'voice');
+  const repairedVoiceChannels = [
+    {
+      id: 'vc-general',
+      name: 'General',
+      type: 'voice' as const,
+      position: 0
+    },
+    ...voiceChannels
+  ].map((channel, index) => ({
+    ...channel,
+    position: index
+  }));
+
+  return [
+    ...textChannels,
+    ...repairedVoiceChannels
+  ];
+}
+
+export class RepairLegacyVoiceChannels1000000000003 implements MigrationInterface {
+  name = 'RepairLegacyVoiceChannels1000000000003';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const rows = await queryRunner.query(`SELECT "id", "channels" FROM "servers"`) as LegacyServerRow[];
+
+    for (const row of rows) {
+      const channels = normalizeLegacyChannels(row.channels);
+      const repaired = repairLegacyVoiceChannels(channels);
+
+      if (JSON.stringify(repaired) === JSON.stringify(channels)) {
+        continue;
+      }
+
+      await queryRunner.query(
+        `UPDATE "servers" SET "channels" = ? WHERE "id" = ?`,
+        [JSON.stringify(repaired), row.id]
+      );
+    }
+  }
+
+  public async down(_queryRunner: QueryRunner): Promise<void> {
+    // Forward-only data repair migration.
+  }
+}

server/src/migrations/1000000000004-NormalizeServerArrays.ts

@@ -0,0 +1,142 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+type LegacyServerRow = {
+  id: string;
+  tags: string | null;
+  channels: string | null;
+};
+
+type LegacyServerChannel = {
+  id?: unknown;
+  name?: unknown;
+  type?: unknown;
+  position?: unknown;
+};
+
+function parseArray<T>(raw: string | null): T[] {
+  try {
+    const parsed = JSON.parse(raw || '[]');
+
+    return Array.isArray(parsed) ? parsed as T[] : [];
+  } catch {
+    return [];
+  }
+}
+
+function normalizeChannelName(name: string): string {
+  return name.trim().replace(/\s+/g, ' ');
+}
+
+function channelNameKey(type: 'text' | 'voice', name: string): string {
+  return `${type}:${normalizeChannelName(name).toLocaleLowerCase()}`;
+}
+
+function isFiniteNumber(value: unknown): value is number {
+  return typeof value === 'number' && Number.isFinite(value);
+}
+
+function normalizeServerTags(raw: string | null): string[] {
+  return parseArray<unknown>(raw).filter((tag): tag is string => typeof tag === 'string');
+}
+
+function normalizeServerChannels(raw: string | null) {
+  const channels = parseArray<LegacyServerChannel>(raw);
+  const seenIds = new Set<string>();
+  const seenNames = new Set<string>();
+
+  return channels.flatMap((channel, index) => {
+    const id = typeof channel.id === 'string' ? channel.id.trim() : '';
+    const name = typeof channel.name === 'string' ? normalizeChannelName(channel.name) : '';
+    const type = channel.type === 'text' || channel.type === 'voice' ? channel.type : null;
+    const position = isFiniteNumber(channel.position) ? channel.position : index;
+    const nameKey = type ? channelNameKey(type, name) : '';
+
+    if (!id || !name || !type || seenIds.has(id) || seenNames.has(nameKey)) {
+      return [];
+    }
+
+    seenIds.add(id);
+    seenNames.add(nameKey);
+
+    return [{
+      channelId: id,
+      name,
+      type,
+      position
+    }];
+  });
+}
+
+export class NormalizeServerArrays1000000000004 implements MigrationInterface {
+  name = 'NormalizeServerArrays1000000000004';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS "server_tags" (
+        "serverId"  TEXT NOT NULL,
+        "position"  INTEGER NOT NULL,
+        "value"     TEXT NOT NULL,
+        PRIMARY KEY ("serverId", "position")
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS "idx_server_tags_serverId" ON "server_tags" ("serverId")`);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS "server_channels" (
+        "serverId"  TEXT NOT NULL,
+        "channelId" TEXT NOT NULL,
+        "name"      TEXT NOT NULL,
+        "type"      TEXT NOT NULL,
+        "position"  INTEGER NOT NULL,
+        PRIMARY KEY ("serverId", "channelId")
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS "idx_server_channels_serverId" ON "server_channels" ("serverId")`);
+
+    const rows = await queryRunner.query(`SELECT "id", "tags", "channels" FROM "servers"`) as LegacyServerRow[];
+
+    for (const row of rows) {
+      for (const [position, tag] of normalizeServerTags(row.tags).entries()) {
+        await queryRunner.query(
+          `INSERT OR REPLACE INTO "server_tags" ("serverId", "position", "value") VALUES (?, ?, ?)`,
+          [row.id, position, tag]
+        );
+      }
+
+      for (const channel of normalizeServerChannels(row.channels)) {
+        await queryRunner.query(
+          `INSERT OR REPLACE INTO "server_channels" ("serverId", "channelId", "name", "type", "position") VALUES (?, ?, ?, ?, ?)`,
+          [row.id, channel.channelId, channel.name, channel.type, channel.position]
+        );
+      }
+    }
+
+    await queryRunner.query(`
+      CREATE TABLE "servers_next" (
+        "id"             TEXT PRIMARY KEY NOT NULL,
+        "name"           TEXT NOT NULL,
+        "description"    TEXT,
+        "ownerId"        TEXT NOT NULL,
+        "ownerPublicKey" TEXT NOT NULL,
+        "isPrivate"      INTEGER NOT NULL DEFAULT 0,
+        "maxUsers"       INTEGER NOT NULL DEFAULT 0,
+        "currentUsers"   INTEGER NOT NULL DEFAULT 0,
+        "createdAt"      INTEGER NOT NULL,
+        "lastSeen"       INTEGER NOT NULL,
+        "passwordHash"   TEXT
+      )
+    `);
+    await queryRunner.query(`
+      INSERT INTO "servers_next" ("id", "name", "description", "ownerId", "ownerPublicKey", "isPrivate", "maxUsers", "currentUsers", "createdAt", "lastSeen", "passwordHash")
+      SELECT "id", "name", "description", "ownerId", "ownerPublicKey", "isPrivate", "maxUsers", "currentUsers", "createdAt", "lastSeen", "passwordHash"
+      FROM "servers"
+    `);
+    await queryRunner.query(`DROP TABLE "servers"`);
+    await queryRunner.query(`ALTER TABLE "servers_next" RENAME TO "servers"`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS "server_channels"`);
+    await queryRunner.query(`DROP TABLE IF EXISTS "server_tags"`);
+  }
+}

server/src/migrations/1000000000005-ServerRoleAccessControl.ts

@@ -0,0 +1,196 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+type LegacyServerRow = {
+  id: string;
+  name: string;
+  description: string | null;
+  ownerId: string;
+  ownerPublicKey: string;
+  passwordHash: string | null;
+  isPrivate: number;
+  maxUsers: number;
+  currentUsers: number;
+  createdAt: number;
+  lastSeen: number;
+};
+
+const SYSTEM_ROLE_IDS = {
+  everyone: 'system-everyone',
+  moderator: 'system-moderator',
+  admin: 'system-admin'
+} as const;
+
+function buildDefaultServerRoles() {
+  return [
+    {
+      roleId: SYSTEM_ROLE_IDS.everyone,
+      name: '@everyone',
+      color: '#6b7280',
+      position: 0,
+      isSystem: 1,
+      manageServer: 'inherit',
+      manageRoles: 'inherit',
+      manageChannels: 'inherit',
+      manageIcon: 'inherit',
+      kickMembers: 'inherit',
+      banMembers: 'inherit',
+      manageBans: 'inherit',
+      deleteMessages: 'inherit',
+      joinVoice: 'allow',
+      shareScreen: 'allow',
+      uploadFiles: 'allow'
+    },
+    {
+      roleId: SYSTEM_ROLE_IDS.moderator,
+      name: 'Moderator',
+      color: '#10b981',
+      position: 200,
+      isSystem: 1,
+      manageServer: 'inherit',
+      manageRoles: 'inherit',
+      manageChannels: 'inherit',
+      manageIcon: 'inherit',
+      kickMembers: 'allow',
+      banMembers: 'inherit',
+      manageBans: 'inherit',
+      deleteMessages: 'allow',
+      joinVoice: 'inherit',
+      shareScreen: 'inherit',
+      uploadFiles: 'inherit'
+    },
+    {
+      roleId: SYSTEM_ROLE_IDS.admin,
+      name: 'Admin',
+      color: '#60a5fa',
+      position: 300,
+      isSystem: 1,
+      manageServer: 'inherit',
+      manageRoles: 'inherit',
+      manageChannels: 'allow',
+      manageIcon: 'allow',
+      kickMembers: 'allow',
+      banMembers: 'allow',
+      manageBans: 'allow',
+      deleteMessages: 'allow',
+      joinVoice: 'inherit',
+      shareScreen: 'inherit',
+      uploadFiles: 'inherit'
+    }
+  ];
+}
+
+export class ServerRoleAccessControl1000000000005 implements MigrationInterface {
+  name = 'ServerRoleAccessControl1000000000005';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS "server_roles" (
+        "serverId" TEXT NOT NULL,
+        "roleId" TEXT NOT NULL,
+        "name" TEXT NOT NULL,
+        "color" TEXT,
+        "position" INTEGER NOT NULL,
+        "isSystem" INTEGER NOT NULL DEFAULT 0,
+        "manageServer" TEXT NOT NULL DEFAULT 'inherit',
+        "manageRoles" TEXT NOT NULL DEFAULT 'inherit',
+        "manageChannels" TEXT NOT NULL DEFAULT 'inherit',
+        "manageIcon" TEXT NOT NULL DEFAULT 'inherit',
+        "kickMembers" TEXT NOT NULL DEFAULT 'inherit',
+        "banMembers" TEXT NOT NULL DEFAULT 'inherit',
+        "manageBans" TEXT NOT NULL DEFAULT 'inherit',
+        "deleteMessages" TEXT NOT NULL DEFAULT 'inherit',
+        "joinVoice" TEXT NOT NULL DEFAULT 'inherit',
+        "shareScreen" TEXT NOT NULL DEFAULT 'inherit',
+        "uploadFiles" TEXT NOT NULL DEFAULT 'inherit',
+        PRIMARY KEY ("serverId", "roleId")
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS "idx_server_roles_serverId" ON "server_roles" ("serverId")`);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS "server_user_roles" (
+        "serverId" TEXT NOT NULL,
+        "userId" TEXT NOT NULL,
+        "roleId" TEXT NOT NULL,
+        "oderId" TEXT,
+        PRIMARY KEY ("serverId", "userId", "roleId")
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS "idx_server_user_roles_serverId" ON "server_user_roles" ("serverId")`);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS "server_channel_permissions" (
+        "serverId" TEXT NOT NULL,
+        "channelId" TEXT NOT NULL,
+        "targetType" TEXT NOT NULL,
+        "targetId" TEXT NOT NULL,
+        "permission" TEXT NOT NULL,
+        "value" TEXT NOT NULL,
+        PRIMARY KEY ("serverId", "channelId", "targetType", "targetId", "permission")
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS "idx_server_channel_permissions_serverId" ON "server_channel_permissions" ("serverId")`);
+
+    const servers = await queryRunner.query(`
+      SELECT "id", "name", "description", "ownerId", "ownerPublicKey", "passwordHash", "isPrivate", "maxUsers", "currentUsers", "createdAt", "lastSeen"
+      FROM "servers"
+    `) as LegacyServerRow[];
+
+    for (const server of servers) {
+      for (const role of buildDefaultServerRoles()) {
+        await queryRunner.query(
+          `INSERT OR REPLACE INTO "server_roles" ("serverId", "roleId", "name", "color", "position", "isSystem", "manageServer", "manageRoles", "manageChannels", "manageIcon", "kickMembers", "banMembers", "manageBans", "deleteMessages", "joinVoice", "shareScreen", "uploadFiles") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+          [
+            server.id,
+            role.roleId,
+            role.name,
+            role.color,
+            role.position,
+            role.isSystem,
+            role.manageServer,
+            role.manageRoles,
+            role.manageChannels,
+            role.manageIcon,
+            role.kickMembers,
+            role.banMembers,
+            role.manageBans,
+            role.deleteMessages,
+            role.joinVoice,
+            role.shareScreen,
+            role.uploadFiles
+          ]
+        );
+      }
+    }
+
+    await queryRunner.query(`
+      CREATE TABLE "servers_next" (
+        "id" TEXT PRIMARY KEY NOT NULL,
+        "name" TEXT NOT NULL,
+        "description" TEXT,
+        "ownerId" TEXT NOT NULL,
+        "ownerPublicKey" TEXT NOT NULL,
+        "passwordHash" TEXT,
+        "isPrivate" INTEGER NOT NULL DEFAULT 0,
+        "maxUsers" INTEGER NOT NULL DEFAULT 0,
+        "currentUsers" INTEGER NOT NULL DEFAULT 0,
+        "slowModeInterval" INTEGER NOT NULL DEFAULT 0,
+        "createdAt" INTEGER NOT NULL,
+        "lastSeen" INTEGER NOT NULL
+      )
+    `);
+    await queryRunner.query(`
+      INSERT INTO "servers_next" ("id", "name", "description", "ownerId", "ownerPublicKey", "passwordHash", "isPrivate", "maxUsers", "currentUsers", "slowModeInterval", "createdAt", "lastSeen")
+      SELECT "id", "name", "description", "ownerId", "ownerPublicKey", "passwordHash", "isPrivate", "maxUsers", "currentUsers", 0, "createdAt", "lastSeen"
+      FROM "servers"
+    `);
+    await queryRunner.query(`DROP TABLE "servers"`);
+    await queryRunner.query(`ALTER TABLE "servers_next" RENAME TO "servers"`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS "server_channel_permissions"`);
+    await queryRunner.query(`DROP TABLE IF EXISTS "server_user_roles"`);
+    await queryRunner.query(`DROP TABLE IF EXISTS "server_roles"`);
+  }
+}

server/src/migrations/index.ts

@@ -1,7 +1,15 @@
 import { InitialSchema1000000000000 } from './1000000000000-InitialSchema';
 import { ServerAccessControl1000000000001 } from './1000000000001-ServerAccessControl';
+import { ServerChannels1000000000002 } from './1000000000002-ServerChannels';
+import { RepairLegacyVoiceChannels1000000000003 } from './1000000000003-RepairLegacyVoiceChannels';
+import { NormalizeServerArrays1000000000004 } from './1000000000004-NormalizeServerArrays';
+import { ServerRoleAccessControl1000000000005 } from './1000000000005-ServerRoleAccessControl';
 
 export const serverMigrations = [
 	InitialSchema1000000000000,
-	ServerAccessControl1000000000001
+	ServerAccessControl1000000000001,
+	ServerChannels1000000000002,
+	RepairLegacyVoiceChannels1000000000003,
+	NormalizeServerArrays1000000000004,
+	ServerRoleAccessControl1000000000005
 ];

server/src/routes/invites.ts

@@ -1,6 +1,5 @@
 import { Router } from 'express';
 import { getUserById } from '../cqrs';
-import { rowToServer } from '../cqrs/mappers';
 import { ServerPayload } from '../cqrs/types';
 import { getActiveServerInvite } from '../services/server-access.service';
 import {
@@ -283,7 +282,7 @@ invitesApiRouter.get('/:id', async (req, res) => {
     return res.status(404).json({ error: 'Invite link has expired or is invalid', errorCode: 'INVITE_EXPIRED' });
   }
 
-  const server = rowToServer(bundle.server);
+  const server = bundle.server;
 
   res.json({
     id: bundle.invite.id,
@@ -315,7 +314,7 @@ invitePageRouter.get('/:id', async (req, res) => {
     return;
   }
 
-  const server = rowToServer(bundle.server);
+  const server = bundle.server;
   const owner = await getUserById(server.ownerId);
 
   res.send(renderInvitePage({

server/src/routes/join-requests.ts

@@ -6,6 +6,7 @@ import {
   updateJoinRequestStatus
 } from '../cqrs';
 import { notifyUser } from '../websocket/broadcast';
+import { resolveServerPermission } from '../services/server-permissions.service';
 
 const router = Router();
 
@@ -19,7 +20,7 @@ router.put('/:id', async (req, res) => {
 
   const server = await getServerById(request.serverId);
 
-  if (!server || server.ownerId !== ownerId)
+  if (!server || !ownerId || !resolveServerPermission(server, String(ownerId), 'manageServer'))
     return res.status(403).json({ error: 'Not authorized' });
 
   await updateJoinRequestStatus(id, status as JoinRequestPayload['status']);

server/src/routes/servers.ts

@@ -1,6 +1,6 @@
 import { Response, Router } from 'express';
 import { v4 as uuidv4 } from 'uuid';
-import { ServerPayload } from '../cqrs/types';
+import { ServerChannelPayload, ServerPayload } from '../cqrs/types';
 import {
   getAllPublicServers,
   getServerById,
@@ -27,15 +27,53 @@ import {
   buildInviteUrl,
   getRequestOrigin
 } from './invite-utils';
+import {
+  canManageServerUpdate,
+  canModerateServerMember,
+  resolveServerPermission
+} from '../services/server-permissions.service';
 
 const router = Router();
 
-function normalizeRole(role: unknown): string | null {
-  return typeof role === 'string' ? role.trim().toLowerCase() : null;
+function channelNameKey(type: ServerChannelPayload['type'], name: string): string {
+  return `${type}:${name.toLocaleLowerCase()}`;
 }
 
-function isAllowedRole(role: string | null, allowedRoles: string[]): boolean {
-  return !!role && allowedRoles.includes(role);
+function normalizeServerChannels(value: unknown): ServerChannelPayload[] {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+
+  const seen = new Set<string>();
+  const seenNames = new Set<string>();
+  const channels: ServerChannelPayload[] = [];
+
+  for (const [index, channel] of value.entries()) {
+    if (!channel || typeof channel !== 'object') {
+      continue;
+    }
+
+    const id = typeof channel.id === 'string' ? channel.id.trim() : '';
+    const name = typeof channel.name === 'string' ? channel.name.trim().replace(/\s+/g, ' ') : '';
+    const type = channel.type === 'text' || channel.type === 'voice' ? channel.type : null;
+    const position = typeof channel.position === 'number' ? channel.position : index;
+    const nameKey = type ? channelNameKey(type, name) : '';
+
+    if (!id || !name || !type || seen.has(id) || seenNames.has(nameKey)) {
+      continue;
+    }
+
+    seen.add(id);
+    seenNames.add(nameKey);
+    channels.push({
+      id,
+      name,
+      type,
+      position
+    });
+  }
+
+  return channels;
 }
 
 async function enrichServer(server: ServerPayload, sourceUrl?: string) {
@@ -124,7 +162,8 @@ router.post('/', async (req, res) => {
     isPrivate,
     maxUsers,
     password,
-    tags
+    tags,
+    channels
   } = req.body;
 
   if (!name || !ownerId || !ownerPublicKey)
@@ -143,6 +182,7 @@ router.post('/', async (req, res) => {
     maxUsers: maxUsers ?? 0,
     currentUsers: 0,
     tags: tags ?? [],
+    channels: normalizeServerChannels(channels),
     createdAt: Date.now(),
     lastSeen: Date.now()
   };
@@ -161,27 +201,35 @@ router.put('/:id', async (req, res) => {
     password,
     hasPassword: _ignoredHasPassword,
     passwordHash: _ignoredPasswordHash,
+    channels,
     ...updates
   } = req.body;
   const existing = await getServerById(id);
   const authenticatedOwnerId = currentOwnerId ?? req.body.ownerId;
-  const normalizedRole = normalizeRole(actingRole);
 
   if (!existing)
     return res.status(404).json({ error: 'Server not found' });
 
-  if (
-    existing.ownerId !== authenticatedOwnerId &&
-    !isAllowedRole(normalizedRole, ['host', 'admin'])
-  ) {
+  if (!authenticatedOwnerId) {
+    return res.status(400).json({ error: 'Missing currentOwnerId' });
+  }
+
+  if (!canManageServerUpdate(existing, authenticatedOwnerId, {
+    ...updates,
+    channels,
+    password,
+    actingRole
+  })) {
     return res.status(403).json({ error: 'Not authorized' });
   }
 
   const hasPasswordUpdate = Object.prototype.hasOwnProperty.call(req.body, 'password');
+  const hasChannelsUpdate = Object.prototype.hasOwnProperty.call(req.body, 'channels');
   const nextPasswordHash = hasPasswordUpdate ? passwordHashForInput(password) : (existing.passwordHash ?? null);
   const server: ServerPayload = {
     ...existing,
     ...updates,
+    channels: hasChannelsUpdate ? normalizeServerChannels(channels) : existing.channels,
     hasPassword: !!nextPasswordHash,
     passwordHash: nextPasswordHash,
     lastSeen: Date.now()
@@ -249,7 +297,7 @@ router.post('/:id/invites', async (req, res) => {
 
 router.post('/:id/moderation/kick', async (req, res) => {
   const { id: serverId } = req.params;
-  const { actorUserId, actorRole, targetUserId } = req.body;
+  const { actorUserId, targetUserId } = req.body;
   const server = await getServerById(serverId);
 
   if (!server) {
@@ -260,14 +308,7 @@ router.post('/:id/moderation/kick', async (req, res) => {
     return res.status(400).json({ error: 'Missing targetUserId', errorCode: 'MISSING_TARGET' });
   }
 
-  if (
-    server.ownerId !== actorUserId &&
-    !isAllowedRole(normalizeRole(actorRole), [
-      'host',
-      'admin',
-      'moderator'
-    ])
-  ) {
+  if (!canModerateServerMember(server, String(actorUserId || ''), String(targetUserId), 'kickMembers')) {
     return res.status(403).json({ error: 'Not authorized', errorCode: 'NOT_AUTHORIZED' });
   }
 
@@ -278,7 +319,7 @@ router.post('/:id/moderation/kick', async (req, res) => {
 
 router.post('/:id/moderation/ban', async (req, res) => {
   const { id: serverId } = req.params;
-  const { actorUserId, actorRole, targetUserId, banId, displayName, reason, expiresAt } = req.body;
+  const { actorUserId, targetUserId, banId, displayName, reason, expiresAt } = req.body;
   const server = await getServerById(serverId);
 
   if (!server) {
@@ -289,14 +330,7 @@ router.post('/:id/moderation/ban', async (req, res) => {
     return res.status(400).json({ error: 'Missing targetUserId', errorCode: 'MISSING_TARGET' });
   }
 
-  if (
-    server.ownerId !== actorUserId &&
-    !isAllowedRole(normalizeRole(actorRole), [
-      'host',
-      'admin',
-      'moderator'
-    ])
-  ) {
+  if (!canModerateServerMember(server, String(actorUserId || ''), String(targetUserId), 'banMembers')) {
     return res.status(403).json({ error: 'Not authorized', errorCode: 'NOT_AUTHORIZED' });
   }
 
@@ -315,21 +349,14 @@ router.post('/:id/moderation/ban', async (req, res) => {
 
 router.post('/:id/moderation/unban', async (req, res) => {
   const { id: serverId } = req.params;
-  const { actorUserId, actorRole, banId, targetUserId } = req.body;
+  const { actorUserId, banId, targetUserId } = req.body;
   const server = await getServerById(serverId);
 
   if (!server) {
     return res.status(404).json({ error: 'Server not found', errorCode: 'SERVER_NOT_FOUND' });
   }
 
-  if (
-    server.ownerId !== actorUserId &&
-    !isAllowedRole(normalizeRole(actorRole), [
-      'host',
-      'admin',
-      'moderator'
-    ])
-  ) {
+  if (!resolveServerPermission(server, String(actorUserId || ''), 'manageBans')) {
     return res.status(403).json({ error: 'Not authorized', errorCode: 'NOT_AUTHORIZED' });
   }
 

server/src/services/server-access.service.ts

@@ -8,6 +8,7 @@ import {
   ServerMembershipEntity
 } from '../entities';
 import { rowToServer } from '../cqrs/mappers';
+import { loadServerRelationsMap } from '../cqrs/relations';
 import { ServerPayload } from '../cqrs/types';
 
 export const SERVER_INVITE_EXPIRY_MS = 10 * 24 * 60 * 60 * 1000;
@@ -57,6 +58,12 @@ function getBanRepository() {
   return getDataSource().getRepository(ServerBanEntity);
 }
 
+async function toServerPayload(server: ServerEntity): Promise<ServerPayload> {
+  const relationsByServerId = await loadServerRelationsMap(getDataSource(), [server.id]);
+
+  return rowToServer(server, relationsByServerId.get(server.id));
+}
+
 function normalizePassword(password?: string | null): string | null {
   const normalized = password?.trim() ?? '';
 
@@ -194,7 +201,7 @@ export async function createServerInvite(
 
 export async function getActiveServerInvite(
   inviteId: string
-): Promise<{ invite: ServerInviteEntity; server: ServerEntity } | null> {
+): Promise<{ invite: ServerInviteEntity; server: ServerPayload } | null> {
   await pruneExpiredServerAccessArtifacts();
 
   const invite = await getInviteRepository().findOne({ where: { id: inviteId } });
@@ -214,7 +221,10 @@ export async function getActiveServerInvite(
     return null;
   }
 
-  return { invite, server };
+  return {
+    invite,
+    server: await toServerPayload(server)
+  };
 }
 
 export async function joinServerWithAccess(options: {
@@ -242,7 +252,7 @@ export async function joinServerWithAccess(options: {
 
     return {
       joinedBefore: !!existingMembership,
-      server: rowToServer(server),
+      server: await toServerPayload(server),
       via: 'membership'
     };
   }
@@ -260,7 +270,7 @@ export async function joinServerWithAccess(options: {
 
     return {
       joinedBefore: !!existingMembership,
-      server: rowToServer(server),
+      server: await toServerPayload(server),
       via: 'invite'
     };
   }
@@ -272,7 +282,7 @@ export async function joinServerWithAccess(options: {
 
     return {
       joinedBefore: true,
-      server: rowToServer(server),
+      server: await toServerPayload(server),
       via: 'membership'
     };
   }
@@ -288,7 +298,7 @@ export async function joinServerWithAccess(options: {
 
     return {
       joinedBefore: false,
-      server: rowToServer(server),
+      server: await toServerPayload(server),
       via: 'password'
     };
   }
@@ -301,7 +311,7 @@ export async function joinServerWithAccess(options: {
 
   return {
     joinedBefore: false,
-    server: rowToServer(server),
+    server: await toServerPayload(server),
     via: 'public'
   };
 }

server/src/services/server-permissions.service.ts

@@ -0,0 +1,191 @@
+import type {
+  AccessRolePayload,
+  PermissionStatePayload,
+  RoleAssignmentPayload,
+  ServerPayload,
+  ServerPermissionKeyPayload
+} from '../cqrs/types';
+import { normalizeServerRoleAssignments, normalizeServerRoles } from '../cqrs/relations';
+
+const SYSTEM_ROLE_IDS = {
+  everyone: 'system-everyone'
+} as const;
+
+interface ServerIdentity {
+  userId: string;
+  oderId?: string;
+}
+
+function getServerRoles(server: Pick<ServerPayload, 'roles'>): AccessRolePayload[] {
+  return normalizeServerRoles(server.roles);
+}
+
+function getServerAssignments(server: Pick<ServerPayload, 'roleAssignments' | 'roles'>): RoleAssignmentPayload[] {
+  return normalizeServerRoleAssignments(server.roleAssignments, getServerRoles(server));
+}
+
+function matchesIdentity(identity: ServerIdentity, assignment: RoleAssignmentPayload): boolean {
+  return assignment.userId === identity.userId
+    || assignment.oderId === identity.userId
+    || (!!identity.oderId && (assignment.userId === identity.oderId || assignment.oderId === identity.oderId));
+}
+
+function resolveAssignedRoleIds(server: Pick<ServerPayload, 'roleAssignments' | 'roles'>, identity: ServerIdentity): string[] {
+  const assignment = getServerAssignments(server).find((candidateAssignment) => matchesIdentity(identity, candidateAssignment));
+
+  return assignment?.roleIds ?? [];
+}
+
+function compareRolePosition(firstRole: AccessRolePayload, secondRole: AccessRolePayload): number {
+  if (firstRole.position !== secondRole.position) {
+    return firstRole.position - secondRole.position;
+  }
+
+  return firstRole.name.localeCompare(secondRole.name, undefined, { sensitivity: 'base' });
+}
+
+function resolveRolePermissionState(
+  roles: readonly AccessRolePayload[],
+  assignedRoleIds: readonly string[],
+  permission: ServerPermissionKeyPayload
+): PermissionStatePayload {
+  const roleLookup = new Map(roles.map((role) => [role.id, role]));
+  const effectiveRoles = [roleLookup.get(SYSTEM_ROLE_IDS.everyone), ...assignedRoleIds.map((roleId) => roleLookup.get(roleId))]
+    .filter((role): role is AccessRolePayload => !!role)
+    .sort(compareRolePosition);
+
+  let state: PermissionStatePayload = 'inherit';
+
+  for (const role of effectiveRoles) {
+    const nextState = role.permissions?.[permission] ?? 'inherit';
+
+    if (nextState !== 'inherit') {
+      state = nextState;
+    }
+  }
+
+  return state;
+}
+
+function resolveHighestRole(
+  server: Pick<ServerPayload, 'roleAssignments' | 'roles'>,
+  identity: ServerIdentity
+): AccessRolePayload | null {
+  const roles = getServerRoles(server);
+  const assignedRoleIds = resolveAssignedRoleIds(server, identity);
+  const roleLookup = new Map(roles.map((role) => [role.id, role]));
+  const assignedRoles = assignedRoleIds
+    .map((roleId) => roleLookup.get(roleId))
+    .filter((role): role is AccessRolePayload => !!role)
+    .sort((firstRole, secondRole) => compareRolePosition(secondRole, firstRole));
+
+  return assignedRoles[0] ?? roleLookup.get(SYSTEM_ROLE_IDS.everyone) ?? null;
+}
+
+export function isServerOwner(server: Pick<ServerPayload, 'ownerId'>, actorUserId: string): boolean {
+  return server.ownerId === actorUserId;
+}
+
+export function resolveServerPermission(
+  server: Pick<ServerPayload, 'ownerId' | 'roleAssignments' | 'roles'>,
+  actorUserId: string,
+  permission: ServerPermissionKeyPayload,
+  actorOderId?: string
+): boolean {
+  if (isServerOwner(server, actorUserId)) {
+    return true;
+  }
+
+  const roles = getServerRoles(server);
+  const assignedRoleIds = resolveAssignedRoleIds(server, {
+    userId: actorUserId,
+    oderId: actorOderId
+  });
+
+  return resolveRolePermissionState(roles, assignedRoleIds, permission) === 'allow';
+}
+
+export function canManageServerUpdate(
+  server: Pick<ServerPayload, 'ownerId' | 'roleAssignments' | 'roles'>,
+  actorUserId: string,
+  updates: Record<string, unknown>,
+  actorOderId?: string
+): boolean {
+  if (isServerOwner(server, actorUserId)) {
+    return true;
+  }
+
+  if (typeof updates['ownerId'] === 'string' || typeof updates['ownerPublicKey'] === 'string') {
+    return false;
+  }
+
+  const requiredPermissions = new Set<ServerPermissionKeyPayload>();
+
+  if (
+    Array.isArray(updates['roles'])
+    || Array.isArray(updates['roleAssignments'])
+    || Array.isArray(updates['channelPermissions'])
+  ) {
+    requiredPermissions.add('manageRoles');
+  }
+
+  if (Array.isArray(updates['channels'])) {
+    requiredPermissions.add('manageChannels');
+  }
+
+  if (typeof updates['icon'] === 'string') {
+    requiredPermissions.add('manageIcon');
+  }
+
+  if (
+    typeof updates['name'] === 'string'
+    || typeof updates['description'] === 'string'
+    || typeof updates['isPrivate'] === 'boolean'
+    || typeof updates['maxUsers'] === 'number'
+    || typeof updates['password'] === 'string'
+    || typeof updates['passwordHash'] === 'string'
+    || typeof updates['slowModeInterval'] === 'number'
+  ) {
+    requiredPermissions.add('manageServer');
+  }
+
+  return Array.from(requiredPermissions).every((permission) =>
+    resolveServerPermission(server, actorUserId, permission, actorOderId)
+  );
+}
+
+export function canModerateServerMember(
+  server: Pick<ServerPayload, 'ownerId' | 'roleAssignments' | 'roles'>,
+  actorUserId: string,
+  targetUserId: string,
+  permission: 'kickMembers' | 'banMembers' | 'manageBans',
+  actorOderId?: string,
+  targetOderId?: string
+): boolean {
+  if (!actorUserId || !targetUserId || actorUserId === targetUserId) {
+    return false;
+  }
+
+  if (isServerOwner(server, targetUserId) && !isServerOwner(server, actorUserId)) {
+    return false;
+  }
+
+  if (isServerOwner(server, actorUserId)) {
+    return true;
+  }
+
+  if (!resolveServerPermission(server, actorUserId, permission, actorOderId)) {
+    return false;
+  }
+
+  const actorRole = resolveHighestRole(server, {
+    userId: actorUserId,
+    oderId: actorOderId
+  });
+  const targetRole = resolveHighestRole(server, {
+    userId: targetUserId,
+    oderId: targetOderId
+  });
+
+  return (actorRole?.position ?? 0) > (targetRole?.position ?? 0);
+}

server/src/websocket/handler.ts

@@ -134,11 +134,15 @@ function handleChatMessage(user: ConnectedUser, message: WsMessage): void {
 
 function handleTyping(user: ConnectedUser, message: WsMessage): void {
   const typingSid = (message['serverId'] as string | undefined) ?? user.viewedServerId;
+  const channelId = typeof message['channelId'] === 'string' && message['channelId'].trim()
+    ? message['channelId'].trim()
+    : 'general';
 
   if (typingSid && user.serverIds.has(typingSid)) {
     broadcastToServer(typingSid, {
       type: 'user_typing',
       serverId: typingSid,
+      channelId,
       oderId: user.oderId,
       displayName: user.displayName
     }, user.oderId);

src/app/app.html

@@ -1,60 +0,0 @@
-<div class="h-screen bg-background text-foreground flex">
-  <!-- Global left servers rail always visible -->
-  <aside class="w-16 flex-shrink-0 border-r border-border bg-card">
-    <app-servers-rail class="h-full" />
-  </aside>
-  <main class="flex-1 min-w-0 relative overflow-hidden">
-    <!-- Custom draggable title bar -->
-    <app-title-bar />
-
-    @if (desktopUpdateState().restartRequired) {
-    <div class="absolute inset-x-0 top-10 z-20 px-4 pt-4 pointer-events-none">
-      <div class="pointer-events-auto mx-auto max-w-4xl rounded-xl border border-primary/30 bg-primary/10 p-4 shadow-2xl backdrop-blur-sm">
-        <div class="flex flex-col gap-4 lg:flex-row lg:items-center lg:justify-between">
-          <div>
-            <p class="text-sm font-semibold text-foreground">Update ready to install</p>
-            <p class="mt-1 text-sm text-muted-foreground">
-              MetoYou {{ desktopUpdateState().targetVersion || 'update' }} has been downloaded. Restart the app to finish applying it.
-            </p>
-          </div>
-
-          <div class="flex flex-wrap gap-2">
-            <button
-              type="button"
-              (click)="openUpdatesSettings()"
-              class="inline-flex items-center rounded-lg border border-border bg-secondary px-4 py-2 text-sm font-medium text-foreground transition-colors hover:bg-secondary/80"
-            >
-              Update settings
-            </button>
-
-            <button
-              type="button"
-              (click)="restartToApplyUpdate()"
-              class="inline-flex items-center rounded-lg bg-primary px-4 py-2 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/90"
-            >
-              Restart now
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-    }
-
-    <!-- Content area fills below the title bar without global scroll -->
-    <div class="absolute inset-x-0 top-10 bottom-0 overflow-auto">
-      <router-outlet />
-    </div>
-  </main>
-
-  <!-- Floating voice controls - shown when connected to voice and navigated away from server -->
-  <app-floating-voice-controls />
-</div>
-
-<!-- Unified Settings Modal -->
-<app-settings-modal />
-
-<!-- Shared Screen Share Source Picker -->
-<app-screen-share-source-picker />
-
-<!-- Shared Debug Console -->
-<app-debug-console [showLauncher]="false" />

src/app/app.ts

@@ -1,217 +0,0 @@
-/* eslint-disable @angular-eslint/component-class-suffix */
-import {
-  Component,
-  OnInit,
-  OnDestroy,
-  inject,
-  HostListener
-} from '@angular/core';
-import {
-  Router,
-  RouterOutlet,
-  NavigationEnd
-} from '@angular/router';
-import { CommonModule } from '@angular/common';
-import { Store } from '@ngrx/store';
-
-import { DatabaseService } from './infrastructure/persistence';
-import { DesktopAppUpdateService } from './core/services/desktop-app-update.service';
-import { ServerDirectoryFacade } from './domains/server-directory';
-import { TimeSyncService } from './core/services/time-sync.service';
-import { VoiceSessionFacade } from './domains/voice-session';
-import { ExternalLinkService } from './core/platform';
-import { SettingsModalService } from './core/services/settings-modal.service';
-import { ElectronBridgeService } from './core/platform/electron/electron-bridge.service';
-import { ServersRailComponent } from './features/servers/servers-rail.component';
-import { TitleBarComponent } from './features/shell/title-bar.component';
-import { FloatingVoiceControlsComponent } from './domains/voice-session/feature/floating-voice-controls/floating-voice-controls.component';
-import { SettingsModalComponent } from './features/settings/settings-modal/settings-modal.component';
-import { DebugConsoleComponent } from './shared/components/debug-console/debug-console.component';
-import { ScreenShareSourcePickerComponent } from './shared/components/screen-share-source-picker/screen-share-source-picker.component';
-import { UsersActions } from './store/users/users.actions';
-import { RoomsActions } from './store/rooms/rooms.actions';
-import { selectCurrentRoom } from './store/rooms/rooms.selectors';
-import {
-  ROOM_URL_PATTERN,
-  STORAGE_KEY_CURRENT_USER_ID,
-  STORAGE_KEY_LAST_VISITED_ROUTE
-} from './core/constants';
-
-@Component({
-  selector: 'app-root',
-  imports: [
-    CommonModule,
-    RouterOutlet,
-    ServersRailComponent,
-    TitleBarComponent,
-    FloatingVoiceControlsComponent,
-    SettingsModalComponent,
-    DebugConsoleComponent,
-    ScreenShareSourcePickerComponent
-  ],
-  templateUrl: './app.html',
-  styleUrl: './app.scss'
-})
-export class App implements OnInit, OnDestroy {
-  store = inject(Store);
-  currentRoom = this.store.selectSignal(selectCurrentRoom);
-  desktopUpdates = inject(DesktopAppUpdateService);
-  desktopUpdateState = this.desktopUpdates.state;
-
-  private databaseService = inject(DatabaseService);
-  private router = inject(Router);
-  private servers = inject(ServerDirectoryFacade);
-  private settingsModal = inject(SettingsModalService);
-  private timeSync = inject(TimeSyncService);
-  private voiceSession = inject(VoiceSessionFacade);
-  private externalLinks = inject(ExternalLinkService);
-  private electronBridge = inject(ElectronBridgeService);
-  private deepLinkCleanup: (() => void) | null = null;
-
-  @HostListener('document:click', ['$event'])
-  onGlobalLinkClick(evt: MouseEvent): void {
-    this.externalLinks.handleClick(evt);
-  }
-
-  async ngOnInit(): Promise<void> {
-    void this.desktopUpdates.initialize();
-
-    await this.databaseService.initialize();
-
-    try {
-      const apiBase = this.servers.getApiBaseUrl();
-
-      await this.timeSync.syncWithEndpoint(apiBase);
-    } catch {}
-
-    await this.setupDesktopDeepLinks();
-
-    this.store.dispatch(UsersActions.loadCurrentUser());
-
-    this.store.dispatch(RoomsActions.loadRooms());
-
-    const currentUserId = localStorage.getItem(STORAGE_KEY_CURRENT_USER_ID);
-
-    if (!currentUserId) {
-      if (!this.isPublicRoute(this.router.url)) {
-        this.router.navigate(['/login'], {
-          queryParams: {
-            returnUrl: this.router.url
-          }
-        }).catch(() => {});
-      }
-    } else {
-      const last = localStorage.getItem(STORAGE_KEY_LAST_VISITED_ROUTE);
-
-      if (last && typeof last === 'string') {
-        const current = this.router.url;
-
-        if (current === '/' || current === '/search') {
-          this.router.navigate([last], { replaceUrl: true }).catch(() => {});
-        }
-      }
-    }
-
-    this.router.events.subscribe((evt) => {
-      if (evt instanceof NavigationEnd) {
-        const url = evt.urlAfterRedirects || evt.url;
-
-        localStorage.setItem(STORAGE_KEY_LAST_VISITED_ROUTE, url);
-
-        const roomMatch = url.match(ROOM_URL_PATTERN);
-        const currentRoomId = roomMatch ? roomMatch[1] : null;
-
-        this.voiceSession.checkCurrentRoute(currentRoomId);
-      }
-    });
-  }
-
-  ngOnDestroy(): void {
-    this.deepLinkCleanup?.();
-    this.deepLinkCleanup = null;
-  }
-
-  openNetworkSettings(): void {
-    this.settingsModal.open('network');
-  }
-
-  openUpdatesSettings(): void {
-    this.settingsModal.open('updates');
-  }
-
-  async refreshDesktopUpdateContext(): Promise<void> {
-    await this.desktopUpdates.refreshServerContext();
-  }
-
-  async restartToApplyUpdate(): Promise<void> {
-    await this.desktopUpdates.restartToApplyUpdate();
-  }
-
-  private async setupDesktopDeepLinks(): Promise<void> {
-    const electronApi = this.electronBridge.getApi();
-
-    if (!electronApi) {
-      return;
-    }
-
-    this.deepLinkCleanup = electronApi.onDeepLinkReceived?.((url) => {
-      void this.handleDesktopDeepLink(url);
-    }) || null;
-
-    const pendingDeepLink = await electronApi.consumePendingDeepLink?.();
-
-    if (pendingDeepLink) {
-      await this.handleDesktopDeepLink(pendingDeepLink);
-    }
-  }
-
-  private async handleDesktopDeepLink(url: string): Promise<void> {
-    const invite = this.parseDesktopInviteUrl(url);
-
-    if (!invite) {
-      return;
-    }
-
-    await this.router.navigate(['/invite', invite.inviteId], {
-      queryParams: {
-        server: invite.sourceUrl
-      }
-    });
-  }
-
-  private isPublicRoute(url: string): boolean {
-    return url === '/login' ||
-      url === '/register' ||
-      url.startsWith('/invite/');
-  }
-
-  private parseDesktopInviteUrl(url: string): { inviteId: string; sourceUrl: string } | null {
-    try {
-      const parsedUrl = new URL(url);
-
-      if (parsedUrl.protocol !== 'toju:') {
-        return null;
-      }
-
-      const pathSegments = [parsedUrl.hostname, ...parsedUrl.pathname.split('/').filter(Boolean)]
-        .map((segment) => decodeURIComponent(segment));
-
-      if (pathSegments[0] !== 'invite' || !pathSegments[1]) {
-        return null;
-      }
-
-      const sourceUrl = parsedUrl.searchParams.get('server')?.trim();
-
-      if (!sourceUrl) {
-        return null;
-      }
-
-      return {
-        inviteId: pathSegments[1],
-        sourceUrl
-      };
-    } catch {
-      return null;
-    }
-  }
-}

src/app/core/services/settings-modal.service.ts

@@ -1,23 +0,0 @@
-import { Injectable, signal } from '@angular/core';
-export type SettingsPage = 'general' | 'network' | 'voice' | 'updates' | 'debugging' | 'server' | 'members' | 'bans' | 'permissions';
-
-@Injectable({ providedIn: 'root' })
-export class SettingsModalService {
-  readonly isOpen = signal(false);
-  readonly activePage = signal<SettingsPage>('general');
-  readonly targetServerId = signal<string | null>(null);
-
-  open(page: SettingsPage = 'general', serverId?: string): void {
-    this.activePage.set(page);
-    this.targetServerId.set(serverId ?? null);
-    this.isOpen.set(true);
-  }
-
-  close(): void {
-    this.isOpen.set(false);
-  }
-
-  navigate(page: SettingsPage): void {
-    this.activePage.set(page);
-  }
-}

src/app/domains/README.md

@@ -1,62 +0,0 @@
-# Domains
-
-Each folder below is a **bounded context** — a self-contained slice of
-business logic with its own models, application services, and (optionally)
-infrastructure adapters and UI.
-
-## Quick reference
-
-| Domain | Purpose | Public entry point |
-|---|---|---|
-| **attachment** | File upload/download, chunk transfer, persistence | `AttachmentFacade` |
-| **auth** | Login / register HTTP orchestration, user-bar UI | `AuthService` |
-| **chat** | Messaging rules, sync logic, GIF/Klipy integration, chat UI | `KlipyService`, `canEditMessage()`, `ChatMessagesComponent` |
-| **screen-share** | Source picker, quality presets | `ScreenShareFacade` |
-| **server-directory** | Multi-server endpoint management, health checks, invites, server search UI | `ServerDirectoryFacade` |
-| **voice-connection** | Voice activity detection, bitrate profiles | `VoiceConnectionFacade` |
-| **voice-session** | Join/leave orchestration, voice settings persistence | `VoiceSessionFacade` |
-
-## Folder convention
-
-Every domain follows the same internal layout:
-
-```
-domains/<name>/
-├── index.ts                 # Barrel — the ONLY file outsiders import
-├── domain/                  # Pure types, interfaces, business rules
-│   ├── <name>.models.ts
-│   └── <name>.logic.ts      # Pure functions (no Angular, no side effects)
-├── application/             # Angular services that orchestrate domain logic
-│   └── <name>.facade.ts     # Public entry point for the domain
-├── infrastructure/          # Technical adapters (HTTP, storage, WebSocket)
-└── feature/                 # Optional: domain-owned UI components / routes
-    └── settings/            # e.g. settings subpanel owned by this domain
-```
-
-## Rules
-
-1. **Import from the barrel.** Outside a domain, always import from
-   `domains/<name>` (the `index.ts`), never from internal paths.
-
-2. **No cross-domain imports.** Domain A must never import from Domain B's
-   internals. Shared types live in `shared-kernel/`.
-
-3. **Features compose domains.** Top-level `features/` components inject
-   domain facades and compose their outputs — they never contain business
-   logic.
-
-4. **Store slices are application-level.** `store/messages`, `store/rooms`,
-   `store/users` are global state managed by NgRx. They import from
-   `shared-kernel` for types and from domain facades for side-effects.
-
-## Where do I put new code?
-
-| I want to… | Put it in… |
-|---|---|
-| Add a new business concept | New folder under `domains/` following the convention above |
-| Add a type used by multiple domains | `shared-kernel/` with a descriptive file name |
-| Add a UI component for a domain feature | `domains/<name>/feature/` or `domains/<name>/ui/` |
-| Add a settings subpanel | `domains/<name>/feature/settings/` |
-| Add a top-level page or shell component | `features/` |
-| Add persistence logic | `infrastructure/persistence/` or `domains/<name>/infrastructure/` |
-| Add realtime/WebRTC logic | `infrastructure/realtime/` |

src/app/domains/attachment/infrastructure/attachment-storage.helpers.ts

@@ -1,23 +0,0 @@
-const ROOM_NAME_SANITIZER = /[^\w.-]+/g;
-
-export function sanitizeAttachmentRoomName(roomName: string): string {
-  const sanitizedRoomName = roomName.trim().replace(ROOM_NAME_SANITIZER, '_');
-
-  return sanitizedRoomName || 'room';
-}
-
-export function resolveAttachmentStorageBucket(mime: string): 'video' | 'audio' | 'image' | 'files' {
-  if (mime.startsWith('video/')) {
-    return 'video';
-  }
-
-  if (mime.startsWith('audio/')) {
-    return 'audio';
-  }
-
-  if (mime.startsWith('image/')) {
-    return 'image';
-  }
-
-  return 'files';
-}

src/app/domains/screen-share/feature/screen-share-workspace/screen-share-workspace.models.ts

@@ -1,9 +0,0 @@
-import { User } from '../../../../shared-kernel';
-
-export interface ScreenShareWorkspaceStreamItem {
-  id: string;
-  peerKey: string;
-  user: User;
-  stream: MediaStream;
-  isLocal: boolean;
-}

src/app/domains/server-directory/infrastructure/server-directory-api.service.ts

@@ -1,405 +0,0 @@
-/* eslint-disable @typescript-eslint/no-invalid-void-type */
-import { Injectable, inject } from '@angular/core';
-import { HttpClient, HttpParams } from '@angular/common/http';
-import {
-  Observable,
-  forkJoin,
-  of,
-  throwError
-} from 'rxjs';
-import { catchError, map } from 'rxjs/operators';
-import { User } from '../../../shared-kernel';
-import { ServerEndpointStateService } from '../application/server-endpoint-state.service';
-import type {
-  BanServerMemberRequest,
-  CreateServerInviteRequest,
-  KickServerMemberRequest,
-  ServerEndpoint,
-  ServerInfo,
-  ServerInviteInfo,
-  ServerJoinAccessRequest,
-  ServerJoinAccessResponse,
-  ServerSourceSelector,
-  UnbanServerMemberRequest
-} from '../domain/server-directory.models';
-
-@Injectable({ providedIn: 'root' })
-export class ServerDirectoryApiService {
-  private readonly http = inject(HttpClient);
-  private readonly endpointState = inject(ServerEndpointStateService);
-
-  getApiBaseUrl(selector?: ServerSourceSelector): string {
-    return `${this.resolveBaseServerUrl(selector)}/api`;
-  }
-
-  getWebSocketUrl(selector?: ServerSourceSelector): string {
-    return this.resolveBaseServerUrl(selector).replace(/^http/, 'ws');
-  }
-
-  resolveEndpoint(selector?: ServerSourceSelector): ServerEndpoint | null {
-    if (selector?.sourceId) {
-      return this.endpointState.servers().find((endpoint) => endpoint.id === selector.sourceId) ?? null;
-    }
-
-    if (selector?.sourceUrl) {
-      return this.endpointState.findServerByUrl(selector.sourceUrl) ?? null;
-    }
-
-    return this.endpointState.activeServer()
-      ?? this.endpointState.servers().find((endpoint) => endpoint.status !== 'incompatible')
-      ?? this.endpointState.servers()[0]
-      ?? null;
-  }
-
-  searchServers(query: string, shouldSearchAllServers: boolean): Observable<ServerInfo[]> {
-    if (shouldSearchAllServers) {
-      return this.searchAllEndpoints(query);
-    }
-
-    return this.searchSingleEndpoint(query, this.getApiBaseUrl(), this.endpointState.activeServer());
-  }
-
-  getServers(shouldSearchAllServers: boolean): Observable<ServerInfo[]> {
-    if (shouldSearchAllServers) {
-      return this.getAllServersFromAllEndpoints();
-    }
-
-    return this.http
-      .get<{ servers: ServerInfo[]; total: number }>(`${this.getApiBaseUrl()}/servers`)
-      .pipe(
-        map((response) => this.normalizeServerList(response, this.endpointState.activeServer())),
-        catchError((error) => {
-          console.error('Failed to get servers:', error);
-          return of([]);
-        })
-      );
-  }
-
-  getServer(serverId: string, selector?: ServerSourceSelector): Observable<ServerInfo | null> {
-    return this.http
-      .get<ServerInfo>(`${this.getApiBaseUrl(selector)}/servers/${serverId}`)
-      .pipe(
-        map((server) => this.normalizeServerInfo(server, this.resolveEndpoint(selector))),
-        catchError((error) => {
-          console.error('Failed to get server:', error);
-          return of(null);
-        })
-      );
-  }
-
-  registerServer(
-    server: Omit<ServerInfo, 'createdAt'> & { id?: string; password?: string | null },
-    selector?: ServerSourceSelector
-  ): Observable<ServerInfo> {
-    return this.http
-      .post<ServerInfo>(`${this.getApiBaseUrl(selector)}/servers`, server)
-      .pipe(
-        catchError((error) => {
-          console.error('Failed to register server:', error);
-          return throwError(() => error);
-        })
-      );
-  }
-
-  updateServer(
-    serverId: string,
-    updates: Partial<ServerInfo> & {
-      currentOwnerId: string;
-      actingRole?: string;
-      password?: string | null;
-    },
-    selector?: ServerSourceSelector
-  ): Observable<ServerInfo> {
-    return this.http
-      .put<ServerInfo>(`${this.getApiBaseUrl(selector)}/servers/${serverId}`, updates)
-      .pipe(
-        catchError((error) => {
-          console.error('Failed to update server:', error);
-          return throwError(() => error);
-        })
-      );
-  }
-
-  unregisterServer(serverId: string, selector?: ServerSourceSelector): Observable<void> {
-    return this.http
-      .delete<void>(`${this.getApiBaseUrl(selector)}/servers/${serverId}`)
-      .pipe(
-        catchError((error) => {
-          console.error('Failed to unregister server:', error);
-          return throwError(() => error);
-        })
-      );
-  }
-
-  getServerUsers(serverId: string, selector?: ServerSourceSelector): Observable<User[]> {
-    return this.http
-      .get<User[]>(`${this.getApiBaseUrl(selector)}/servers/${serverId}/users`)
-      .pipe(
-        catchError((error) => {
-          console.error('Failed to get server users:', error);
-          return of([]);
-        })
-      );
-  }
-
-  requestJoin(
-    request: ServerJoinAccessRequest,
-    selector?: ServerSourceSelector
-  ): Observable<ServerJoinAccessResponse> {
-    return this.http
-      .post<ServerJoinAccessResponse>(
-        `${this.getApiBaseUrl(selector)}/servers/${request.roomId}/join`,
-        request
-      )
-      .pipe(
-        catchError((error) => {
-          console.error('Failed to send join request:', error);
-          return throwError(() => error);
-        })
-      );
-  }
-
-  createInvite(
-    serverId: string,
-    request: CreateServerInviteRequest,
-    selector?: ServerSourceSelector
-  ): Observable<ServerInviteInfo> {
-    return this.http
-      .post<ServerInviteInfo>(`${this.getApiBaseUrl(selector)}/servers/${serverId}/invites`, request)
-      .pipe(
-        catchError((error) => {
-          console.error('Failed to create invite:', error);
-          return throwError(() => error);
-        })
-      );
-  }
-
-  getInvite(inviteId: string, selector?: ServerSourceSelector): Observable<ServerInviteInfo> {
-    return this.http
-      .get<ServerInviteInfo>(`${this.getApiBaseUrl(selector)}/invites/${inviteId}`)
-      .pipe(
-        catchError((error) => {
-          console.error('Failed to get invite:', error);
-          return throwError(() => error);
-        })
-      );
-  }
-
-  kickServerMember(
-    serverId: string,
-    request: KickServerMemberRequest,
-    selector?: ServerSourceSelector
-  ): Observable<void> {
-    return this.http
-      .post<void>(`${this.getApiBaseUrl(selector)}/servers/${serverId}/moderation/kick`, request)
-      .pipe(
-        catchError((error) => {
-          console.error('Failed to kick server member:', error);
-          return throwError(() => error);
-        })
-      );
-  }
-
-  banServerMember(
-    serverId: string,
-    request: BanServerMemberRequest,
-    selector?: ServerSourceSelector
-  ): Observable<void> {
-    return this.http
-      .post<void>(`${this.getApiBaseUrl(selector)}/servers/${serverId}/moderation/ban`, request)
-      .pipe(
-        catchError((error) => {
-          console.error('Failed to ban server member:', error);
-          return throwError(() => error);
-        })
-      );
-  }
-
-  unbanServerMember(
-    serverId: string,
-    request: UnbanServerMemberRequest,
-    selector?: ServerSourceSelector
-  ): Observable<void> {
-    return this.http
-      .post<void>(`${this.getApiBaseUrl(selector)}/servers/${serverId}/moderation/unban`, request)
-      .pipe(
-        catchError((error) => {
-          console.error('Failed to unban server member:', error);
-          return throwError(() => error);
-        })
-      );
-  }
-
-  notifyLeave(serverId: string, userId: string, selector?: ServerSourceSelector): Observable<void> {
-    return this.http
-      .post<void>(`${this.getApiBaseUrl(selector)}/servers/${serverId}/leave`, { userId })
-      .pipe(
-        catchError((error) => {
-          console.error('Failed to notify leave:', error);
-          return of(undefined);
-        })
-      );
-  }
-
-  updateUserCount(serverId: string, count: number): Observable<void> {
-    return this.http
-      .patch<void>(`${this.getApiBaseUrl()}/servers/${serverId}/user-count`, { count })
-      .pipe(
-        catchError((error) => {
-          console.error('Failed to update user count:', error);
-          return of(undefined);
-        })
-      );
-  }
-
-  sendHeartbeat(serverId: string): Observable<void> {
-    return this.http
-      .post<void>(`${this.getApiBaseUrl()}/servers/${serverId}/heartbeat`, {})
-      .pipe(
-        catchError((error) => {
-          console.error('Failed to send heartbeat:', error);
-          return of(undefined);
-        })
-      );
-  }
-
-  private resolveBaseServerUrl(selector?: ServerSourceSelector): string {
-    if (selector?.sourceUrl) {
-      return this.endpointState.sanitiseUrl(selector.sourceUrl);
-    }
-
-    return this.resolveEndpoint(selector)?.url ?? this.endpointState.getPrimaryDefaultServerUrl();
-  }
-
-  private unwrapServersResponse(
-    response: { servers: ServerInfo[]; total: number } | ServerInfo[]
-  ): ServerInfo[] {
-    return Array.isArray(response)
-      ? response
-      : (response.servers ?? []);
-  }
-
-  private searchSingleEndpoint(
-    query: string,
-    apiBaseUrl: string,
-    source?: ServerEndpoint | null
-  ): Observable<ServerInfo[]> {
-    const params = new HttpParams().set('q', query);
-
-    return this.http
-      .get<{ servers: ServerInfo[]; total: number }>(`${apiBaseUrl}/servers`, { params })
-      .pipe(
-        map((response) => this.normalizeServerList(response, source)),
-        catchError((error) => {
-          console.error('Failed to search servers:', error);
-          return of([]);
-        })
-      );
-  }
-
-  private searchAllEndpoints(query: string): Observable<ServerInfo[]> {
-    const onlineEndpoints = this.endpointState.activeServers().filter(
-      (endpoint) => endpoint.status !== 'offline'
-    );
-
-    if (onlineEndpoints.length === 0) {
-      return this.searchSingleEndpoint(query, this.getApiBaseUrl(), this.endpointState.activeServer());
-    }
-
-    return forkJoin(
-      onlineEndpoints.map((endpoint) => this.searchSingleEndpoint(query, `${endpoint.url}/api`, endpoint))
-    ).pipe(
-      map((resultArrays) => resultArrays.flat()),
-      map((servers) => this.deduplicateById(servers))
-    );
-  }
-
-  private getAllServersFromAllEndpoints(): Observable<ServerInfo[]> {
-    const onlineEndpoints = this.endpointState.activeServers().filter(
-      (endpoint) => endpoint.status !== 'offline'
-    );
-
-    if (onlineEndpoints.length === 0) {
-      return this.http
-        .get<{ servers: ServerInfo[]; total: number }>(`${this.getApiBaseUrl()}/servers`)
-        .pipe(
-          map((response) => this.normalizeServerList(response, this.endpointState.activeServer())),
-          catchError(() => of([]))
-        );
-    }
-
-    return forkJoin(
-      onlineEndpoints.map((endpoint) =>
-        this.http
-          .get<{ servers: ServerInfo[]; total: number }>(`${endpoint.url}/api/servers`)
-          .pipe(
-            map((response) => this.normalizeServerList(response, endpoint)),
-            catchError(() => of([] as ServerInfo[]))
-          )
-      )
-    ).pipe(map((resultArrays) => resultArrays.flat()));
-  }
-
-  private deduplicateById<T extends { id: string }>(items: T[]): T[] {
-    const seen = new Set<string>();
-
-    return items.filter((item) => {
-      if (seen.has(item.id)) {
-        return false;
-      }
-
-      seen.add(item.id);
-      return true;
-    });
-  }
-
-  private normalizeServerList(
-    response: { servers: ServerInfo[]; total: number } | ServerInfo[],
-    source?: ServerEndpoint | null
-  ): ServerInfo[] {
-    return this.unwrapServersResponse(response).map((server) => this.normalizeServerInfo(server, source));
-  }
-
-  private normalizeServerInfo(
-    server: ServerInfo | Record<string, unknown>,
-    source?: ServerEndpoint | null
-  ): ServerInfo {
-    const candidate = server as Record<string, unknown>;
-    const sourceName = this.getStringValue(candidate['sourceName']);
-    const sourceUrl = this.getStringValue(candidate['sourceUrl']);
-
-    return {
-      id: this.getStringValue(candidate['id']) ?? '',
-      name: this.getStringValue(candidate['name']) ?? 'Unnamed server',
-      description: this.getStringValue(candidate['description']),
-      topic: this.getStringValue(candidate['topic']),
-      hostName: this.getStringValue(candidate['hostName']) ?? sourceName ?? source?.name ?? 'Unknown API',
-      ownerId: this.getStringValue(candidate['ownerId']),
-      ownerName: this.getStringValue(candidate['ownerName']),
-      ownerPublicKey: this.getStringValue(candidate['ownerPublicKey']),
-      userCount: this.getNumberValue(candidate['userCount'], this.getNumberValue(candidate['currentUsers'])),
-      maxUsers: this.getNumberValue(candidate['maxUsers']),
-      hasPassword: this.getBooleanValue(candidate['hasPassword']),
-      isPrivate: this.getBooleanValue(candidate['isPrivate']),
-      tags: Array.isArray(candidate['tags']) ? candidate['tags'] as string[] : [],
-      createdAt: this.getNumberValue(candidate['createdAt'], Date.now()),
-      sourceId: this.getStringValue(candidate['sourceId']) ?? source?.id,
-      sourceName: sourceName ?? source?.name,
-      sourceUrl: sourceUrl
-        ? this.endpointState.sanitiseUrl(sourceUrl)
-        : (source ? this.endpointState.sanitiseUrl(source.url) : undefined)
-    };
-  }
-
-  private getBooleanValue(value: unknown): boolean {
-    return typeof value === 'boolean' ? value : value === 1;
-  }
-
-  private getNumberValue(value: unknown, fallback = 0): number {
-    return typeof value === 'number' ? value : fallback;
-  }
-
-  private getStringValue(value: unknown): string | undefined {
-    return typeof value === 'string' ? value : undefined;
-  }
-}

src/app/domains/voice-session/feature/voice-controls/voice-controls.component.html

@@ -1,130 +0,0 @@
-<div class="bg-card border-border p-4">
-  <!-- Connection Error Banner -->
-  @if (showConnectionError()) {
-    <div class="mb-3 p-2 bg-destructive/20 border border-destructive/30 rounded-lg flex items-center gap-2">
-      <span class="w-2 h-2 rounded-full bg-destructive animate-pulse"></span>
-      <span class="text-xs text-destructive">{{ connectionErrorMessage() || 'Connection error' }}</span>
-      <button
-        type="button"
-        (click)="retryConnection()"
-        class="ml-auto text-xs text-destructive hover:underline"
-      >
-        Retry
-      </button>
-    </div>
-  }
-
-  <!-- User Info -->
-  <div class="flex items-center gap-3 mb-4">
-    <app-user-avatar
-      [name]="currentUser()?.displayName || '?'"
-      size="sm"
-    />
-    <div class="flex-1 min-w-0">
-      <p class="font-medium text-sm text-foreground truncate">
-        {{ currentUser()?.displayName || 'Unknown' }}
-      </p>
-      <p class="text-xs text-muted-foreground">
-        @if (showConnectionError()) {
-          <span class="text-destructive">● Connection Error</span>
-        } @else if (isConnected()) {
-          <span class="text-green-500">● Connected</span>
-        } @else {
-          <span class="text-muted-foreground">● Disconnected</span>
-        }
-      </p>
-    </div>
-    <div class="flex items-center gap-1">
-      <app-debug-console
-        launcherVariant="inline"
-        [showPanel]="false"
-      />
-      <button
-        type="button"
-        (click)="toggleSettings()"
-        class="p-2 hover:bg-secondary rounded-lg transition-colors"
-      >
-        <ng-icon
-          name="lucideSettings"
-          class="w-4 h-4 text-muted-foreground"
-        />
-      </button>
-    </div>
-  </div>
-
-  <!-- Voice Controls -->
-  <div class="flex items-center justify-center gap-2">
-    @if (isConnected()) {
-      <!-- Mute Toggle -->
-      <button
-        type="button"
-        (click)="toggleMute()"
-        [class]="getMuteButtonClass()"
-      >
-        @if (isMuted()) {
-          <ng-icon
-            name="lucideMicOff"
-            class="w-5 h-5"
-          />
-        } @else {
-          <ng-icon
-            name="lucideMic"
-            class="w-5 h-5"
-          />
-        }
-      </button>
-
-      <!-- Deafen Toggle -->
-      <button
-        type="button"
-        (click)="toggleDeafen()"
-        [class]="getDeafenButtonClass()"
-      >
-        <ng-icon
-          name="lucideHeadphones"
-          class="w-5 h-5"
-        />
-      </button>
-
-      <!-- Screen Share Toggle -->
-      <button
-        type="button"
-        (click)="toggleScreenShare()"
-        [class]="getScreenShareButtonClass()"
-      >
-        @if (isScreenSharing()) {
-          <ng-icon
-            name="lucideMonitorOff"
-            class="w-5 h-5"
-          />
-        } @else {
-          <ng-icon
-            name="lucideMonitor"
-            class="w-5 h-5"
-          />
-        }
-      </button>
-
-      <!-- Disconnect -->
-      <button
-        type="button"
-        (click)="disconnect()"
-        class="w-10 h-10 inline-flex items-center justify-center bg-destructive text-destructive-foreground rounded-full hover:bg-destructive/90 transition-colors"
-      >
-        <ng-icon
-          name="lucidePhoneOff"
-          class="w-5 h-5"
-        />
-      </button>
-    }
-  </div>
-</div>
-
-@if (showScreenShareQualityDialog()) {
-  <app-screen-share-quality-dialog
-    [selectedQuality]="screenShareQuality()"
-    [includeSystemAudio]="includeSystemAudio()"
-    (cancelled)="onScreenShareQualityCancelled()"
-    (confirmed)="onScreenShareQualityConfirmed($event)"
-  />
-}

src/app/features/admin/admin-panel/admin-panel.component.html

@@ -1,438 +0,0 @@
-@if (isAdmin()) {
-  <div class="h-full flex flex-col bg-card">
-    <!-- Header -->
-    <div class="p-4 border-b border-border flex items-center gap-2">
-      <ng-icon
-        name="lucideShield"
-        class="w-5 h-5 text-primary"
-      />
-      <h2 class="font-semibold text-foreground">Admin Panel</h2>
-    </div>
-
-    <!-- Tabs -->
-    <div class="flex border-b border-border">
-      <button
-        type="button"
-        (click)="activeTab.set('settings')"
-        class="flex-1 px-4 py-2 text-sm font-medium transition-colors"
-        [class.text-primary]="activeTab() === 'settings'"
-        [class.border-b-2]="activeTab() === 'settings'"
-        [class.border-primary]="activeTab() === 'settings'"
-        [class.text-muted-foreground]="activeTab() !== 'settings'"
-      >
-        <ng-icon
-          name="lucideSettings"
-          class="w-4 h-4 inline mr-1"
-        />
-        Settings
-      </button>
-      <button
-        type="button"
-        (click)="activeTab.set('members')"
-        class="flex-1 px-4 py-2 text-sm font-medium transition-colors"
-        [class.text-primary]="activeTab() === 'members'"
-        [class.border-b-2]="activeTab() === 'members'"
-        [class.border-primary]="activeTab() === 'members'"
-        [class.text-muted-foreground]="activeTab() !== 'members'"
-      >
-        <ng-icon
-          name="lucideUsers"
-          class="w-4 h-4 inline mr-1"
-        />
-        Members
-      </button>
-      <button
-        type="button"
-        (click)="activeTab.set('bans')"
-        class="flex-1 px-4 py-2 text-sm font-medium transition-colors"
-        [class.text-primary]="activeTab() === 'bans'"
-        [class.border-b-2]="activeTab() === 'bans'"
-        [class.border-primary]="activeTab() === 'bans'"
-        [class.text-muted-foreground]="activeTab() !== 'bans'"
-      >
-        <ng-icon
-          name="lucideBan"
-          class="w-4 h-4 inline mr-1"
-        />
-        Bans
-      </button>
-      <button
-        type="button"
-        (click)="activeTab.set('permissions')"
-        class="flex-1 px-4 py-2 text-sm font-medium transition-colors"
-        [class.text-primary]="activeTab() === 'permissions'"
-        [class.border-b-2]="activeTab() === 'permissions'"
-        [class.border-primary]="activeTab() === 'permissions'"
-        [class.text-muted-foreground]="activeTab() !== 'permissions'"
-      >
-        <ng-icon
-          name="lucideShield"
-          class="w-4 h-4 inline mr-1"
-        />
-        Perms
-      </button>
-    </div>
-
-    <!-- Tab Content -->
-    <div class="flex-1 overflow-y-auto p-4">
-      @switch (activeTab()) {
-        @case ('settings') {
-          <div class="space-y-6">
-            <h3 class="text-sm font-medium text-foreground">Room Settings</h3>
-
-            <!-- Room Name -->
-            <div>
-              <label
-                for="room-name-input"
-                class="block text-sm text-muted-foreground mb-1"
-                >Room Name</label
-              >
-              <input
-                type="text"
-                id="room-name-input"
-                [(ngModel)]="roomName"
-                class="w-full px-3 py-2 bg-secondary rounded border border-border text-foreground focus:outline-none focus:ring-2 focus:ring-primary"
-              />
-            </div>
-
-            <!-- Room Description -->
-            <div>
-              <label
-                for="room-description-input"
-                class="block text-sm text-muted-foreground mb-1"
-                >Description</label
-              >
-              <textarea
-                id="room-description-input"
-                [(ngModel)]="roomDescription"
-                rows="3"
-                class="w-full px-3 py-2 bg-secondary rounded border border-border text-foreground focus:outline-none focus:ring-2 focus:ring-primary resize-none"
-              ></textarea>
-            </div>
-
-            <!-- Private Room Toggle -->
-            <div class="flex items-center justify-between">
-              <div>
-                <p class="text-sm font-medium text-foreground">Private Room</p>
-                <p class="text-xs text-muted-foreground">Require approval to join</p>
-              </div>
-              <button
-                type="button"
-                (click)="togglePrivate()"
-                class="p-2 rounded-lg transition-colors"
-                [class.bg-primary]="isPrivate()"
-                [class.text-primary-foreground]="isPrivate()"
-                [class.bg-secondary]="!isPrivate()"
-                [class.text-muted-foreground]="!isPrivate()"
-              >
-                @if (isPrivate()) {
-                  <ng-icon
-                    name="lucideLock"
-                    class="w-4 h-4"
-                  />
-                } @else {
-                  <ng-icon
-                    name="lucideUnlock"
-                    class="w-4 h-4"
-                  />
-                }
-              </button>
-            </div>
-
-            <!-- Max Users -->
-            <div>
-              <label
-                for="max-users-input"
-                class="block text-sm text-muted-foreground mb-1"
-                >Max Users (0 = unlimited)</label
-              >
-              <input
-                type="number"
-                id="max-users-input"
-                [(ngModel)]="maxUsers"
-                min="0"
-                class="w-full px-3 py-2 bg-secondary rounded border border-border text-foreground focus:outline-none focus:ring-2 focus:ring-primary"
-              />
-            </div>
-
-            <!-- Save Button -->
-            <button
-              type="button"
-              (click)="saveSettings()"
-              class="w-full px-4 py-2 bg-primary text-primary-foreground rounded-lg hover:bg-primary/90 transition-colors flex items-center justify-center gap-2"
-            >
-              <ng-icon
-                name="lucideCheck"
-                class="w-4 h-4"
-              />
-              Save Settings
-            </button>
-
-            <!-- Danger Zone -->
-            <div class="pt-4 border-t border-border">
-              <h3 class="text-sm font-medium text-destructive mb-4">Danger Zone</h3>
-              <button
-                type="button"
-                (click)="confirmDeleteRoom()"
-                class="w-full px-4 py-2 bg-destructive/10 text-destructive border border-destructive/20 rounded-lg hover:bg-destructive/20 transition-colors flex items-center justify-center gap-2"
-              >
-                <ng-icon
-                  name="lucideTrash2"
-                  class="w-4 h-4"
-                />
-                Delete Room
-              </button>
-            </div>
-          </div>
-        }
-        @case ('members') {
-          <div class="space-y-4">
-            <h3 class="text-sm font-medium text-foreground">Server Members</h3>
-
-            @if (membersFiltered().length === 0) {
-              <p class="text-sm text-muted-foreground text-center py-8">No other members online</p>
-            } @else {
-              @for (user of membersFiltered(); track user.id) {
-                <div class="flex items-center gap-3 p-3 bg-secondary/50 rounded-lg">
-                  <app-user-avatar
-                    [name]="user.displayName || '?'"
-                    size="sm"
-                  />
-                  <div class="flex-1 min-w-0">
-                    <div class="flex items-center gap-1.5">
-                      <p class="text-sm font-medium text-foreground truncate">{{ user.displayName }}</p>
-                      @if (user.role === 'host') {
-                        <span class="text-[10px] bg-yellow-500/20 text-yellow-400 px-1 py-0.5 rounded">Owner</span>
-                      } @else if (user.role === 'admin') {
-                        <span class="text-[10px] bg-blue-500/20 text-blue-400 px-1 py-0.5 rounded">Admin</span>
-                      } @else if (user.role === 'moderator') {
-                        <span class="text-[10px] bg-green-500/20 text-green-400 px-1 py-0.5 rounded">Mod</span>
-                      }
-                    </div>
-                  </div>
-                  <!-- Role actions (only for non-hosts) -->
-                  @if (user.role !== 'host') {
-                    <div class="flex items-center gap-1">
-                      <select
-                        [ngModel]="user.role"
-                        (ngModelChange)="changeRole(user, $event)"
-                        class="text-xs px-2 py-1 bg-secondary rounded border border-border text-foreground focus:outline-none focus:ring-1 focus:ring-primary"
-                      >
-                        <option value="member">Member</option>
-                        <option value="moderator">Moderator</option>
-                        <option value="admin">Admin</option>
-                      </select>
-                      <button
-                        type="button"
-                        (click)="kickMember(user)"
-                        class="p-1 rounded hover:bg-destructive/20 text-muted-foreground hover:text-destructive transition-colors"
-                        title="Kick"
-                      >
-                        <ng-icon
-                          name="lucideUserX"
-                          class="w-4 h-4"
-                        />
-                      </button>
-                      <button
-                        type="button"
-                        (click)="banMember(user)"
-                        class="p-1 rounded hover:bg-destructive/20 text-muted-foreground hover:text-destructive transition-colors"
-                        title="Ban"
-                      >
-                        <ng-icon
-                          name="lucideBan"
-                          class="w-4 h-4"
-                        />
-                      </button>
-                    </div>
-                  }
-                </div>
-              }
-            }
-          </div>
-        }
-        @case ('bans') {
-          <div class="space-y-4">
-            <h3 class="text-sm font-medium text-foreground">Banned Users</h3>
-
-            @if (bannedUsers().length === 0) {
-              <p class="text-sm text-muted-foreground text-center py-8">No banned users</p>
-            } @else {
-              @for (ban of bannedUsers(); track ban.oderId) {
-                <div class="flex items-center gap-3 p-3 bg-secondary/50 rounded-lg">
-                  <div class="w-8 h-8 rounded-full bg-destructive/20 flex items-center justify-center text-destructive font-semibold text-sm">
-                    {{ ban.displayName?.charAt(0)?.toUpperCase() || '?' }}
-                  </div>
-                  <div class="flex-1 min-w-0">
-                    <p class="text-sm font-medium text-foreground truncate">
-                      {{ ban.displayName || 'Unknown User' }}
-                    </p>
-                    @if (ban.reason) {
-                      <p class="text-xs text-muted-foreground truncate">Reason: {{ ban.reason }}</p>
-                    }
-                    @if (ban.expiresAt) {
-                      <p class="text-xs text-muted-foreground">Expires: {{ formatExpiry(ban.expiresAt) }}</p>
-                    } @else {
-                      <p class="text-xs text-destructive">Permanent</p>
-                    }
-                  </div>
-                  <button
-                    type="button"
-                    (click)="unbanUser(ban)"
-                    class="p-2 hover:bg-secondary rounded-lg transition-colors text-muted-foreground hover:text-foreground"
-                  >
-                    <ng-icon
-                      name="lucideX"
-                      class="w-4 h-4"
-                    />
-                  </button>
-                </div>
-              }
-            }
-          </div>
-        }
-        @case ('permissions') {
-          <div class="space-y-4">
-            <h3 class="text-sm font-medium text-foreground">Room Permissions</h3>
-
-            <!-- Permission Toggles -->
-            <div class="space-y-3">
-              <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-                <div>
-                  <p class="text-sm font-medium text-foreground">Allow Voice Chat</p>
-                  <p class="text-xs text-muted-foreground">Users can join voice channels</p>
-                </div>
-                <input
-                  type="checkbox"
-                  [(ngModel)]="allowVoice"
-                  class="w-4 h-4 accent-primary"
-                />
-              </div>
-
-              <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-                <div>
-                  <p class="text-sm font-medium text-foreground">Allow Screen Share</p>
-                  <p class="text-xs text-muted-foreground">Users can share their screen</p>
-                </div>
-                <input
-                  type="checkbox"
-                  [(ngModel)]="allowScreenShare"
-                  class="w-4 h-4 accent-primary"
-                />
-              </div>
-
-              <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-                <div>
-                  <p class="text-sm font-medium text-foreground">Allow File Uploads</p>
-                  <p class="text-xs text-muted-foreground">Users can upload files</p>
-                </div>
-                <input
-                  type="checkbox"
-                  [(ngModel)]="allowFileUploads"
-                  class="w-4 h-4 accent-primary"
-                />
-              </div>
-
-              <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-                <div>
-                  <p class="text-sm font-medium text-foreground">Slow Mode</p>
-                  <p class="text-xs text-muted-foreground">Limit message frequency</p>
-                </div>
-                <select
-                  [(ngModel)]="slowModeInterval"
-                  class="px-3 py-1 bg-secondary rounded border border-border text-foreground text-sm focus:outline-none focus:ring-2 focus:ring-primary"
-                >
-                  <option value="0">Off</option>
-                  <option value="5">5 seconds</option>
-                  <option value="10">10 seconds</option>
-                  <option value="30">30 seconds</option>
-                  <option value="60">1 minute</option>
-                </select>
-              </div>
-
-              <!-- Management Permissions -->
-              <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-                <div>
-                  <p class="text-sm font-medium text-foreground">Admins Can Manage Rooms</p>
-                  <p class="text-xs text-muted-foreground">Allow admins to create/modify chat & voice rooms</p>
-                </div>
-                <input
-                  type="checkbox"
-                  [(ngModel)]="adminsManageRooms"
-                  class="w-4 h-4 accent-primary"
-                />
-              </div>
-
-              <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-                <div>
-                  <p class="text-sm font-medium text-foreground">Moderators Can Manage Rooms</p>
-                  <p class="text-xs text-muted-foreground">Allow moderators to create/modify chat & voice rooms</p>
-                </div>
-                <input
-                  type="checkbox"
-                  [(ngModel)]="moderatorsManageRooms"
-                  class="w-4 h-4 accent-primary"
-                />
-              </div>
-
-              <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-                <div>
-                  <p class="text-sm font-medium text-foreground">Admins Can Change Server Icon</p>
-                  <p class="text-xs text-muted-foreground">Grant icon management to admins</p>
-                </div>
-                <input
-                  type="checkbox"
-                  [(ngModel)]="adminsManageIcon"
-                  class="w-4 h-4 accent-primary"
-                />
-              </div>
-
-              <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-                <div>
-                  <p class="text-sm font-medium text-foreground">Moderators Can Change Server Icon</p>
-                  <p class="text-xs text-muted-foreground">Grant icon management to moderators</p>
-                </div>
-                <input
-                  type="checkbox"
-                  [(ngModel)]="moderatorsManageIcon"
-                  class="w-4 h-4 accent-primary"
-                />
-              </div>
-            </div>
-
-            <!-- Save Permissions -->
-            <button
-              type="button"
-              (click)="savePermissions()"
-              class="w-full px-4 py-2 bg-primary text-primary-foreground rounded-lg hover:bg-primary/90 transition-colors flex items-center justify-center gap-2"
-            >
-              <ng-icon
-                name="lucideCheck"
-                class="w-4 h-4"
-              />
-              Save Permissions
-            </button>
-          </div>
-        }
-      }
-    </div>
-  </div>
-
-  <!-- Delete Confirmation Modal -->
-  @if (showDeleteConfirm()) {
-    <app-confirm-dialog
-      title="Delete Room"
-      confirmLabel="Delete Room"
-      variant="danger"
-      [widthClass]="'w-96 max-w-[90vw]'"
-      (confirmed)="deleteRoom()"
-      (cancelled)="showDeleteConfirm.set(false)"
-    >
-      <p>Are you sure you want to delete this room? This action cannot be undone.</p>
-    </app-confirm-dialog>
-  }
-} @else {
-  <div class="h-full flex items-center justify-center text-muted-foreground">
-    <p>You don't have admin permissions</p>
-  </div>
-}

src/app/features/admin/admin-panel/admin-panel.component.ts

@@ -1,231 +0,0 @@
-import {
-  Component,
-  inject,
-  signal
-} from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { Store } from '@ngrx/store';
-import { NgIcon, provideIcons } from '@ng-icons/core';
-import {
-  lucideShield,
-  lucideBan,
-  lucideUserX,
-  lucideSettings,
-  lucideUsers,
-  lucideTrash2,
-  lucideCheck,
-  lucideX,
-  lucideLock,
-  lucideUnlock
-} from '@ng-icons/lucide';
-
-import { UsersActions } from '../../../store/users/users.actions';
-import { RoomsActions } from '../../../store/rooms/rooms.actions';
-import { selectCurrentRoom } from '../../../store/rooms/rooms.selectors';
-import {
-  selectBannedUsers,
-  selectIsCurrentUserAdmin,
-  selectCurrentUser,
-  selectOnlineUsers
-} from '../../../store/users/users.selectors';
-import { BanEntry, User } from '../../../shared-kernel';
-import { RealtimeSessionFacade } from '../../../core/realtime';
-import { UserAvatarComponent, ConfirmDialogComponent } from '../../../shared';
-
-type AdminTab = 'settings' | 'members' | 'bans' | 'permissions';
-
-@Component({
-  selector: 'app-admin-panel',
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule,
-    NgIcon,
-    UserAvatarComponent,
-    ConfirmDialogComponent
-  ],
-  viewProviders: [
-    provideIcons({
-      lucideShield,
-      lucideBan,
-      lucideUserX,
-      lucideSettings,
-      lucideUsers,
-      lucideTrash2,
-      lucideCheck,
-      lucideX,
-      lucideLock,
-      lucideUnlock
-    })
-  ],
-  templateUrl: './admin-panel.component.html'
-})
-/**
- * Admin panel for managing room settings, members, bans, and permissions.
- * Only accessible to users with admin privileges.
- */
-export class AdminPanelComponent {
-  store = inject(Store);
-
-  currentRoom = this.store.selectSignal(selectCurrentRoom);
-  currentUser = this.store.selectSignal(selectCurrentUser);
-  isAdmin = this.store.selectSignal(selectIsCurrentUserAdmin);
-  bannedUsers = this.store.selectSignal(selectBannedUsers);
-  onlineUsers = this.store.selectSignal(selectOnlineUsers);
-
-  activeTab = signal<AdminTab>('settings');
-  showDeleteConfirm = signal(false);
-
-  // Settings
-  roomName = '';
-  roomDescription = '';
-  isPrivate = signal(false);
-  maxUsers = 0;
-
-  // Permissions
-  allowVoice = true;
-  allowScreenShare = true;
-  allowFileUploads = true;
-  slowModeInterval = '0';
-  adminsManageRooms = false;
-  moderatorsManageRooms = false;
-  adminsManageIcon = false;
-  moderatorsManageIcon = false;
-
-  private webrtc = inject(RealtimeSessionFacade);
-
-  constructor() {
-    // Initialize from current room
-    const room = this.currentRoom();
-
-    if (room) {
-      this.roomName = room.name;
-      this.roomDescription = room.description || '';
-      this.isPrivate.set(room.isPrivate);
-      this.maxUsers = room.maxUsers || 0;
-      const perms = room.permissions || {};
-
-      this.allowVoice = perms.allowVoice !== false;
-      this.allowScreenShare = perms.allowScreenShare !== false;
-      this.allowFileUploads = perms.allowFileUploads !== false;
-      this.slowModeInterval = String(perms.slowModeInterval ?? 0);
-      this.adminsManageRooms = !!perms.adminsManageRooms;
-      this.moderatorsManageRooms = !!perms.moderatorsManageRooms;
-      this.adminsManageIcon = !!perms.adminsManageIcon;
-      this.moderatorsManageIcon = !!perms.moderatorsManageIcon;
-    }
-  }
-
-  /** Toggle the room's private visibility setting. */
-  togglePrivate(): void {
-    this.isPrivate.update((current) => !current);
-  }
-
-  /** Save the current room name, description, privacy, and max-user settings. */
-  saveSettings(): void {
-    const room = this.currentRoom();
-
-    if (!room)
-      return;
-
-    this.store.dispatch(
-      RoomsActions.updateRoomSettings({
-        roomId: room.id,
-        settings: {
-          name: this.roomName,
-          description: this.roomDescription,
-          isPrivate: this.isPrivate(),
-          maxUsers: this.maxUsers
-        }
-      })
-    );
-  }
-
-  /** Persist updated room permissions (voice, screen-share, uploads, slow-mode, role grants). */
-  savePermissions(): void {
-    const room = this.currentRoom();
-
-    if (!room)
-      return;
-
-    this.store.dispatch(
-      RoomsActions.updateRoomPermissions({
-        roomId: room.id,
-        permissions: {
-          allowVoice: this.allowVoice,
-          allowScreenShare: this.allowScreenShare,
-          allowFileUploads: this.allowFileUploads,
-          slowModeInterval: parseInt(this.slowModeInterval, 10),
-          adminsManageRooms: this.adminsManageRooms,
-          moderatorsManageRooms: this.moderatorsManageRooms,
-          adminsManageIcon: this.adminsManageIcon,
-          moderatorsManageIcon: this.moderatorsManageIcon
-        }
-      })
-    );
-  }
-
-  /** Remove a user's ban entry. */
-  unbanUser(ban: BanEntry): void {
-    this.store.dispatch(UsersActions.unbanUser({ roomId: ban.roomId,
-      oderId: ban.oderId }));
-  }
-
-  /** Show the delete-room confirmation dialog. */
-  confirmDeleteRoom(): void {
-    this.showDeleteConfirm.set(true);
-  }
-
-  /** Delete the current room after confirmation. */
-  deleteRoom(): void {
-    const room = this.currentRoom();
-
-    if (!room)
-      return;
-
-    this.store.dispatch(RoomsActions.deleteRoom({ roomId: room.id }));
-    this.showDeleteConfirm.set(false);
-  }
-
-  /** Format a ban expiry timestamp into a human-readable date/time string. */
-  formatExpiry(timestamp: number): string {
-    const date = new Date(timestamp);
-
-    return date.toLocaleDateString() + ' ' + date.toLocaleTimeString([], { hour: '2-digit',
-      minute: '2-digit' });
-  }
-
-  // Members tab: get all users except self
-  /** Return online users excluding the current user (for the members list). */
-  membersFiltered(): User[] {
-    const me = this.currentUser();
-
-    return this.onlineUsers().filter(user => user.id !== me?.id && user.oderId !== me?.oderId);
-  }
-
-  /** Change a member's role and notify connected peers. */
-  changeRole(user: User, role: 'admin' | 'moderator' | 'member'): void {
-    const roomId = this.currentRoom()?.id;
-
-    this.store.dispatch(UsersActions.updateUserRole({ userId: user.id,
-      role }));
-
-    this.webrtc.broadcastMessage({
-      type: 'role-change',
-      roomId,
-      targetUserId: user.id,
-      role
-    });
-  }
-
-  /** Kick a member from the server. */
-  kickMember(user: User): void {
-    this.store.dispatch(UsersActions.kickUser({ userId: user.id }));
-  }
-
-  /** Ban a member from the server. */
-  banMember(user: User): void {
-    this.store.dispatch(UsersActions.banUser({ userId: user.id }));
-  }
-}

src/app/features/room/chat-room/chat-room.component.html

@@ -1,54 +0,0 @@
-<div class="h-full flex flex-col bg-background">
-  @if (currentRoom()) {
-    <!-- Channel header bar -->
-    @if (!isVoiceWorkspaceExpanded()) {
-      <div class="h-12 flex items-center gap-2 px-4 border-b border-border bg-card flex-shrink-0">
-        <ng-icon
-          [name]="isVoiceWorkspaceExpanded() ? 'lucideMonitor' : 'lucideHash'"
-          class="w-4 h-4 text-muted-foreground"
-        />
-        <span class="font-medium text-foreground text-sm">{{ headerTitle() }}</span>
-
-        @if (isVoiceWorkspaceExpanded()) {
-          <span class="rounded-full bg-primary/10 px-2 py-0.5 text-[10px] font-semibold uppercase tracking-[0.2em] text-primary">
-            Voice streams
-          </span>
-        }
-
-        <div class="flex-1"></div>
-      </div>
-    }
-
-    <!-- Main Content -->
-    <div class="flex-1 flex overflow-hidden">
-      <!-- Chat Area -->
-      <main class="relative flex-1 min-w-0">
-        <div
-          class="h-full overflow-hidden"
-          [class.hidden]="isVoiceWorkspaceExpanded()"
-        >
-          <app-chat-messages />
-        </div>
-
-        <app-screen-share-workspace />
-      </main>
-
-      <!-- Sidebar always visible -->
-      <aside class="w-80 flex-shrink-0 border-l border-border">
-        <app-rooms-side-panel class="h-full" />
-      </aside>
-    </div>
-  } @else {
-    <!-- No Room Selected -->
-    <div class="flex-1 flex items-center justify-center">
-      <div class="text-center text-muted-foreground">
-        <ng-icon
-          name="lucideHash"
-          class="w-16 h-16 mx-auto mb-4 opacity-30"
-        />
-        <h2 class="text-xl font-medium mb-2">No room selected</h2>
-        <p class="text-sm">Select or create a room to start chatting</p>
-      </div>
-    </div>
-  }
-</div>

src/app/features/servers/servers-rail.component.html

@@ -1,115 +0,0 @@
-<nav class="h-full w-16 flex flex-col items-center gap-3 py-3 border-r border-border bg-card relative">
-  <!-- Create button -->
-  <button
-    type="button"
-    class="w-10 h-10 rounded-2xl flex items-center justify-center bg-primary text-primary-foreground hover:bg-primary/90 transition-colors"
-    title="Create Server"
-    (click)="createServer()"
-  >
-    <ng-icon
-      name="lucidePlus"
-      class="w-5 h-5"
-    />
-  </button>
-
-  <!-- Saved servers icons -->
-  <div class="flex-1 w-full overflow-y-auto flex flex-col items-center gap-2 mt-2">
-    @for (room of visibleSavedRooms(); track room.id) {
-      <button
-        type="button"
-        class="w-10 h-10 flex-shrink-0 rounded-2xl overflow-hidden border border-border hover:border-primary/60 hover:shadow-sm transition-all"
-        [title]="room.name"
-        (click)="joinSavedRoom(room)"
-        (contextmenu)="openContextMenu($event, room)"
-      >
-        @if (room.icon) {
-          <img
-            [ngSrc]="room.icon"
-            [alt]="room.name"
-            class="w-full h-full object-cover"
-          />
-        } @else {
-          <div class="w-full h-full flex items-center justify-center bg-secondary">
-            <span class="text-sm font-semibold text-muted-foreground">{{ initial(room.name) }}</span>
-          </div>
-        }
-      </button>
-    }
-  </div>
-</nav>
-
-<!-- Context menu -->
-@if (showMenu()) {
-  <app-context-menu
-    [x]="menuX()"
-    [y]="menuY()"
-    (closed)="closeMenu()"
-    [width]="'w-44'"
-  >
-    <button
-      type="button"
-      (click)="openLeaveConfirm()"
-      class="context-menu-item"
-    >
-      Leave Server
-    </button>
-  </app-context-menu>
-}
-
-@if (showBannedDialog()) {
-  <app-confirm-dialog
-    title="Banned"
-    confirmLabel="OK"
-    cancelLabel="Close"
-    variant="danger"
-    [widthClass]="'w-96 max-w-[90vw]'"
-    (confirmed)="closeBannedDialog()"
-    (cancelled)="closeBannedDialog()"
-  >
-    <p>You are banned from {{ bannedServerName() || 'this server' }}.</p>
-  </app-confirm-dialog>
-}
-
-@if (showPasswordDialog() && passwordPromptRoom()) {
-  <app-confirm-dialog
-    title="Password required"
-    confirmLabel="Join server"
-    cancelLabel="Cancel"
-    [widthClass]="'w-[420px] max-w-[92vw]'"
-    (confirmed)="confirmPasswordJoin()"
-    (cancelled)="closePasswordDialog()"
-  >
-    <div class="space-y-3 text-left">
-      <p>Enter the password to rejoin {{ passwordPromptRoom()!.name }}.</p>
-
-      <div>
-        <label
-          for="rail-join-password"
-          class="mb-1 block text-xs font-medium uppercase tracking-wide text-muted-foreground"
-        >
-          Server password
-        </label>
-        <input
-          id="rail-join-password"
-          type="password"
-          [(ngModel)]="joinPassword"
-          placeholder="Enter password"
-          class="w-full rounded-lg border border-border bg-secondary px-3 py-2 text-foreground placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-primary"
-        />
-      </div>
-
-      @if (joinPasswordError()) {
-        <p class="text-sm text-destructive">{{ joinPasswordError() }}</p>
-      }
-    </div>
-  </app-confirm-dialog>
-}
-
-@if (showLeaveConfirm() && contextRoom()) {
-  <app-leave-server-dialog
-    [room]="contextRoom()!"
-    [currentUser]="currentUser() ?? null"
-    (confirmed)="confirmLeave($event)"
-    (cancelled)="cancelLeave()"
-  />
-}

src/app/features/settings/settings-modal/general-settings/general-settings.component.html

@@ -1,47 +0,0 @@
-<div class="space-y-6 max-w-xl">
-  <section>
-    <div class="flex items-center gap-2 mb-3">
-      <ng-icon
-        name="lucidePower"
-        class="w-5 h-5 text-muted-foreground"
-      />
-      <h4 class="text-sm font-semibold text-foreground">Application</h4>
-    </div>
-
-    <div
-      class="rounded-lg border border-border bg-secondary/20 p-4 transition-opacity"
-      [class.opacity-60]="!isElectron"
-    >
-      <div class="flex items-center justify-between gap-4">
-        <div>
-          <p class="text-sm font-medium text-foreground">Launch on system startup</p>
-
-          @if (isElectron) {
-            <p class="text-xs text-muted-foreground">Automatically start MetoYou when you sign in</p>
-          } @else {
-            <p class="text-xs text-muted-foreground">This setting is only available in the desktop app.</p>
-          }
-        </div>
-
-        <label
-          class="relative inline-flex items-center"
-          [class.cursor-pointer]="isElectron && !savingAutoStart()"
-          [class.cursor-not-allowed]="!isElectron || savingAutoStart()"
-        >
-          <input
-            type="checkbox"
-            [checked]="autoStart()"
-            [disabled]="!isElectron || savingAutoStart()"
-            (change)="onAutoStartChange($event)"
-            id="general-auto-start-toggle"
-            aria-label="Toggle launch on startup"
-            class="sr-only peer"
-          />
-          <div
-            class="w-10 h-5 bg-secondary rounded-full peer peer-checked:bg-primary peer-disabled:bg-muted/80 peer-disabled:after:bg-muted-foreground/40 peer-checked:after:translate-x-full after:content-[''] after:absolute after:top-0.5 after:left-[2px] after:bg-white after:rounded-full after:h-4 after:w-4 after:transition-all"
-          ></div>
-        </label>
-      </div>
-    </div>
-  </section>
-</div>

src/app/features/settings/settings-modal/members-settings/members-settings.component.html

@@ -1,74 +0,0 @@
-@if (server()) {
-  <div class="space-y-3 max-w-xl">
-    @if (members().length === 0) {
-      <p class="text-sm text-muted-foreground text-center py-8">No other members found for this server</p>
-    } @else {
-      @for (member of members(); track member.oderId || member.id) {
-        <div class="flex items-center gap-3 p-3 bg-secondary/50 rounded-lg">
-          <app-user-avatar
-            [name]="member.displayName || '?'"
-            size="sm"
-          />
-          <div class="flex-1 min-w-0">
-            <div class="flex items-center gap-1.5">
-              <p class="text-sm font-medium text-foreground truncate">
-                {{ member.displayName }}
-              </p>
-              @if (member.isOnline) {
-                <span class="text-[10px] bg-emerald-500/20 text-emerald-400 px-1 py-0.5 rounded">Online</span>
-              }
-              @if (member.role === 'host') {
-                <span class="text-[10px] bg-yellow-500/20 text-yellow-400 px-1 py-0.5 rounded">Owner</span>
-              } @else if (member.role === 'admin') {
-                <span class="text-[10px] bg-blue-500/20 text-blue-400 px-1 py-0.5 rounded">Admin</span>
-              } @else if (member.role === 'moderator') {
-                <span class="text-[10px] bg-green-500/20 text-green-400 px-1 py-0.5 rounded">Mod</span>
-              }
-            </div>
-          </div>
-          @if (member.role !== 'host' && isAdmin()) {
-            <div class="flex items-center gap-1">
-              @if (canChangeRoles()) {
-                <select
-                  [ngModel]="member.role"
-                  (ngModelChange)="changeRole(member, $event)"
-                  class="text-xs px-2 py-1 bg-secondary rounded border border-border text-foreground focus:outline-none focus:ring-1 focus:ring-primary"
-                >
-                  <option value="member">Member</option>
-                  <option value="moderator">Moderator</option>
-                  <option value="admin">Admin</option>
-                </select>
-              }
-              @if (canKickMembers()) {
-                <button
-                  (click)="kickMember(member)"
-                  class="p-1 rounded hover:bg-destructive/20 text-muted-foreground hover:text-destructive transition-colors"
-                  title="Kick"
-                >
-                  <ng-icon
-                    name="lucideUserX"
-                    class="w-4 h-4"
-                  />
-                </button>
-              }
-              @if (canBanMembers()) {
-                <button
-                  (click)="banMember(member)"
-                  class="p-1 rounded hover:bg-destructive/20 text-muted-foreground hover:text-destructive transition-colors"
-                  title="Ban"
-                >
-                  <ng-icon
-                    name="lucideBan"
-                    class="w-4 h-4"
-                  />
-                </button>
-              }
-            </div>
-          }
-        </div>
-      }
-    }
-  </div>
-} @else {
-  <div class="flex items-center justify-center h-40 text-muted-foreground text-sm">Select a server from the sidebar to manage</div>
-}

src/app/features/settings/settings-modal/permissions-settings/permissions-settings.component.html

@@ -1,129 +0,0 @@
-@if (server()) {
-  <div class="space-y-4 max-w-xl">
-    @if (!isAdmin()) {
-      <p class="text-xs text-muted-foreground mb-1">You are viewing this server's permissions. Only the server owner can make changes.</p>
-    }
-    <div class="space-y-2.5">
-      <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-        <div>
-          <p class="text-sm font-medium text-foreground">Allow Voice Chat</p>
-          <p class="text-xs text-muted-foreground">Users can join voice channels</p>
-        </div>
-        <input
-          type="checkbox"
-          [(ngModel)]="allowVoice"
-          [disabled]="!isAdmin()"
-          class="w-4 h-4 accent-primary"
-        />
-      </div>
-      <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-        <div>
-          <p class="text-sm font-medium text-foreground">Allow Screen Share</p>
-          <p class="text-xs text-muted-foreground">Users can share their screen</p>
-        </div>
-        <input
-          type="checkbox"
-          [(ngModel)]="allowScreenShare"
-          [disabled]="!isAdmin()"
-          class="w-4 h-4 accent-primary"
-        />
-      </div>
-      <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-        <div>
-          <p class="text-sm font-medium text-foreground">Allow File Uploads</p>
-          <p class="text-xs text-muted-foreground">Users can upload files</p>
-        </div>
-        <input
-          type="checkbox"
-          [(ngModel)]="allowFileUploads"
-          [disabled]="!isAdmin()"
-          class="w-4 h-4 accent-primary"
-        />
-      </div>
-      <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-        <div>
-          <p class="text-sm font-medium text-foreground">Slow Mode</p>
-          <p class="text-xs text-muted-foreground">Limit message frequency</p>
-        </div>
-        <select
-          [(ngModel)]="slowModeInterval"
-          [disabled]="!isAdmin()"
-          class="px-3 py-1 bg-secondary rounded border border-border text-foreground text-sm focus:outline-none focus:ring-2 focus:ring-primary"
-        >
-          <option value="0">Off</option>
-          <option value="5">5 seconds</option>
-          <option value="10">10 seconds</option>
-          <option value="30">30 seconds</option>
-          <option value="60">1 minute</option>
-        </select>
-      </div>
-
-      <!-- Management permissions -->
-      <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-        <div>
-          <p class="text-sm font-medium text-foreground">Admins Can Manage Rooms</p>
-          <p class="text-xs text-muted-foreground">Allow admins to create/modify rooms</p>
-        </div>
-        <input
-          type="checkbox"
-          [(ngModel)]="adminsManageRooms"
-          [disabled]="!isAdmin()"
-          class="w-4 h-4 accent-primary"
-        />
-      </div>
-      <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-        <div>
-          <p class="text-sm font-medium text-foreground">Moderators Can Manage Rooms</p>
-          <p class="text-xs text-muted-foreground">Allow moderators to create/modify rooms</p>
-        </div>
-        <input
-          type="checkbox"
-          [(ngModel)]="moderatorsManageRooms"
-          [disabled]="!isAdmin()"
-          class="w-4 h-4 accent-primary"
-        />
-      </div>
-      <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-        <div>
-          <p class="text-sm font-medium text-foreground">Admins Can Change Server Icon</p>
-          <p class="text-xs text-muted-foreground">Grant icon management to admins</p>
-        </div>
-        <input
-          type="checkbox"
-          [(ngModel)]="adminsManageIcon"
-          [disabled]="!isAdmin()"
-          class="w-4 h-4 accent-primary"
-        />
-      </div>
-      <div class="flex items-center justify-between p-3 bg-secondary/50 rounded-lg">
-        <div>
-          <p class="text-sm font-medium text-foreground">Moderators Can Change Server Icon</p>
-          <p class="text-xs text-muted-foreground">Grant icon management to moderators</p>
-        </div>
-        <input
-          type="checkbox"
-          [(ngModel)]="moderatorsManageIcon"
-          [disabled]="!isAdmin()"
-          class="w-4 h-4 accent-primary"
-        />
-      </div>
-    </div>
-
-    @if (isAdmin()) {
-      <button
-        (click)="savePermissions()"
-        class="w-full px-4 py-2 bg-primary text-primary-foreground rounded-lg hover:bg-primary/90 transition-colors flex items-center justify-center gap-2 text-sm"
-        [class.bg-green-600]="saveSuccess() === 'permissions'"
-        [class.hover:bg-green-600]="saveSuccess() === 'permissions'"
-      >
-        <ng-icon
-          name="lucideCheck"
-          class="w-4 h-4"
-        />
-        {{ saveSuccess() === 'permissions' ? 'Saved!' : 'Save Permissions' }}
-      </button>
-    }
-  </div>
-} @else {
-  <div class="flex items-center justify-center h-40 text-muted-foreground text-sm">Select a server from the sidebar to manage</div>
-}

src/app/features/settings/settings-modal/permissions-settings/permissions-settings.component.ts

@@ -1,99 +0,0 @@
-/* eslint-disable @typescript-eslint/member-ordering */
-import {
-  Component,
-  inject,
-  input,
-  signal
-} from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { NgIcon, provideIcons } from '@ng-icons/core';
-import { Store } from '@ngrx/store';
-import { lucideCheck } from '@ng-icons/lucide';
-
-import { Room } from '../../../../shared-kernel';
-import { RoomsActions } from '../../../../store/rooms/rooms.actions';
-
-@Component({
-  selector: 'app-permissions-settings',
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule,
-    NgIcon
-  ],
-  viewProviders: [
-    provideIcons({
-      lucideCheck
-    })
-  ],
-  templateUrl: './permissions-settings.component.html'
-})
-export class PermissionsSettingsComponent {
-  private store = inject(Store);
-
-  /** The currently selected server, passed from the parent. */
-  server = input<Room | null>(null);
-  /** Whether the current user is admin of this server. */
-  isAdmin = input(false);
-
-  allowVoice = true;
-  allowScreenShare = true;
-  allowFileUploads = true;
-  slowModeInterval = '0';
-  adminsManageRooms = false;
-  moderatorsManageRooms = false;
-  adminsManageIcon = false;
-  moderatorsManageIcon = false;
-
-  saveSuccess = signal<string | null>(null);
-  private saveTimeout: ReturnType<typeof setTimeout> | null = null;
-
-  /** Load permissions from the server input. Called by parent via effect or on init. */
-  loadPermissions(room: Room): void {
-    const perms = room.permissions || {};
-
-    this.allowVoice = perms.allowVoice !== false;
-    this.allowScreenShare = perms.allowScreenShare !== false;
-    this.allowFileUploads = perms.allowFileUploads !== false;
-    this.slowModeInterval = String(perms.slowModeInterval ?? 0);
-    this.adminsManageRooms = !!perms.adminsManageRooms;
-    this.moderatorsManageRooms = !!perms.moderatorsManageRooms;
-    this.adminsManageIcon = !!perms.adminsManageIcon;
-    this.moderatorsManageIcon = !!perms.moderatorsManageIcon;
-  }
-
-  savePermissions(): void {
-    const room = this.server();
-
-    if (!room)
-      return;
-
-    this.store.dispatch(
-      RoomsActions.updateRoomPermissions({
-        roomId: room.id,
-        permissions: {
-          allowVoice: this.allowVoice,
-          allowScreenShare: this.allowScreenShare,
-          allowFileUploads: this.allowFileUploads,
-          slowModeInterval: parseInt(this.slowModeInterval, 10),
-          adminsManageRooms: this.adminsManageRooms,
-          moderatorsManageRooms: this.moderatorsManageRooms,
-          adminsManageIcon: this.adminsManageIcon,
-          moderatorsManageIcon: this.moderatorsManageIcon
-        }
-      })
-    );
-
-    this.showSaveSuccess('permissions');
-  }
-
-  private showSaveSuccess(key: string): void {
-    this.saveSuccess.set(key);
-
-    if (this.saveTimeout)
-      clearTimeout(this.saveTimeout);
-
-    this.saveTimeout = setTimeout(() => this.saveSuccess.set(null), 2000);
-  }
-}

src/app/features/settings/settings-modal/settings-modal.component.html

@@ -1,271 +0,0 @@
-<!-- eslint-disable @angular-eslint/template/cyclomatic-complexity -->
-@if (isOpen()) {
-  <!-- Backdrop -->
-  <div
-    class="fixed inset-0 z-[90] bg-black/80 backdrop-blur-sm transition-opacity duration-200"
-    [class.opacity-100]="animating()"
-    [class.opacity-0]="!animating()"
-    (click)="onBackdropClick()"
-    (keydown.enter)="onBackdropClick()"
-    (keydown.space)="onBackdropClick()"
-    role="button"
-    tabindex="0"
-    aria-label="Close settings"
-  ></div>
-
-  <!-- Modal -->
-  <div class="fixed inset-0 z-[91] flex items-center justify-center p-4 pointer-events-none">
-    <div
-      class="pointer-events-auto relative bg-card border border-border rounded-xl shadow-2xl w-full max-w-4xl h-[min(680px,85vh)] flex overflow-hidden transition-all duration-200"
-      [class.scale-100]="animating()"
-      [class.opacity-100]="animating()"
-      [class.scale-95]="!animating()"
-      [class.opacity-0]="!animating()"
-      (click)="$event.stopPropagation()"
-      (keydown.enter)="$event.stopPropagation()"
-      (keydown.space)="$event.stopPropagation()"
-      role="dialog"
-      aria-modal="true"
-      tabindex="-1"
-    >
-      <!-- Side Navigation -->
-      <nav class="w-52 flex-shrink-0 bg-secondary/40 border-r border-border flex flex-col">
-        <div class="p-4 border-b border-border">
-          <h2 class="text-lg font-semibold text-foreground">Settings</h2>
-        </div>
-
-        <div class="flex-1 overflow-y-auto py-2">
-          <!-- Global section -->
-          <p class="px-4 py-1.5 text-[11px] font-semibold text-muted-foreground/70 uppercase tracking-wider">General</p>
-          @for (page of globalPages; track page.id) {
-            <button
-              (click)="navigate(page.id)"
-              type="button"
-              class="w-full flex items-center gap-2.5 px-4 py-2 text-sm transition-colors"
-              [class.bg-primary/10]="activePage() === page.id"
-              [class.text-primary]="activePage() === page.id"
-              [class.font-medium]="activePage() === page.id"
-              [class.text-foreground]="activePage() !== page.id"
-              [class.hover:bg-secondary]="activePage() !== page.id"
-            >
-              <ng-icon
-                [name]="page.icon"
-                class="w-4 h-4"
-              />
-              {{ page.label }}
-            </button>
-          }
-
-          <!-- Server section -->
-          @if (manageableRooms().length > 0) {
-            <div class="mt-3 pt-3 border-t border-border">
-              <p class="px-4 py-1.5 text-[11px] font-semibold text-muted-foreground/70 uppercase tracking-wider">Server</p>
-
-              <!-- Server selector -->
-              <div class="px-3 pb-2">
-                <select
-                  class="w-full px-2 py-1.5 bg-secondary rounded-lg border border-border text-foreground text-xs focus:outline-none focus:ring-1 focus:ring-primary"
-                  [value]="selectedServerId() || ''"
-                  (change)="onServerSelect($event)"
-                >
-                  <option value="">Select a server…</option>
-                  @for (room of manageableRooms(); track room.id) {
-                    <option [value]="room.id">{{ room.name }}</option>
-                  }
-                </select>
-              </div>
-
-              @if (selectedServerId() && canAccessSelectedServer()) {
-                @for (page of serverPages; track page.id) {
-                  <button
-                    (click)="navigate(page.id)"
-                    type="button"
-                    class="w-full flex items-center gap-2.5 px-4 py-2 text-sm transition-colors"
-                    [class.bg-primary/10]="activePage() === page.id"
-                    [class.text-primary]="activePage() === page.id"
-                    [class.font-medium]="activePage() === page.id"
-                    [class.text-foreground]="activePage() !== page.id"
-                    [class.hover:bg-secondary]="activePage() !== page.id"
-                  >
-                    <ng-icon
-                      [name]="page.icon"
-                      class="w-4 h-4"
-                    />
-                    {{ page.label }}
-                  </button>
-                }
-              }
-            </div>
-          }
-        </div>
-
-        <div class="mt-auto border-t border-border px-4 py-3">
-          <button
-            type="button"
-            (click)="openThirdPartyLicenses()"
-            class="text-left text-xs text-muted-foreground transition-colors hover:text-foreground hover:underline underline-offset-4"
-          >
-            Third-party licenses
-          </button>
-        </div>
-      </nav>
-
-      <!-- Content -->
-      <div class="flex-1 flex flex-col min-w-0">
-        <!-- Header -->
-        <div class="flex items-center justify-between px-6 py-4 border-b border-border flex-shrink-0">
-          <h3 class="text-lg font-semibold text-foreground">
-            @switch (activePage()) {
-              @case ('general') {
-                General
-              }
-              @case ('network') {
-                Network
-              }
-              @case ('voice') {
-                Voice & Audio
-              }
-              @case ('updates') {
-                Updates
-              }
-              @case ('debugging') {
-                Debugging
-              }
-              @case ('server') {
-                Server Settings
-              }
-              @case ('members') {
-                Members
-              }
-              @case ('bans') {
-                Bans
-              }
-              @case ('permissions') {
-                Permissions
-              }
-            }
-          </h3>
-          <button
-            (click)="close()"
-            type="button"
-            class="p-2 hover:bg-secondary rounded-lg transition-colors text-muted-foreground hover:text-foreground"
-          >
-            <ng-icon
-              name="lucideX"
-              class="w-5 h-5"
-            />
-          </button>
-        </div>
-
-        <!-- Scrollable Content Area -->
-        <div class="flex-1 overflow-y-auto p-6">
-          @switch (activePage()) {
-            @case ('general') {
-              <app-general-settings />
-            }
-            @case ('network') {
-              <app-network-settings />
-            }
-            @case ('voice') {
-              <app-voice-settings />
-            }
-            @case ('updates') {
-              <app-updates-settings />
-            }
-            @case ('debugging') {
-              <app-debugging-settings />
-            }
-            @case ('server') {
-              <app-server-settings
-                [server]="selectedServer()"
-                [isAdmin]="isSelectedServerOwner()"
-              />
-            }
-            @case ('members') {
-              <app-members-settings
-                [server]="selectedServer()"
-                [isAdmin]="canManageSelectedMembers()"
-                [accessRole]="selectedServerRole()"
-              />
-            }
-            @case ('bans') {
-              <app-bans-settings
-                [server]="selectedServer()"
-                [isAdmin]="canManageSelectedBans()"
-              />
-            }
-            @case ('permissions') {
-              <app-permissions-settings
-                #permissionsComp
-                [server]="selectedServer()"
-                [isAdmin]="isSelectedServerOwner()"
-              />
-            }
-          }
-        </div>
-      </div>
-
-      @if (showThirdPartyLicenses()) {
-        <div
-          class="absolute inset-0 z-10 bg-background/70 backdrop-blur-sm"
-          (click)="closeThirdPartyLicenses()"
-          (keydown.enter)="closeThirdPartyLicenses()"
-          (keydown.space)="closeThirdPartyLicenses()"
-          role="button"
-          tabindex="0"
-          aria-label="Close third-party licenses"
-        ></div>
-
-        <div class="pointer-events-none absolute inset-0 z-[11] flex items-center justify-center p-4 sm:p-6">
-          <div class="pointer-events-auto w-full max-w-2xl max-h-full overflow-hidden rounded-xl border border-border bg-card shadow-2xl">
-            <div class="flex items-start justify-between gap-4 border-b border-border px-5 py-4">
-              <div>
-                <h4 class="text-base font-semibold text-foreground">Third-party licenses</h4>
-                <p class="mt-1 text-sm text-muted-foreground">License notices for bundled third-party libraries used by the app.</p>
-              </div>
-
-              <button
-                type="button"
-                (click)="closeThirdPartyLicenses()"
-                class="p-2 hover:bg-secondary rounded-lg transition-colors text-muted-foreground hover:text-foreground"
-                aria-label="Close third-party licenses"
-              >
-                <ng-icon
-                  name="lucideX"
-                  class="w-5 h-5"
-                />
-              </button>
-            </div>
-
-            <div class="max-h-[min(70vh,42rem)] overflow-y-auto px-5 py-4 space-y-4">
-              @for (license of thirdPartyLicenses; track license.id) {
-                <section class="rounded-lg border border-border bg-secondary/20 p-4">
-                  <div class="flex items-start justify-between gap-4">
-                    <div>
-                      <h5 class="text-sm font-semibold text-foreground">{{ license.name }}</h5>
-                      <p class="text-xs text-muted-foreground">{{ license.licenseName }}</p>
-                    </div>
-
-                    <a
-                      [href]="license.sourceUrl"
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      class="text-xs font-medium text-primary hover:underline underline-offset-4"
-                    >
-                      Source
-                    </a>
-                  </div>
-
-                  <pre
-                    class="mt-4 whitespace-pre-wrap break-words rounded-md bg-background/80 px-3 py-2 text-[11px] leading-5 text-muted-foreground"
-                    >{{ license.text }}</pre
-                  >
-                </section>
-              }
-            </div>
-          </div>
-        </div>
-      }
-    </div>
-  </div>
-}

src/app/features/settings/settings-modal/third-party-licenses.ts

@@ -1,44 +0,0 @@
-export interface ThirdPartyLicense {
-  id: string;
-  name: string;
-  licenseName: string;
-  sourceUrl: string;
-  text: string;
-}
-
-export const THIRD_PARTY_LICENSES: ThirdPartyLicense[] = [
-  {
-    id: 'wavesurfer-js',
-    name: 'wavesurfer.js',
-    licenseName: 'BSD 3-Clause License',
-    sourceUrl: 'https://github.com/katspaugh/wavesurfer.js/blob/main/LICENSE',
-    text: [
-      'BSD 3-Clause License',
-      '',
-      'Copyright (c) 2012-2023, katspaugh and contributors',
-      'All rights reserved.',
-      '',
-      'Redistribution and use in source and binary forms, with or without modification, are permitted provided',
-      'that the following conditions are met:',
-      '',
-      '* Redistributions of source code must retain the above copyright notice, this list of conditions and',
-      '  the following disclaimer.',
-      '',
-      '* Redistributions in binary form must reproduce the above copyright notice, this list of conditions',
-      '  and the following disclaimer in the documentation and/or other materials provided with the',
-      '  distribution.',
-      '',
-      '* Neither the name of the copyright holder nor the names of its contributors may be used to endorse',
-      '  or promote products derived from this software without specific prior written permission.',
-      '',
-      'THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR',
-      'IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND',
-      'FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR',
-      'CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL',
-      'DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,',
-      'DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER',
-      'IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT',
-      'OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.'
-    ].join('\n')
-  }
-];

src/app/features/shell/title-bar.component.html

@@ -1,171 +0,0 @@
-<div
-  class="fixed top-0 left-16 right-0 h-10 bg-card border-b border-border flex items-center justify-between px-4 z-50 select-none"
-  style="-webkit-app-region: drag"
->
-  <div
-    class="flex items-center gap-2 min-w-0 relative"
-    style="-webkit-app-region: no-drag"
-  >
-    @if (inRoom()) {
-      <ng-icon
-        name="lucideHash"
-        class="w-5 h-5 text-muted-foreground"
-      />
-      <span class="text-sm font-semibold text-foreground truncate">{{ roomName() }}</span>
-
-      @if (showRoomCompatibilityNotice()) {
-        <span class="inline-flex items-center gap-1 rounded bg-destructive/15 px-2 py-0.5 text-xs text-destructive">
-          {{ signalServerCompatibilityError() }}
-        </span>
-      }
-
-      @if (showRoomReconnectNotice()) {
-        <span class="inline-flex items-center gap-1 rounded bg-destructive/15 px-2 py-0.5 text-xs text-destructive">
-          <ng-icon
-            name="lucideRefreshCw"
-            class="h-3.5 w-3.5 animate-spin"
-          />
-          Reconnecting to signal server…
-        </span>
-      }
-
-      @if (roomDescription()) {
-        <span class="hidden md:inline text-sm text-muted-foreground border-l border-border pl-2 truncate">
-          {{ roomDescription() }}
-        </span>
-      }
-    } @else {
-      <div class="flex items-center gap-2 min-w-0">
-        <span class="text-sm text-muted-foreground truncate">{{ username() }} | {{ serverName() }}</span>
-        <span
-          class="text-xs px-2 py-0.5 rounded bg-destructive/15 text-destructive"
-          [class.hidden]="!isReconnecting()"
-          >Reconnecting…</span
-        >
-      </div>
-    }
-  </div>
-  <div
-    class="flex items-center gap-2"
-    style="-webkit-app-region: no-drag"
-  >
-    <button
-      type="button"
-      class="px-3 h-8 grid place-items-center hover:bg-secondary rounded text-sm text-foreground"
-      [class.hidden]="isAuthed()"
-      (click)="goLogin()"
-      title="Login"
-    >
-      Login
-    </button>
-
-    <button
-      type="button"
-      (click)="toggleMenu()"
-      class="ml-2 p-2 hover:bg-secondary rounded"
-      title="Menu"
-    >
-      <ng-icon
-        name="lucideMenu"
-        class="w-5 h-5 text-muted-foreground"
-      />
-    </button>
-    <!-- Anchored dropdown under the menu button -->
-    @if (showMenu()) {
-      <div class="absolute right-0 top-full mt-1 z-50 w-64 rounded-lg border border-border bg-card shadow-lg">
-        @if (inRoom()) {
-          <button
-            type="button"
-            (click)="createInviteLink()"
-            [disabled]="creatingInvite()"
-            class="w-full text-left px-3 py-2 text-sm hover:bg-secondary transition-colors text-foreground disabled:cursor-not-allowed disabled:opacity-60"
-          >
-            @if (creatingInvite()) {
-              Creating Invite Link…
-            } @else {
-              Create Invite Link
-            }
-          </button>
-          <button
-            type="button"
-            (click)="leaveServer()"
-            class="w-full text-left px-3 py-2 text-sm hover:bg-secondary transition-colors text-foreground"
-          >
-            Leave Server
-          </button>
-        }
-        <div
-          class="border-t border-border px-3 py-2 text-xs leading-5 text-muted-foreground"
-          [class.hidden]="!inviteStatus()"
-        >
-          {{ inviteStatus() }}
-        </div>
-        <div class="border-t border-border"></div>
-        <button
-          type="button"
-          (click)="logout()"
-          class="w-full text-left px-3 py-2 text-sm hover:bg-secondary transition-colors text-foreground"
-        >
-          Logout
-        </button>
-      </div>
-    }
-    @if (isElectron()) {
-      <button
-        type="button"
-        class="w-8 h-8 grid place-items-center hover:bg-secondary rounded"
-        title="Minimize"
-        (click)="minimize()"
-      >
-        <ng-icon
-          name="lucideMinus"
-          class="w-4 h-4"
-        />
-      </button>
-      <button
-        type="button"
-        class="w-8 h-8 grid place-items-center hover:bg-secondary rounded"
-        title="Maximize"
-        (click)="maximize()"
-      >
-        <ng-icon
-          name="lucideSquare"
-          class="w-4 h-4"
-        />
-      </button>
-      <button
-        type="button"
-        class="w-8 h-8 grid place-items-center hover:bg-destructive/10 rounded"
-        title="Close"
-        (click)="close()"
-      >
-        <ng-icon
-          name="lucideX"
-          class="w-4 h-4 text-destructive"
-        />
-      </button>
-    }
-  </div>
-</div>
-<!-- Click-away overlay to close dropdown -->
-@if (showMenu()) {
-  <div
-    class="fixed inset-0 z-40"
-    (click)="closeMenu()"
-    (keydown.enter)="closeMenu()"
-    (keydown.space)="closeMenu()"
-    tabindex="0"
-    role="button"
-    aria-label="Close menu overlay"
-    style="-webkit-app-region: no-drag"
-  ></div>
-}
-
-@if (showLeaveConfirm() && currentRoom()) {
-  <app-leave-server-dialog
-    [room]="currentRoom()!"
-    [currentUser]="currentUser() ?? null"
-    (confirmed)="confirmLeave($event)"
-    (cancelled)="cancelLeave()"
-  />
-}

src/app/infrastructure/persistence/index.ts

@@ -1 +0,0 @@
-export * from './database.service';

src/styles.scss

@@ -1,66 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@layer base {
-  :root {
-    --background: 240 10% 3.9%;
-    --foreground: 0 0% 98%;
-    --card: 240 10% 3.9%;
-    --card-foreground: 0 0% 98%;
-    --popover: 240 10% 3.9%;
-    --popover-foreground: 0 0% 98%;
-    --primary: 262.1 83.3% 57.8%;
-    --primary-foreground: 210 20% 98%;
-    --secondary: 240 3.7% 15.9%;
-    --secondary-foreground: 0 0% 98%;
-    --muted: 240 3.7% 15.9%;
-    --muted-foreground: 240 5% 64.9%;
-    --accent: 240 3.7% 15.9%;
-    --accent-foreground: 0 0% 98%;
-    --destructive: 0 62.8% 30.6%;
-    --destructive-foreground: 0 0% 98%;
-    --border: 240 3.7% 15.9%;
-    --input: 240 3.7% 15.9%;
-    --ring: 262.1 83.3% 57.8%;
-    --radius: 0.5rem;
-  }
-
-  * {
-    @apply border-border;
-  }
-
-  body {
-    @apply bg-background text-foreground;
-    font-feature-settings: "rlig" 1, "calt" 1;
-  }
-}
-
-/* Scrollbar styling */
-::-webkit-scrollbar {
-  width: 8px;
-  height: 8px;
-}
-
-::-webkit-scrollbar-track {
-  background: hsl(var(--background));
-}
-
-::-webkit-scrollbar-thumb {
-  background: hsl(var(--muted));
-  border-radius: 4px;
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background: hsl(var(--muted-foreground) / 0.5);
-}
-
-/* Custom utilities */
-.no-scrollbar::-webkit-scrollbar {
-  display: none;
-}
-
-.no-scrollbar {
-  -ms-overflow-style: none;
-  scrollbar-width: none;
-}

toju-app/angular.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "$schema": "../node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
   "cli": {
     "packageManager": "npm",
@@ -62,27 +62,28 @@
             ],
             "styles": [
               "src/styles.scss",
-              "node_modules/prismjs/themes/prism-okaidia.css"
+              "../node_modules/prismjs/themes/prism-okaidia.css"
             ],
             "scripts": [
-              "node_modules/prismjs/prism.js",
-              "node_modules/prismjs/components/prism-markup.min.js",
-              "node_modules/prismjs/components/prism-clike.min.js",
-              "node_modules/prismjs/components/prism-javascript.min.js",
-              "node_modules/prismjs/components/prism-typescript.min.js",
-              "node_modules/prismjs/components/prism-css.min.js",
-              "node_modules/prismjs/components/prism-scss.min.js",
-              "node_modules/prismjs/components/prism-json.min.js",
-              "node_modules/prismjs/components/prism-bash.min.js",
-              "node_modules/prismjs/components/prism-markdown.min.js",
-              "node_modules/prismjs/components/prism-yaml.min.js",
-              "node_modules/prismjs/components/prism-python.min.js",
-              "node_modules/prismjs/components/prism-csharp.min.js"
+              "../node_modules/prismjs/prism.js",
+              "../node_modules/prismjs/components/prism-markup.min.js",
+              "../node_modules/prismjs/components/prism-clike.min.js",
+              "../node_modules/prismjs/components/prism-javascript.min.js",
+              "../node_modules/prismjs/components/prism-typescript.min.js",
+              "../node_modules/prismjs/components/prism-css.min.js",
+              "../node_modules/prismjs/components/prism-scss.min.js",
+              "../node_modules/prismjs/components/prism-json.min.js",
+              "../node_modules/prismjs/components/prism-bash.min.js",
+              "../node_modules/prismjs/components/prism-markdown.min.js",
+              "../node_modules/prismjs/components/prism-yaml.min.js",
+              "../node_modules/prismjs/components/prism-python.min.js",
+              "../node_modules/prismjs/components/prism-csharp.min.js"
             ],
             "allowedCommonJsDependencies": [
               "simple-peer",
               "uuid"
-            ]
+            ],
+            "outputPath": "../dist/client"
           },
           "configurations": {
             "production": {
@@ -95,8 +96,8 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "1MB",
-                  "maximumError": "2MB"
+                  "maximumWarning": "2.2MB",
+                  "maximumError": "2.3MB"
                 },
                 {
                   "type": "anyComponentStyle",

toju-app/src/app/app.config.ts

@@ -13,6 +13,7 @@ import { routes } from './app.routes';
 import { messagesReducer } from './store/messages/messages.reducer';
 import { usersReducer } from './store/users/users.reducer';
 import { roomsReducer } from './store/rooms/rooms.reducer';
+import { NotificationsEffects } from './domains/notifications';
 import { MessagesEffects } from './store/messages/messages.effects';
 import { MessagesSyncEffects } from './store/messages/messages-sync.effects';
 import { UsersEffects } from './store/users/users.effects';
@@ -32,6 +33,7 @@ export const appConfig: ApplicationConfig = {
       rooms: roomsReducer
     }),
     provideEffects([
+      NotificationsEffects,
       MessagesEffects,
       MessagesSyncEffects,
       UsersEffects,

toju-app/src/app/app.html

@@ -0,0 +1,155 @@
+<div
+  appThemeNode="appRoot"
+  class="workspace-bright-theme relative h-screen overflow-hidden bg-background text-foreground"
+>
+  <div
+    class="grid h-full min-h-0 min-w-0 overflow-hidden"
+    [ngStyle]="appShellLayoutStyles()"
+  >
+    <aside
+      appThemeNode="serversRail"
+      class="min-h-0 overflow-hidden bg-transparent"
+      [class.hidden]="isThemeStudioFullscreen()"
+      [ngStyle]="serversRailLayoutStyles()"
+    >
+      <app-servers-rail class="block h-full" />
+    </aside>
+
+    <main
+      appThemeNode="appWorkspace"
+      class="relative flex min-h-0 min-w-0 flex-col overflow-hidden bg-background"
+      [ngStyle]="appWorkspaceShellStyles()"
+    >
+      <app-title-bar class="block shrink-0" />
+
+      <div class="relative min-h-0 flex-1 overflow-hidden">
+        @if (isThemeStudioFullscreen()) {
+        <div class="theme-studio-fullscreen-shell absolute inset-0 overflow-y-auto overflow-x-hidden bg-background">
+          @if (themeStudioFullscreenComponent()) {
+          <ng-container *ngComponentOutlet="themeStudioFullscreenComponent()" />
+          } @else {
+          <div class="flex h-full items-center justify-center px-6 text-sm text-muted-foreground">Loading Theme Studio…</div>
+          }
+        </div>
+        } @else { @if (showDesktopUpdateNotice()) {
+        <div class="pointer-events-none absolute inset-x-0 top-0 z-20 px-4 pt-4">
+          <div class="pointer-events-auto mx-auto w-full max-w-xl">
+            <div class="relative rounded-xl border border-border/80 bg-card/95 px-4 py-3 shadow-lg backdrop-blur">
+              <button
+                type="button"
+                (click)="dismissDesktopUpdateNotice()"
+                class="absolute right-2 top-2 grid h-8 w-8 place-items-center rounded-lg text-muted-foreground transition-colors hover:bg-secondary hover:text-foreground"
+                aria-label="Dismiss update notice"
+              >
+                <ng-icon
+                  name="lucideX"
+                  class="h-4 w-4"
+                />
+              </button>
+
+              <div class="pr-10">
+                <p class="text-[11px] font-semibold uppercase tracking-[0.18em] text-primary">Update Ready</p>
+                <p class="mt-1 text-sm font-semibold text-foreground">
+                  Restart to install {{ desktopUpdateState().targetVersion || 'the latest update' }}
+                </p>
+              </div>
+
+              <p class="mt-1 pr-10 text-xs leading-5 text-muted-foreground">
+                The update has already been downloaded. Restart the app when you're ready to finish applying it.
+              </p>
+
+              <div class="mt-3 flex flex-wrap gap-2">
+                <button
+                  type="button"
+                  (click)="openUpdatesSettings()"
+                  class="inline-flex items-center rounded-lg border border-border bg-secondary px-3 py-1.5 text-xs font-medium text-foreground transition-colors hover:bg-secondary/80"
+                >
+                  Update settings
+                </button>
+
+                <button
+                  type="button"
+                  (click)="restartToApplyUpdate()"
+                  class="inline-flex items-center rounded-lg bg-primary px-3 py-1.5 text-xs font-semibold text-primary-foreground transition-colors hover:bg-primary/90"
+                >
+                  Restart now
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+        }
+
+        <div class="absolute inset-0 overflow-auto">
+          <router-outlet />
+        </div>
+        }
+      </div>
+    </main>
+  </div>
+
+  @if (isThemeStudioFullscreen()) {
+  <div
+    #themeStudioControlsRef
+    class="pointer-events-none absolute z-[80]"
+    [ngStyle]="themeStudioControlsPositionStyles()"
+  >
+    <div class="pointer-events-auto flex items-center gap-2 rounded-lg border border-border bg-card px-2 py-2 shadow-lg backdrop-blur">
+      <div
+        class="rounded-md border border-border bg-secondary px-3 py-1.5 text-[11px] font-semibold uppercase tracking-[0.18em] text-muted-foreground select-none cursor-grab"
+        [class.cursor-grabbing]="isDraggingThemeStudioControls()"
+        (pointerdown)="startThemeStudioControlsDrag($event, themeStudioControlsRef)"
+      >
+        Theme Studio
+      </div>
+
+      <button
+        type="button"
+        (click)="minimizeThemeStudio()"
+        class="rounded-md border border-border bg-secondary px-3 py-1.5 text-xs font-medium text-foreground transition-colors hover:bg-secondary/80"
+      >
+        Minimize
+      </button>
+
+      <button
+        type="button"
+        (click)="closeThemeStudio()"
+        class="rounded-md border border-border bg-secondary px-3 py-1.5 text-xs font-medium text-foreground transition-colors hover:bg-secondary/80"
+      >
+        Close
+      </button>
+    </div>
+  </div>
+  } @if (isThemeStudioMinimized()) {
+  <div class="pointer-events-none absolute bottom-4 right-4 z-[80]">
+    <div class="pointer-events-auto flex items-center gap-3 rounded-lg border border-border bg-card px-3 py-3 shadow-lg backdrop-blur">
+      <div class="min-w-0">
+        <p class="text-[11px] font-semibold uppercase tracking-[0.18em] text-primary">Theme Studio</p>
+        <p class="mt-1 text-sm font-medium text-foreground">Minimized</p>
+      </div>
+
+      <button
+        type="button"
+        (click)="reopenThemeStudio()"
+        class="rounded-md bg-primary px-3 py-1.5 text-xs font-semibold text-primary-foreground transition-colors hover:bg-primary/90"
+      >
+        Re-open
+      </button>
+
+      <button
+        type="button"
+        (click)="dismissMinimizedThemeStudio()"
+        class="rounded-md border border-border bg-secondary px-3 py-1.5 text-xs font-medium text-foreground transition-colors hover:bg-secondary/80"
+      >
+        Dismiss
+      </button>
+    </div>
+  </div>
+  } @if (!isThemeStudioFullscreen()) {
+  <app-floating-voice-controls />
+  }
+  <app-settings-modal />
+  <app-screen-share-source-picker />
+  <app-debug-console [showLauncher]="false" />
+  <app-theme-picker-overlay />
+</div>

toju-app/src/app/app.ts

@@ -0,0 +1,419 @@
+/* eslint-disable @angular-eslint/component-class-suffix */
+import {
+  Component,
+  OnInit,
+  OnDestroy,
+  computed,
+  effect,
+  inject,
+  HostListener,
+  signal,
+  Type
+} from '@angular/core';
+import {
+  Router,
+  RouterOutlet,
+  NavigationEnd
+} from '@angular/router';
+import { CommonModule } from '@angular/common';
+import { Store } from '@ngrx/store';
+import { NgIcon, provideIcons } from '@ng-icons/core';
+import { lucideX } from '@ng-icons/lucide';
+
+import {
+  DatabaseService,
+  loadGeneralSettingsFromStorage,
+  loadLastViewedChatFromStorage
+} from './infrastructure/persistence';
+import { DesktopAppUpdateService } from './core/services/desktop-app-update.service';
+import { ServerDirectoryFacade } from './domains/server-directory';
+import { NotificationsFacade } from './domains/notifications';
+import { TimeSyncService } from './core/services/time-sync.service';
+import { VoiceSessionFacade } from './domains/voice-session';
+import { ExternalLinkService } from './core/platform';
+import { SettingsModalService } from './core/services/settings-modal.service';
+import { ElectronBridgeService } from './core/platform/electron/electron-bridge.service';
+import { ServersRailComponent } from './features/servers/servers-rail.component';
+import { TitleBarComponent } from './features/shell/title-bar.component';
+import { FloatingVoiceControlsComponent } from './domains/voice-session/feature/floating-voice-controls/floating-voice-controls.component';
+import { SettingsModalComponent } from './features/settings/settings-modal/settings-modal.component';
+import { DebugConsoleComponent } from './shared/components/debug-console/debug-console.component';
+import { ScreenShareSourcePickerComponent } from './shared/components/screen-share-source-picker/screen-share-source-picker.component';
+import { UsersActions } from './store/users/users.actions';
+import { RoomsActions } from './store/rooms/rooms.actions';
+import { selectCurrentRoom } from './store/rooms/rooms.selectors';
+import { ROOM_URL_PATTERN, STORAGE_KEY_CURRENT_USER_ID } from './core/constants';
+import {
+  ThemeNodeDirective,
+  ThemePickerOverlayComponent,
+  ThemeService
+} from './domains/theme';
+
+@Component({
+  selector: 'app-root',
+  imports: [
+    CommonModule,
+    NgIcon,
+    RouterOutlet,
+    ServersRailComponent,
+    TitleBarComponent,
+    FloatingVoiceControlsComponent,
+    SettingsModalComponent,
+    DebugConsoleComponent,
+    ScreenShareSourcePickerComponent,
+    ThemeNodeDirective,
+    ThemePickerOverlayComponent
+  ],
+  viewProviders: [
+    provideIcons({
+      lucideX
+    })
+  ],
+  templateUrl: './app.html',
+  styleUrl: './app.scss'
+})
+export class App implements OnInit, OnDestroy {
+  private static readonly THEME_STUDIO_CONTROLS_MARGIN = 16;
+  private static readonly TITLE_BAR_HEIGHT = 40;
+
+  store = inject(Store);
+  currentRoom = this.store.selectSignal(selectCurrentRoom);
+  desktopUpdates = inject(DesktopAppUpdateService);
+  desktopUpdateState = this.desktopUpdates.state;
+  readonly databaseService = inject(DatabaseService);
+  readonly router = inject(Router);
+  readonly servers = inject(ServerDirectoryFacade);
+  readonly notifications = inject(NotificationsFacade);
+  readonly settingsModal = inject(SettingsModalService);
+  readonly timeSync = inject(TimeSyncService);
+  readonly theme = inject(ThemeService);
+  readonly voiceSession = inject(VoiceSessionFacade);
+  readonly externalLinks = inject(ExternalLinkService);
+  readonly electronBridge = inject(ElectronBridgeService);
+  readonly dismissedDesktopUpdateNoticeKey = signal<string | null>(null);
+  readonly themeStudioFullscreenComponent = signal<Type<unknown> | null>(null);
+  readonly themeStudioControlsPosition = signal<{ x: number; y: number } | null>(null);
+  readonly isDraggingThemeStudioControls = signal(false);
+
+  readonly appShellLayoutStyles = computed(() => this.theme.getLayoutContainerStyles('appShell'));
+  readonly serversRailLayoutStyles = computed(() => this.theme.getLayoutItemStyles('serversRail'));
+  readonly appWorkspaceLayoutStyles = computed(() => this.theme.getLayoutItemStyles('appWorkspace'));
+  readonly isThemeStudioFullscreen = computed(() => {
+    return this.settingsModal.isOpen()
+      && this.settingsModal.activePage() === 'theme'
+      && this.settingsModal.themeStudioFullscreen();
+  });
+  readonly isThemeStudioMinimized = computed(() => {
+    return this.settingsModal.activePage() === 'theme'
+      && this.settingsModal.themeStudioMinimized();
+  });
+  readonly desktopUpdateNoticeKey = computed(() => {
+    const updateState = this.desktopUpdateState();
+
+    return updateState.targetVersion?.trim()
+      || updateState.latestVersion?.trim()
+      || `restart:${updateState.currentVersion}`;
+  });
+  readonly showDesktopUpdateNotice = computed(() => {
+    return this.desktopUpdateState().restartRequired
+      && this.dismissedDesktopUpdateNoticeKey() !== this.desktopUpdateNoticeKey();
+  });
+  readonly appWorkspaceShellStyles = computed(() => {
+    const workspaceStyles = this.appWorkspaceLayoutStyles();
+
+    if (!this.isThemeStudioFullscreen()) {
+      return workspaceStyles;
+    }
+
+    return {
+      ...workspaceStyles,
+      gridColumn: '1 / -1',
+      gridRow: '1 / -1'
+    };
+  });
+  readonly themeStudioControlsPositionStyles = computed(() => {
+    const position = this.themeStudioControlsPosition();
+
+    if (!position) {
+      return {
+        right: `${App.THEME_STUDIO_CONTROLS_MARGIN}px`,
+        bottom: `${App.THEME_STUDIO_CONTROLS_MARGIN}px`
+      };
+    }
+
+    return {
+      left: `${position.x}px`,
+      top: `${position.y}px`
+    };
+  });
+
+  private deepLinkCleanup: (() => void) | null = null;
+  private themeStudioControlsDragOffset: { x: number; y: number } | null = null;
+  private themeStudioControlsBounds: { width: number; height: number } | null = null;
+
+  constructor() {
+    effect(() => {
+      if (!this.isThemeStudioFullscreen() || this.themeStudioFullscreenComponent()) {
+        return;
+      }
+
+      void import('./domains/theme/feature/settings/theme-settings.component')
+        .then((module) => {
+          this.themeStudioFullscreenComponent.set(module.ThemeSettingsComponent);
+        });
+    });
+
+    effect(() => {
+      if (this.isThemeStudioFullscreen()) {
+        return;
+      }
+
+      this.isDraggingThemeStudioControls.set(false);
+      this.themeStudioControlsDragOffset = null;
+      this.themeStudioControlsBounds = null;
+    });
+  }
+
+  @HostListener('document:click', ['$event'])
+  onGlobalLinkClick(evt: MouseEvent): void {
+    this.externalLinks.handleClick(evt);
+  }
+
+  @HostListener('document:keydown', ['$event'])
+  onGlobalKeyDown(evt: KeyboardEvent): void {
+    this.theme.handleGlobalShortcut(evt);
+  }
+
+  @HostListener('document:pointermove', ['$event'])
+  onDocumentPointerMove(event: PointerEvent): void {
+    if (!this.isDraggingThemeStudioControls() || !this.themeStudioControlsDragOffset || !this.themeStudioControlsBounds) {
+      return;
+    }
+
+    this.themeStudioControlsPosition.set(this.clampThemeStudioControlsPosition(
+      event.clientX - this.themeStudioControlsDragOffset.x,
+      event.clientY - this.themeStudioControlsDragOffset.y,
+      this.themeStudioControlsBounds.width,
+      this.themeStudioControlsBounds.height
+    ));
+  }
+
+  @HostListener('document:pointerup')
+  @HostListener('document:pointercancel')
+  onDocumentPointerEnd(): void {
+    if (!this.isDraggingThemeStudioControls()) {
+      return;
+    }
+
+    this.isDraggingThemeStudioControls.set(false);
+    this.themeStudioControlsDragOffset = null;
+    this.themeStudioControlsBounds = null;
+  }
+
+  async ngOnInit(): Promise<void> {
+    this.theme.initialize();
+
+    void this.desktopUpdates.initialize();
+
+    await this.databaseService.initialize();
+
+    try {
+      const apiBase = this.servers.getApiBaseUrl();
+
+      await this.timeSync.syncWithEndpoint(apiBase);
+    } catch {}
+
+    await this.notifications.initialize();
+
+    await this.setupDesktopDeepLinks();
+
+    this.store.dispatch(UsersActions.loadCurrentUser());
+
+    this.store.dispatch(RoomsActions.loadRooms());
+
+    const currentUserId = localStorage.getItem(STORAGE_KEY_CURRENT_USER_ID);
+
+    if (!currentUserId) {
+      if (!this.isPublicRoute(this.router.url)) {
+        this.router.navigate(['/login'], {
+          queryParams: {
+            returnUrl: this.router.url
+          }
+        }).catch(() => {});
+      }
+    } else {
+      const current = this.router.url;
+      const generalSettings = loadGeneralSettingsFromStorage();
+      const lastViewedChat = loadLastViewedChatFromStorage(currentUserId);
+
+      if (
+        generalSettings.reopenLastViewedChat
+        && lastViewedChat
+        && (current === '/' || current === '/search')
+      ) {
+        this.router.navigate(['/room', lastViewedChat.roomId], { replaceUrl: true }).catch(() => {});
+      }
+    }
+
+    this.router.events.subscribe((evt) => {
+      if (evt instanceof NavigationEnd) {
+        const url = evt.urlAfterRedirects || evt.url;
+        const roomMatch = url.match(ROOM_URL_PATTERN);
+        const currentRoomId = roomMatch ? roomMatch[1] : null;
+
+        this.voiceSession.checkCurrentRoute(currentRoomId);
+      }
+    });
+  }
+
+  ngOnDestroy(): void {
+    this.deepLinkCleanup?.();
+    this.deepLinkCleanup = null;
+  }
+
+  openNetworkSettings(): void {
+    this.settingsModal.open('network');
+  }
+
+  openUpdatesSettings(): void {
+    this.settingsModal.open('updates');
+  }
+
+  dismissDesktopUpdateNotice(): void {
+    if (!this.desktopUpdateState().restartRequired) {
+      return;
+    }
+
+    this.dismissedDesktopUpdateNoticeKey.set(this.desktopUpdateNoticeKey());
+  }
+
+  startThemeStudioControlsDrag(event: PointerEvent, controlsElement: HTMLElement): void {
+    if (event.button !== 0) {
+      return;
+    }
+
+    const rect = controlsElement.getBoundingClientRect();
+
+    this.themeStudioControlsBounds = {
+      width: rect.width,
+      height: rect.height
+    };
+
+    this.themeStudioControlsDragOffset = {
+      x: event.clientX - rect.left,
+      y: event.clientY - rect.top
+    };
+
+    this.themeStudioControlsPosition.set({
+      x: rect.left,
+      y: rect.top
+    });
+
+    this.isDraggingThemeStudioControls.set(true);
+    event.preventDefault();
+  }
+
+  reopenThemeStudio(): void {
+    this.settingsModal.restoreMinimizedThemeStudio();
+  }
+
+  minimizeThemeStudio(): void {
+    this.settingsModal.minimizeThemeStudio();
+  }
+
+  dismissMinimizedThemeStudio(): void {
+    this.settingsModal.dismissMinimizedThemeStudio();
+  }
+
+  closeThemeStudio(): void {
+    this.settingsModal.close();
+  }
+
+  async refreshDesktopUpdateContext(): Promise<void> {
+    await this.desktopUpdates.refreshServerContext();
+  }
+
+  async restartToApplyUpdate(): Promise<void> {
+    await this.desktopUpdates.restartToApplyUpdate();
+  }
+
+  private clampThemeStudioControlsPosition(left: number, top: number, width: number, height: number): { x: number; y: number } {
+    const minX = App.THEME_STUDIO_CONTROLS_MARGIN;
+    const minY = App.TITLE_BAR_HEIGHT + App.THEME_STUDIO_CONTROLS_MARGIN;
+    const maxX = Math.max(minX, window.innerWidth - width - App.THEME_STUDIO_CONTROLS_MARGIN);
+    const maxY = Math.max(minY, window.innerHeight - height - App.THEME_STUDIO_CONTROLS_MARGIN);
+
+    return {
+      x: Math.min(Math.max(minX, left), maxX),
+      y: Math.min(Math.max(minY, top), maxY)
+    };
+  }
+
+  private async setupDesktopDeepLinks(): Promise<void> {
+    const electronApi = this.electronBridge.getApi();
+
+    if (!electronApi) {
+      return;
+    }
+
+    this.deepLinkCleanup = electronApi.onDeepLinkReceived?.((url) => {
+      void this.handleDesktopDeepLink(url);
+    }) || null;
+
+    const pendingDeepLink = await electronApi.consumePendingDeepLink?.();
+
+    if (pendingDeepLink) {
+      await this.handleDesktopDeepLink(pendingDeepLink);
+    }
+  }
+
+  private async handleDesktopDeepLink(url: string): Promise<void> {
+    const invite = this.parseDesktopInviteUrl(url);
+
+    if (!invite) {
+      return;
+    }
+
+    await this.router.navigate(['/invite', invite.inviteId], {
+      queryParams: {
+        server: invite.sourceUrl
+      }
+    });
+  }
+
+  private isPublicRoute(url: string): boolean {
+    return url === '/login' ||
+      url === '/register' ||
+      url.startsWith('/invite/');
+  }
+
+  private parseDesktopInviteUrl(url: string): { inviteId: string; sourceUrl: string } | null {
+    try {
+      const parsedUrl = new URL(url);
+
+      if (parsedUrl.protocol !== 'toju:') {
+        return null;
+      }
+
+      const pathSegments = [parsedUrl.hostname, ...parsedUrl.pathname.split('/').filter(Boolean)]
+        .map((segment) => decodeURIComponent(segment));
+
+      if (pathSegments[0] !== 'invite' || !pathSegments[1]) {
+        return null;
+      }
+
+      const sourceUrl = parsedUrl.searchParams.get('server')?.trim();
+
+      if (!sourceUrl) {
+        return null;
+      }
+
+      return {
+        inviteId: pathSegments[1],
+        sourceUrl
+      };
+    } catch {
+      return null;
+    }
+  }
+}

toju-app/src/app/core/constants.ts

@@ -1,8 +1,12 @@
 export const STORAGE_KEY_CURRENT_USER_ID = 'metoyou_currentUserId';
-export const STORAGE_KEY_LAST_VISITED_ROUTE = 'metoyou_lastVisitedRoute';
+export const STORAGE_KEY_GENERAL_SETTINGS = 'metoyou_general_settings';
+export const STORAGE_KEY_LAST_VIEWED_CHAT = 'metoyou_lastViewedChat';
 export const STORAGE_KEY_CONNECTION_SETTINGS = 'metoyou_connection_settings';
+export const STORAGE_KEY_NOTIFICATION_SETTINGS = 'metoyou_notification_settings';
 export const STORAGE_KEY_VOICE_SETTINGS = 'metoyou_voice_settings';
 export const STORAGE_KEY_DEBUGGING_SETTINGS = 'metoyou_debugging_settings';
+export const STORAGE_KEY_THEME_ACTIVE = 'metoyou_theme_active';
+export const STORAGE_KEY_THEME_DRAFT = 'metoyou_theme_draft';
 export const STORAGE_KEY_USER_VOLUMES = 'metoyou_user_volumes';
 export const ROOM_URL_PATTERN = /\/room\/([^/]+)/;
 export const STORE_DEVTOOLS_MAX_AGE = 25;