From c6e9ce5bbdf0f1bc7d5f57f79b5ff8eebd2cb7eb Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Sun, 8 Feb 2026 09:52:55 -0500
Subject: [PATCH 1/3] filter out non-owned collections when adding

---
 backend/endpoints/responses/collection.py     |  4 ++--
 backend/endpoints/responses/rom.py            |  2 --
 backend/models/collection.py                  |  4 ++--
 backend/models/rom.py                         |  8 -------
 frontend/src/__generated__/index.ts           | 11 ++++++++++
 ...download_api_saves__id__downloaded_post.ts |  8 +++++++
 ...dy_track_save_api_saves__id__track_post.ts |  8 +++++++
 ...ntrack_save_api_saves__id__untrack_post.ts |  8 +++++++
 .../__generated__/models/CollectionSchema.ts  |  3 ++-
 .../models/DeviceCreatePayload.ts             | 17 ++++++++++++++
 .../models/DeviceCreateResponse.ts            | 10 +++++++++
 .../src/__generated__/models/DeviceSchema.ts  | 22 +++++++++++++++++++
 .../__generated__/models/DeviceSyncSchema.ts  | 12 ++++++++++
 .../models/DeviceUpdatePayload.ts             | 15 +++++++++++++
 .../__generated__/models/RomFileCategory.ts   |  2 +-
 .../src/__generated__/models/RomUserSchema.ts |  1 -
 .../src/__generated__/models/SaveSchema.ts    |  4 ++++
 .../__generated__/models/SaveSummarySchema.ts | 10 +++++++++
 .../__generated__/models/SlotSummarySchema.ts | 11 ++++++++++
 .../models/SmartCollectionSchema.ts           |  3 ++-
 frontend/src/__generated__/models/SyncMode.ts |  5 +++++
 .../Collection/CollectionInfoDrawer.vue       |  6 ++---
 .../Collection/SmartCollectionInfoDrawer.vue  |  6 ++---
 .../common/Collection/Dialog/AddRoms.vue      |  2 +-
 frontend/src/stores/collections.ts            |  5 +++++
 25 files changed, 162 insertions(+), 25 deletions(-)
 create mode 100644 frontend/src/__generated__/models/Body_confirm_download_api_saves__id__downloaded_post.ts
 create mode 100644 frontend/src/__generated__/models/Body_track_save_api_saves__id__track_post.ts
 create mode 100644 frontend/src/__generated__/models/Body_untrack_save_api_saves__id__untrack_post.ts
 create mode 100644 frontend/src/__generated__/models/DeviceCreatePayload.ts
 create mode 100644 frontend/src/__generated__/models/DeviceCreateResponse.ts
 create mode 100644 frontend/src/__generated__/models/DeviceSchema.ts
 create mode 100644 frontend/src/__generated__/models/DeviceSyncSchema.ts
 create mode 100644 frontend/src/__generated__/models/DeviceUpdatePayload.ts
 create mode 100644 frontend/src/__generated__/models/SaveSummarySchema.ts
 create mode 100644 frontend/src/__generated__/models/SlotSummarySchema.ts
 create mode 100644 frontend/src/__generated__/models/SyncMode.ts

diff --git a/backend/endpoints/responses/collection.py b/backend/endpoints/responses/collection.py
index 4b5c2fc01..1f1596664 100644
--- a/backend/endpoints/responses/collection.py
+++ b/backend/endpoints/responses/collection.py
@@ -28,7 +28,7 @@ class CollectionSchema(BaseCollectionSchema):
     id: int
     url_cover: str | None
     user_id: int
-    user__username: str
+    owner_username: str
 
     class Config:
         from_attributes = True
@@ -60,7 +60,7 @@ class SmartCollectionSchema(BaseCollectionSchema):
     filter_criteria: dict[str, Any]
     filter_summary: str
     user_id: int
-    user__username: str
+    owner_username: str
     is_smart: bool = True
 
     class Config:
diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
index 143551787..c3e236a3c 100644
--- a/backend/endpoints/responses/rom.py
+++ b/backend/endpoints/responses/rom.py
@@ -117,7 +117,6 @@ def rom_user_schema_factory() -> RomUserSchema:
         difficulty=0,
         completion=0,
         status=None,
-        user__username="",
     )
 
 
@@ -136,7 +135,6 @@ class RomUserSchema(BaseModel):
     difficulty: int
     completion: int
     status: RomUserStatus | None
-    user__username: str
 
     class Config:
         from_attributes = True
diff --git a/backend/models/collection.py b/backend/models/collection.py
index 1bf4df450..02015fc19 100644
--- a/backend/models/collection.py
+++ b/backend/models/collection.py
@@ -43,7 +43,7 @@ class Collection(BaseModel):
     user: Mapped["User"] = relationship(lazy="joined", back_populates="collections")
 
     @property
-    def user__username(self) -> str:
+    def owner_username(self) -> str:
         return self.user.username
 
     @property
@@ -228,7 +228,7 @@ class SmartCollection(BaseModel):
         )
 
     @property
-    def user__username(self) -> str:
+    def owner_username(self) -> str:
         return self.user.username
 
     @property
diff --git a/backend/models/rom.py b/backend/models/rom.py
index acb9ac647..fb0dcdd9e 100644
--- a/backend/models/rom.py
+++ b/backend/models/rom.py
@@ -472,10 +472,6 @@ class RomNote(BaseModel):
     rom: Mapped[Rom] = relationship(lazy="joined", back_populates="notes")
     user: Mapped[User] = relationship(lazy="joined", back_populates="notes")
 
-    @property
-    def user__username(self) -> str:
-        return self.user.username
-
 
 class RomUser(BaseModel):
     __tablename__ = "rom_user"
@@ -503,7 +499,3 @@ class RomUser(BaseModel):
 
     rom: Mapped[Rom] = relationship(lazy="joined", back_populates="rom_users")
     user: Mapped[User] = relationship(lazy="joined", back_populates="rom_users")
-
-    @property
-    def user__username(self) -> str:
-        return self.user.username
diff --git a/frontend/src/__generated__/index.ts b/frontend/src/__generated__/index.ts
index baabd29be..ceb7bf2ef 100644
--- a/frontend/src/__generated__/index.ts
+++ b/frontend/src/__generated__/index.ts
@@ -8,6 +8,7 @@ export type { Body_add_collection_api_collections_post } from './models/Body_add
 export type { Body_add_firmware_api_firmware_post } from './models/Body_add_firmware_api_firmware_post';
 export type { Body_add_platform_api_platforms_post } from './models/Body_add_platform_api_platforms_post';
 export type { Body_add_user_api_users_post } from './models/Body_add_user_api_users_post';
+export type { Body_confirm_download_api_saves__id__downloaded_post } from './models/Body_confirm_download_api_saves__id__downloaded_post';
 export type { Body_create_user_from_invite_api_users_register_post } from './models/Body_create_user_from_invite_api_users_register_post';
 export type { Body_delete_firmware_api_firmware_delete_post } from './models/Body_delete_firmware_api_firmware_delete_post';
 export type { Body_delete_roms_api_roms_delete_post } from './models/Body_delete_roms_api_roms_delete_post';
@@ -17,6 +18,8 @@ export type { Body_refresh_retro_achievements_api_users__id__ra_refresh_post } f
 export type { Body_request_password_reset_api_forgot_password_post } from './models/Body_request_password_reset_api_forgot_password_post';
 export type { Body_reset_password_api_reset_password_post } from './models/Body_reset_password_api_reset_password_post';
 export type { Body_token_api_token_post } from './models/Body_token_api_token_post';
+export type { Body_track_save_api_saves__id__track_post } from './models/Body_track_save_api_saves__id__track_post';
+export type { Body_untrack_save_api_saves__id__untrack_post } from './models/Body_untrack_save_api_saves__id__untrack_post';
 export type { Body_update_collection_api_collections__id__put } from './models/Body_update_collection_api_collections__id__put';
 export type { Body_update_platform_api_platforms__id__put } from './models/Body_update_platform_api_platforms__id__put';
 export type { Body_update_rom_api_roms__id__put } from './models/Body_update_rom_api_roms__id__put';
@@ -32,6 +35,11 @@ export type { ConversionTaskMeta } from './models/ConversionTaskMeta';
 export type { ConversionTaskStatusResponse } from './models/ConversionTaskStatusResponse';
 export type { CustomLimitOffsetPage_SimpleRomSchema_ } from './models/CustomLimitOffsetPage_SimpleRomSchema_';
 export type { DetailedRomSchema } from './models/DetailedRomSchema';
+export type { DeviceCreatePayload } from './models/DeviceCreatePayload';
+export type { DeviceCreateResponse } from './models/DeviceCreateResponse';
+export type { DeviceSchema } from './models/DeviceSchema';
+export type { DeviceSyncSchema } from './models/DeviceSyncSchema';
+export type { DeviceUpdatePayload } from './models/DeviceUpdatePayload';
 export type { EarnedAchievement } from './models/EarnedAchievement';
 export type { EjsControls } from './models/EjsControls';
 export type { EjsControlsButton } from './models/EjsControlsButton';
@@ -77,6 +85,7 @@ export type { RomUserSchema } from './models/RomUserSchema';
 export type { RomUserStatus } from './models/RomUserStatus';
 export type { RoomsResponse } from './models/RoomsResponse';
 export type { SaveSchema } from './models/SaveSchema';
+export type { SaveSummarySchema } from './models/SaveSummarySchema';
 export type { ScanStats } from './models/ScanStats';
 export type { ScanTaskMeta } from './models/ScanTaskMeta';
 export type { ScanTaskStatusResponse } from './models/ScanTaskStatusResponse';
@@ -86,9 +95,11 @@ export type { SearchRomSchema } from './models/SearchRomSchema';
 export type { SGDBResource } from './models/SGDBResource';
 export type { SiblingRomSchema } from './models/SiblingRomSchema';
 export type { SimpleRomSchema } from './models/SimpleRomSchema';
+export type { SlotSummarySchema } from './models/SlotSummarySchema';
 export type { SmartCollectionSchema } from './models/SmartCollectionSchema';
 export type { StateSchema } from './models/StateSchema';
 export type { StatsReturn } from './models/StatsReturn';
+export type { SyncMode } from './models/SyncMode';
 export type { SystemDict } from './models/SystemDict';
 export type { TaskExecutionResponse } from './models/TaskExecutionResponse';
 export type { TaskInfo } from './models/TaskInfo';
diff --git a/frontend/src/__generated__/models/Body_confirm_download_api_saves__id__downloaded_post.ts b/frontend/src/__generated__/models/Body_confirm_download_api_saves__id__downloaded_post.ts
new file mode 100644
index 000000000..7e0d6f501
--- /dev/null
+++ b/frontend/src/__generated__/models/Body_confirm_download_api_saves__id__downloaded_post.ts
@@ -0,0 +1,8 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export type Body_confirm_download_api_saves__id__downloaded_post = {
+    device_id: string;
+};
+
diff --git a/frontend/src/__generated__/models/Body_track_save_api_saves__id__track_post.ts b/frontend/src/__generated__/models/Body_track_save_api_saves__id__track_post.ts
new file mode 100644
index 000000000..265e7936f
--- /dev/null
+++ b/frontend/src/__generated__/models/Body_track_save_api_saves__id__track_post.ts
@@ -0,0 +1,8 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export type Body_track_save_api_saves__id__track_post = {
+    device_id: string;
+};
+
diff --git a/frontend/src/__generated__/models/Body_untrack_save_api_saves__id__untrack_post.ts b/frontend/src/__generated__/models/Body_untrack_save_api_saves__id__untrack_post.ts
new file mode 100644
index 000000000..61f3d6016
--- /dev/null
+++ b/frontend/src/__generated__/models/Body_untrack_save_api_saves__id__untrack_post.ts
@@ -0,0 +1,8 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export type Body_untrack_save_api_saves__id__untrack_post = {
+    device_id: string;
+};
+
diff --git a/frontend/src/__generated__/models/CollectionSchema.ts b/frontend/src/__generated__/models/CollectionSchema.ts
index e589ec7c3..f6567ff5f 100644
--- a/frontend/src/__generated__/models/CollectionSchema.ts
+++ b/frontend/src/__generated__/models/CollectionSchema.ts
@@ -20,6 +20,7 @@ export type CollectionSchema = {
     id: number;
     url_cover: (string | null);
     user_id: number;
-    user__username: string;
+    owner_username: string;
+    owned_by_current_user: boolean;
 };
 
diff --git a/frontend/src/__generated__/models/DeviceCreatePayload.ts b/frontend/src/__generated__/models/DeviceCreatePayload.ts
new file mode 100644
index 000000000..f6b9a7324
--- /dev/null
+++ b/frontend/src/__generated__/models/DeviceCreatePayload.ts
@@ -0,0 +1,17 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export type DeviceCreatePayload = {
+    name?: (string | null);
+    platform?: (string | null);
+    client?: (string | null);
+    client_version?: (string | null);
+    ip_address?: (string | null);
+    mac_address?: (string | null);
+    hostname?: (string | null);
+    allow_existing?: boolean;
+    allow_duplicate?: boolean;
+    reset_syncs?: boolean;
+};
+
diff --git a/frontend/src/__generated__/models/DeviceCreateResponse.ts b/frontend/src/__generated__/models/DeviceCreateResponse.ts
new file mode 100644
index 000000000..599d70e8d
--- /dev/null
+++ b/frontend/src/__generated__/models/DeviceCreateResponse.ts
@@ -0,0 +1,10 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export type DeviceCreateResponse = {
+    device_id: string;
+    name: (string | null);
+    created_at: string;
+};
+
diff --git a/frontend/src/__generated__/models/DeviceSchema.ts b/frontend/src/__generated__/models/DeviceSchema.ts
new file mode 100644
index 000000000..c85043970
--- /dev/null
+++ b/frontend/src/__generated__/models/DeviceSchema.ts
@@ -0,0 +1,22 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { SyncMode } from './SyncMode';
+export type DeviceSchema = {
+    id: string;
+    user_id: number;
+    name: (string | null);
+    platform: (string | null);
+    client: (string | null);
+    client_version: (string | null);
+    ip_address: (string | null);
+    mac_address: (string | null);
+    hostname: (string | null);
+    sync_mode: SyncMode;
+    sync_enabled: boolean;
+    last_seen: (string | null);
+    created_at: string;
+    updated_at: string;
+};
+
diff --git a/frontend/src/__generated__/models/DeviceSyncSchema.ts b/frontend/src/__generated__/models/DeviceSyncSchema.ts
new file mode 100644
index 000000000..fcf527273
--- /dev/null
+++ b/frontend/src/__generated__/models/DeviceSyncSchema.ts
@@ -0,0 +1,12 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export type DeviceSyncSchema = {
+    device_id: string;
+    device_name: (string | null);
+    last_synced_at: string;
+    is_untracked: boolean;
+    is_current: boolean;
+};
+
diff --git a/frontend/src/__generated__/models/DeviceUpdatePayload.ts b/frontend/src/__generated__/models/DeviceUpdatePayload.ts
new file mode 100644
index 000000000..4b1ae22a0
--- /dev/null
+++ b/frontend/src/__generated__/models/DeviceUpdatePayload.ts
@@ -0,0 +1,15 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export type DeviceUpdatePayload = {
+    name?: (string | null);
+    platform?: (string | null);
+    client?: (string | null);
+    client_version?: (string | null);
+    ip_address?: (string | null);
+    mac_address?: (string | null);
+    hostname?: (string | null);
+    sync_enabled?: (boolean | null);
+};
+
diff --git a/frontend/src/__generated__/models/RomFileCategory.ts b/frontend/src/__generated__/models/RomFileCategory.ts
index d132f180d..b84d418c1 100644
--- a/frontend/src/__generated__/models/RomFileCategory.ts
+++ b/frontend/src/__generated__/models/RomFileCategory.ts
@@ -2,4 +2,4 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-export type RomFileCategory = 'game' | 'dlc' | 'hack' | 'manual' | 'patch' | 'update' | 'mod' | 'demo' | 'translation' | 'prototype';
+export type RomFileCategory = 'game' | 'dlc' | 'hack' | 'manual' | 'patch' | 'update' | 'mod' | 'demo' | 'translation' | 'prototype' | 'cheat';
diff --git a/frontend/src/__generated__/models/RomUserSchema.ts b/frontend/src/__generated__/models/RomUserSchema.ts
index 7e58f7369..edaa1b55e 100644
--- a/frontend/src/__generated__/models/RomUserSchema.ts
+++ b/frontend/src/__generated__/models/RomUserSchema.ts
@@ -18,6 +18,5 @@ export type RomUserSchema = {
     difficulty: number;
     completion: number;
     status: (RomUserStatus | null);
-    user__username: string;
 };
 
diff --git a/frontend/src/__generated__/models/SaveSchema.ts b/frontend/src/__generated__/models/SaveSchema.ts
index 2959ab6b1..a440b1e8a 100644
--- a/frontend/src/__generated__/models/SaveSchema.ts
+++ b/frontend/src/__generated__/models/SaveSchema.ts
@@ -2,6 +2,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+import type { DeviceSyncSchema } from './DeviceSyncSchema';
 import type { ScreenshotSchema } from './ScreenshotSchema';
 export type SaveSchema = {
     id: number;
@@ -19,6 +20,9 @@ export type SaveSchema = {
     created_at: string;
     updated_at: string;
     emulator: (string | null);
+    slot?: (string | null);
+    content_hash?: (string | null);
     screenshot: (ScreenshotSchema | null);
+    device_syncs?: Array<DeviceSyncSchema>;
 };
 
diff --git a/frontend/src/__generated__/models/SaveSummarySchema.ts b/frontend/src/__generated__/models/SaveSummarySchema.ts
new file mode 100644
index 000000000..7e12b0850
--- /dev/null
+++ b/frontend/src/__generated__/models/SaveSummarySchema.ts
@@ -0,0 +1,10 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { SlotSummarySchema } from './SlotSummarySchema';
+export type SaveSummarySchema = {
+    total_count: number;
+    slots: Array<SlotSummarySchema>;
+};
+
diff --git a/frontend/src/__generated__/models/SlotSummarySchema.ts b/frontend/src/__generated__/models/SlotSummarySchema.ts
new file mode 100644
index 000000000..381031e9e
--- /dev/null
+++ b/frontend/src/__generated__/models/SlotSummarySchema.ts
@@ -0,0 +1,11 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { SaveSchema } from './SaveSchema';
+export type SlotSummarySchema = {
+    slot: (string | null);
+    count: number;
+    latest: SaveSchema;
+};
+
diff --git a/frontend/src/__generated__/models/SmartCollectionSchema.ts b/frontend/src/__generated__/models/SmartCollectionSchema.ts
index ba1845f3a..268b7b9cd 100644
--- a/frontend/src/__generated__/models/SmartCollectionSchema.ts
+++ b/frontend/src/__generated__/models/SmartCollectionSchema.ts
@@ -21,6 +21,7 @@ export type SmartCollectionSchema = {
     filter_criteria: Record<string, any>;
     filter_summary: string;
     user_id: number;
-    user__username: string;
+    owner_username: string;
+    owned_by_current_user: boolean;
 };
 
diff --git a/frontend/src/__generated__/models/SyncMode.ts b/frontend/src/__generated__/models/SyncMode.ts
new file mode 100644
index 000000000..d2193fae2
--- /dev/null
+++ b/frontend/src/__generated__/models/SyncMode.ts
@@ -0,0 +1,5 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export type SyncMode = 'api' | 'file_transfer' | 'push_pull';
diff --git a/frontend/src/components/Gallery/AppBar/Collection/CollectionInfoDrawer.vue b/frontend/src/components/Gallery/AppBar/Collection/CollectionInfoDrawer.vue
index 702d8368c..630572830 100644
--- a/frontend/src/components/Gallery/AppBar/Collection/CollectionInfoDrawer.vue
+++ b/frontend/src/components/Gallery/AppBar/Collection/CollectionInfoDrawer.vue
@@ -36,7 +36,7 @@ const collectionInfoFields = [
     label: "Roms",
   },
   {
-    key: "user__username",
+    key: "owner_username",
     label: t("collection.owner"),
   },
 ];
@@ -146,7 +146,7 @@ async function updateCollection() {
           <div class="position-absolute append-top-right mr-5">
             <template
               v-if="
-                currentCollection.user__username === auth.user?.username &&
+                currentCollection.user_id === auth.user?.id &&
                 auth.scopes.includes('collections.write')
               "
             >
@@ -328,7 +328,7 @@ async function updateCollection() {
     <RSection
       v-if="
         auth.scopes.includes('collections.write') &&
-        currentCollection.user__username === auth.user?.username
+        currentCollection.user_id === auth.user?.id
       "
       icon="mdi-alert"
       icon-color="red"
diff --git a/frontend/src/components/Gallery/AppBar/Collection/SmartCollectionInfoDrawer.vue b/frontend/src/components/Gallery/AppBar/Collection/SmartCollectionInfoDrawer.vue
index 30bec39d1..0257febef 100644
--- a/frontend/src/components/Gallery/AppBar/Collection/SmartCollectionInfoDrawer.vue
+++ b/frontend/src/components/Gallery/AppBar/Collection/SmartCollectionInfoDrawer.vue
@@ -29,7 +29,7 @@ const collectionInfoFields = [
     label: "Roms",
   },
   {
-    key: "user__username",
+    key: "owner_username",
     label: t("collection.owner"),
   },
 ];
@@ -96,7 +96,7 @@ async function updateCollection() {
           <div class="position-absolute append-top-right mr-5">
             <template
               v-if="
-                currentSmartCollection.user__username === auth.user?.username &&
+                currentSmartCollection.user_id === auth.user?.id &&
                 auth.scopes.includes('collections.write')
               "
             >
@@ -253,7 +253,7 @@ async function updateCollection() {
     <RSection
       v-if="
         auth.scopes.includes('collections.write') &&
-        currentSmartCollection.user__username === auth.user?.username
+        currentSmartCollection.user_id === auth.user?.id
       "
       icon="mdi-alert"
       icon-color="red"
diff --git a/frontend/src/components/common/Collection/Dialog/AddRoms.vue b/frontend/src/components/common/Collection/Dialog/AddRoms.vue
index d4cf4676b..ef2c795c8 100644
--- a/frontend/src/components/common/Collection/Dialog/AddRoms.vue
+++ b/frontend/src/components/common/Collection/Dialog/AddRoms.vue
@@ -92,7 +92,7 @@ function closeDialog() {
         density="default"
         :label="t('common.collection')"
         item-title="name"
-        :items="collectionsStore.allCollections"
+        :items="collectionsStore.ownedCollections"
         variant="outlined"
         hide-details
         return-object
diff --git a/frontend/src/stores/collections.ts b/frontend/src/stores/collections.ts
index 107a09b18..5077c2925 100644
--- a/frontend/src/stores/collections.ts
+++ b/frontend/src/stores/collections.ts
@@ -6,6 +6,7 @@ import type {
   SmartCollectionSchema,
 } from "@/__generated__";
 import collectionApi from "@/services/api/collection";
+import storeAuth from "@/stores/auth";
 import type { SimpleRom } from "./roms";
 
 export type Collection = CollectionSchema;
@@ -29,6 +30,10 @@ export default defineStore("collections", {
       allCollections.filter((p) =>
         p.name.toLowerCase().includes(filterText.toLowerCase()),
       ),
+    ownedCollections: ({ allCollections }) => {
+      const authStore = storeAuth();
+      return allCollections.filter((c) => c.user_id === authStore.user?.id);
+    },
     filteredVirtualCollections: ({ virtualCollections, filterText }) =>
       virtualCollections.filter((p) =>
         p.name.toLowerCase().includes(filterText.toLowerCase()),

From 3da557c72deedfe26766ea53504ca8f3336aada2 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Sun, 8 Feb 2026 10:05:35 -0500
Subject: [PATCH 2/3] load stores dierctly in roms store

---
 .../Gallery/AppBar/common/CharIndexBar.vue    |  6 ------
 .../AppBar/common/FilterDrawer/Base.vue       |  2 --
 .../LibraryManagement/Config/MissingGames.vue | 12 ++---------
 .../components/common/Game/VirtualTable.vue   |  5 +----
 frontend/src/console/views/GamesList.vue      |  2 --
 frontend/src/stores/roms.ts                   | 15 +++++++------
 .../Gallery/Collection/BaseCollection.vue     |  7 +------
 frontend/src/views/Gallery/Platform.vue       |  5 +----
 frontend/src/views/Gallery/Search.vue         | 21 +++++++------------
 9 files changed, 19 insertions(+), 56 deletions(-)

diff --git a/frontend/src/components/Gallery/AppBar/common/CharIndexBar.vue b/frontend/src/components/Gallery/AppBar/common/CharIndexBar.vue
index b474c6380..ab51e4107 100644
--- a/frontend/src/components/Gallery/AppBar/common/CharIndexBar.vue
+++ b/frontend/src/components/Gallery/AppBar/common/CharIndexBar.vue
@@ -3,16 +3,12 @@ import type { Emitter } from "mitt";
 import { storeToRefs } from "pinia";
 import { inject, watch, computed } from "vue";
 import { useDisplay } from "vuetify";
-import storeGalleryFilter from "@/stores/galleryFilter";
 import storeGalleryView from "@/stores/galleryView";
-import storePlatforms from "@/stores/platforms";
 import storeRoms from "@/stores/roms";
 import type { Events } from "@/types/emitter";
 
 const { smAndDown } = useDisplay();
 const romsStore = storeRoms();
-const platformsStore = storePlatforms();
-const galleryFilterStore = storeGalleryFilter();
 const galleryViewStore = storeGalleryView();
 const { selectedRoms } = storeToRefs(romsStore);
 const emitter = inject<Emitter<Events>>("emitter");
@@ -32,8 +28,6 @@ async function fetchRoms() {
 
   romsStore
     .fetchRoms({
-      galleryFilter: galleryFilterStore,
-      platformsStore: platformsStore,
       concat: false,
     })
     .then(() => {
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index 884dd5395..37166c3e1 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -87,8 +87,6 @@ const onFilterChange = debounce(
   () => {
     romsStore.resetPagination();
     romsStore.fetchRoms({
-      galleryFilter: galleryFilterStore,
-      platformsStore: platformsStore,
       concat: false,
     });
 
diff --git a/frontend/src/components/Settings/LibraryManagement/Config/MissingGames.vue b/frontend/src/components/Settings/LibraryManagement/Config/MissingGames.vue
index 6dc35db29..d8fe91fef 100644
--- a/frontend/src/components/Settings/LibraryManagement/Config/MissingGames.vue
+++ b/frontend/src/components/Settings/LibraryManagement/Config/MissingGames.vue
@@ -44,8 +44,6 @@ const onFilterChange = debounce(
     romsStore.resetPagination();
     galleryFilterStore.setFilterMissing(true);
     romsStore.fetchRoms({
-      galleryFilter: galleryFilterStore,
-      platformsStore: platformsStore,
       concat: false,
     });
 
@@ -75,10 +73,7 @@ async function fetchRoms() {
 
   galleryFilterStore.setFilterMissing(true);
   romsStore
-    .fetchRoms({
-      galleryFilter: galleryFilterStore,
-      platformsStore: platformsStore,
-    })
+    .fetchRoms({})
     .catch((error) => {
       console.error("Error fetching missing games:", error);
       emitter?.emit("snackbarShow", {
@@ -98,10 +93,7 @@ function cleanupAll() {
   romsStore.setLimit(10000);
   galleryFilterStore.setFilterMissing(true);
   romsStore
-    .fetchRoms({
-      galleryFilter: galleryFilterStore,
-      platformsStore: platformsStore,
-    })
+    .fetchRoms({})
     .then(() => {
       emitter?.emit("showLoadingDialog", {
         loading: false,
diff --git a/frontend/src/components/common/Game/VirtualTable.vue b/frontend/src/components/common/Game/VirtualTable.vue
index 1a14903de..460b4bdab 100644
--- a/frontend/src/components/common/Game/VirtualTable.vue
+++ b/frontend/src/components/common/Game/VirtualTable.vue
@@ -136,10 +136,7 @@ function updateOptions({ sortBy }: { sortBy: SortBy }) {
   romsStore.resetPagination();
   romsStore.setOrderBy(key);
   romsStore.setOrderDir(order);
-  romsStore.fetchRoms({
-    galleryFilter: galleryFilterStore,
-    platformsStore: platformsStore,
-  });
+  romsStore.fetchRoms({});
 }
 </script>
 
diff --git a/frontend/src/console/views/GamesList.vue b/frontend/src/console/views/GamesList.vue
index abccb18f5..10783f4f2 100644
--- a/frontend/src/console/views/GamesList.vue
+++ b/frontend/src/console/views/GamesList.vue
@@ -319,8 +319,6 @@ async function fetchRoms() {
   romsStore.resetPagination();
 
   const fetchedRoms = await romsStore.fetchRoms({
-    galleryFilter: galleryFilterStore,
-    platformsStore: platformsStore,
     concat: false,
   });
 
diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index 3954e2039..369726e6d 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -194,19 +194,18 @@ export default defineStore("roms", {
       }
     },
     async fetchRoms({
-      galleryFilter,
-      platformsStore,
       concat = true,
     }: {
-      galleryFilter: GalleryFilterStore;
-      platformsStore: PlatformsStore;
       concat?: boolean;
     }): Promise<SimpleRom[]> {
       if (this.fetchingRoms) return Promise.resolve([]);
       this.fetchingRoms = true;
 
+      const galleryFilterStore = storeGalleryFilter();
+      const platformsStore = storePlatforms();
+
       // Capture current request parameters to validate background updates
-      const currentRequestParams = this._buildRequestParams(galleryFilter);
+      const currentRequestParams = this._buildRequestParams(galleryFilterStore);
 
       return new Promise((resolve, reject) => {
         cachedApiService
@@ -214,14 +213,14 @@ export default defineStore("roms", {
             if (concat && this.fetchOffset != 0) return;
 
             // Check if parameters have changed since the request was made
-            const currentParams = this._buildRequestParams(galleryFilter);
+            const currentParams = this._buildRequestParams(galleryFilterStore);
             const paramsChanged =
               JSON.stringify(currentParams) !==
               JSON.stringify(currentRequestParams);
             if (paramsChanged) return;
             this._postFetchRoms(
               response,
-              galleryFilter,
+              galleryFilterStore,
               platformsStore,
               concat,
             );
@@ -229,7 +228,7 @@ export default defineStore("roms", {
           .then((response) => {
             this._postFetchRoms(
               response.data,
-              galleryFilter,
+              galleryFilterStore,
               platformsStore,
               concat,
             );
diff --git a/frontend/src/views/Gallery/Collection/BaseCollection.vue b/frontend/src/views/Gallery/Collection/BaseCollection.vue
index 272a38407..d2ab345d6 100644
--- a/frontend/src/views/Gallery/Collection/BaseCollection.vue
+++ b/frontend/src/views/Gallery/Collection/BaseCollection.vue
@@ -15,7 +15,6 @@ import GameTable from "@/components/common/Game/VirtualTable.vue";
 import { type CollectionType } from "@/stores/collections";
 import storeGalleryFilter from "@/stores/galleryFilter";
 import storeGalleryView from "@/stores/galleryView";
-import storePlatforms from "@/stores/platforms";
 import storeRoms, { type SimpleRom } from "@/stores/roms";
 import type { Events } from "@/types/emitter";
 import { views } from "@/utils";
@@ -30,7 +29,6 @@ const galleryViewStore = storeGalleryView();
 const galleryFilterStore = storeGalleryFilter();
 const { scrolledToTop, currentView } = storeToRefs(galleryViewStore);
 const romsStore = storeRoms();
-const platformsStore = storePlatforms();
 const {
   filteredRoms,
   selectedRoms,
@@ -55,10 +53,7 @@ async function fetchRoms() {
   });
 
   romsStore
-    .fetchRoms({
-      galleryFilter: galleryFilterStore,
-      platformsStore: platformsStore,
-    })
+    .fetchRoms({})
     .then(() => {
       emitter?.emit("showLoadingDialog", {
         loading: false,
diff --git a/frontend/src/views/Gallery/Platform.vue b/frontend/src/views/Gallery/Platform.vue
index 75d1757ea..6dd6c7436 100644
--- a/frontend/src/views/Gallery/Platform.vue
+++ b/frontend/src/views/Gallery/Platform.vue
@@ -48,10 +48,7 @@ async function fetchRoms() {
   });
 
   romsStore
-    .fetchRoms({
-      galleryFilter: galleryFilterStore,
-      platformsStore: platformsStore,
-    })
+    .fetchRoms({})
     .then(() => {
       emitter?.emit("showLoadingDialog", {
         loading: false,
diff --git a/frontend/src/views/Gallery/Search.vue b/frontend/src/views/Gallery/Search.vue
index ccfa52487..50a45f8e6 100644
--- a/frontend/src/views/Gallery/Search.vue
+++ b/frontend/src/views/Gallery/Search.vue
@@ -13,7 +13,6 @@ import GameCard from "@/components/common/Game/Card/Base.vue";
 import GameTable from "@/components/common/Game/VirtualTable.vue";
 import storeGalleryFilter from "@/stores/galleryFilter";
 import storeGalleryView from "@/stores/galleryView";
-import storePlatforms from "@/stores/platforms";
 import storeRoms, { type SimpleRom } from "@/stores/roms";
 import type { Events } from "@/types/emitter";
 import { views } from "@/utils";
@@ -23,7 +22,6 @@ const { scrolledToTop, currentView } = storeToRefs(galleryViewStore);
 const galleryFilterStore = storeGalleryFilter();
 const { searchTerm } = storeToRefs(galleryFilterStore);
 const romsStore = storeRoms();
-const platformsStore = storePlatforms();
 const {
   filteredRoms,
   selectedRoms,
@@ -101,19 +99,14 @@ function onGameTouchEnd() {
 }
 
 function fetchRoms() {
-  romsStore
-    .fetchRoms({
-      galleryFilter: galleryFilterStore,
-      platformsStore: platformsStore,
-    })
-    .catch((error) => {
-      emitter?.emit("snackbarShow", {
-        msg: `Couldn't fetch roms: ${error}`,
-        icon: "mdi-close-circle",
-        color: "red",
-        timeout: 4000,
-      });
+  romsStore.fetchRoms({}).catch((error) => {
+    emitter?.emit("snackbarShow", {
+      msg: `Couldn't fetch roms: ${error}`,
+      icon: "mdi-close-circle",
+      color: "red",
+      timeout: 4000,
     });
+  });
 }
 
 const { y: windowY } = useScroll(window, { throttle: 500 });

From 0023e29ef83b876f2b7a92467050f031c63610e7 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Sun, 8 Feb 2026 19:58:28 -0500
Subject: [PATCH 3/3] remove owned_by_current_user and refactor

---
 frontend/src/__generated__/models/CollectionSchema.ts     | 1 -
 .../src/__generated__/models/SmartCollectionSchema.ts     | 1 -
 .../src/components/Gallery/AppBar/common/CharIndexBar.vue | 4 +---
 .../Gallery/AppBar/common/FilterDrawer/Base.vue           | 4 +---
 .../Settings/LibraryManagement/Config/MissingGames.vue    | 8 +++-----
 frontend/src/components/common/Game/VirtualTable.vue      | 2 +-
 frontend/src/console/views/GamesList.vue                  | 4 +---
 frontend/src/stores/roms.ts                               | 6 +-----
 frontend/src/views/Gallery/Collection/BaseCollection.vue  | 2 +-
 frontend/src/views/Gallery/Platform.vue                   | 2 +-
 frontend/src/views/Gallery/Search.vue                     | 2 +-
 11 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/frontend/src/__generated__/models/CollectionSchema.ts b/frontend/src/__generated__/models/CollectionSchema.ts
index f6567ff5f..b0463c835 100644
--- a/frontend/src/__generated__/models/CollectionSchema.ts
+++ b/frontend/src/__generated__/models/CollectionSchema.ts
@@ -21,6 +21,5 @@ export type CollectionSchema = {
     url_cover: (string | null);
     user_id: number;
     owner_username: string;
-    owned_by_current_user: boolean;
 };
 
diff --git a/frontend/src/__generated__/models/SmartCollectionSchema.ts b/frontend/src/__generated__/models/SmartCollectionSchema.ts
index 268b7b9cd..6f6c4b552 100644
--- a/frontend/src/__generated__/models/SmartCollectionSchema.ts
+++ b/frontend/src/__generated__/models/SmartCollectionSchema.ts
@@ -22,6 +22,5 @@ export type SmartCollectionSchema = {
     filter_summary: string;
     user_id: number;
     owner_username: string;
-    owned_by_current_user: boolean;
 };
 
diff --git a/frontend/src/components/Gallery/AppBar/common/CharIndexBar.vue b/frontend/src/components/Gallery/AppBar/common/CharIndexBar.vue
index ab51e4107..877e30246 100644
--- a/frontend/src/components/Gallery/AppBar/common/CharIndexBar.vue
+++ b/frontend/src/components/Gallery/AppBar/common/CharIndexBar.vue
@@ -27,9 +27,7 @@ async function fetchRoms() {
   });
 
   romsStore
-    .fetchRoms({
-      concat: false,
-    })
+    .fetchRoms(false)
     .then(() => {
       emitter?.emit("showLoadingDialog", {
         loading: false,
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index 37166c3e1..d0ffeac80 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -86,9 +86,7 @@ const emitter = inject<Emitter<Events>>("emitter");
 const onFilterChange = debounce(
   () => {
     romsStore.resetPagination();
-    romsStore.fetchRoms({
-      concat: false,
-    });
+    romsStore.fetchRoms(false);
 
     const url = new URL(window.location.href);
     // Update URL with filters
diff --git a/frontend/src/components/Settings/LibraryManagement/Config/MissingGames.vue b/frontend/src/components/Settings/LibraryManagement/Config/MissingGames.vue
index d8fe91fef..cb1be5196 100644
--- a/frontend/src/components/Settings/LibraryManagement/Config/MissingGames.vue
+++ b/frontend/src/components/Settings/LibraryManagement/Config/MissingGames.vue
@@ -43,9 +43,7 @@ const onFilterChange = debounce(
   () => {
     romsStore.resetPagination();
     galleryFilterStore.setFilterMissing(true);
-    romsStore.fetchRoms({
-      concat: false,
-    });
+    romsStore.fetchRoms(false);
 
     const url = new URL(window.location.href);
     // Update URL with filters
@@ -73,7 +71,7 @@ async function fetchRoms() {
 
   galleryFilterStore.setFilterMissing(true);
   romsStore
-    .fetchRoms({})
+    .fetchRoms()
     .catch((error) => {
       console.error("Error fetching missing games:", error);
       emitter?.emit("snackbarShow", {
@@ -93,7 +91,7 @@ function cleanupAll() {
   romsStore.setLimit(10000);
   galleryFilterStore.setFilterMissing(true);
   romsStore
-    .fetchRoms({})
+    .fetchRoms()
     .then(() => {
       emitter?.emit("showLoadingDialog", {
         loading: false,
diff --git a/frontend/src/components/common/Game/VirtualTable.vue b/frontend/src/components/common/Game/VirtualTable.vue
index 460b4bdab..2cb68b0ad 100644
--- a/frontend/src/components/common/Game/VirtualTable.vue
+++ b/frontend/src/components/common/Game/VirtualTable.vue
@@ -136,7 +136,7 @@ function updateOptions({ sortBy }: { sortBy: SortBy }) {
   romsStore.resetPagination();
   romsStore.setOrderBy(key);
   romsStore.setOrderDir(order);
-  romsStore.fetchRoms({});
+  romsStore.fetchRoms();
 }
 </script>
 
diff --git a/frontend/src/console/views/GamesList.vue b/frontend/src/console/views/GamesList.vue
index 10783f4f2..5e741391f 100644
--- a/frontend/src/console/views/GamesList.vue
+++ b/frontend/src/console/views/GamesList.vue
@@ -318,9 +318,7 @@ async function fetchRoms() {
   romsStore.setOrderDir("asc");
   romsStore.resetPagination();
 
-  const fetchedRoms = await romsStore.fetchRoms({
-    concat: false,
-  });
+  const fetchedRoms = await romsStore.fetchRoms(false);
 
   if (selectedIndex.value >= fetchedRoms.length) selectedIndex.value = 0;
   await nextTick();
diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index 369726e6d..a5f1bf355 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -193,11 +193,7 @@ export default defineStore("roms", {
         galleryFilter.setFilterPlayerCounts(filter_values.player_counts);
       }
     },
-    async fetchRoms({
-      concat = true,
-    }: {
-      concat?: boolean;
-    }): Promise<SimpleRom[]> {
+    async fetchRoms(concat = true): Promise<SimpleRom[]> {
       if (this.fetchingRoms) return Promise.resolve([]);
       this.fetchingRoms = true;
 
diff --git a/frontend/src/views/Gallery/Collection/BaseCollection.vue b/frontend/src/views/Gallery/Collection/BaseCollection.vue
index d2ab345d6..f13a49b2d 100644
--- a/frontend/src/views/Gallery/Collection/BaseCollection.vue
+++ b/frontend/src/views/Gallery/Collection/BaseCollection.vue
@@ -53,7 +53,7 @@ async function fetchRoms() {
   });
 
   romsStore
-    .fetchRoms({})
+    .fetchRoms()
     .then(() => {
       emitter?.emit("showLoadingDialog", {
         loading: false,
diff --git a/frontend/src/views/Gallery/Platform.vue b/frontend/src/views/Gallery/Platform.vue
index 6dd6c7436..03aac805c 100644
--- a/frontend/src/views/Gallery/Platform.vue
+++ b/frontend/src/views/Gallery/Platform.vue
@@ -48,7 +48,7 @@ async function fetchRoms() {
   });
 
   romsStore
-    .fetchRoms({})
+    .fetchRoms()
     .then(() => {
       emitter?.emit("showLoadingDialog", {
         loading: false,
diff --git a/frontend/src/views/Gallery/Search.vue b/frontend/src/views/Gallery/Search.vue
index 50a45f8e6..e1c79aa52 100644
--- a/frontend/src/views/Gallery/Search.vue
+++ b/frontend/src/views/Gallery/Search.vue
@@ -99,7 +99,7 @@ function onGameTouchEnd() {
 }
 
 function fetchRoms() {
-  romsStore.fetchRoms({}).catch((error) => {
+  romsStore.fetchRoms().catch((error) => {
     emitter?.emit("snackbarShow", {
       msg: `Couldn't fetch roms: ${error}`,
       icon: "mdi-close-circle",