Merge pull request #1480 from rommapp/hotfix-remove-continue-playing

[HOTFIX] Fix remove from continue playing
rommapp · Jan 13, 2025 · bfc0c8a · bfc0c8a
2 parents 04c78ab + d0ba1d6
commit bfc0c8a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
@@ -276,18 +276,19 @@ def update_rom_user(self, id: int, data: dict, session: Session = None) -> RomUs
 
         rom_user = self.get_rom_user_by_id(id)
 
-        if data.get("is_main_sibling", False):
-            rom = self.get_rom(rom_user.rom_id)
+        if not data.get("is_main_sibling", False):
+            return rom_user
 
-            session.execute(
-                update(RomUser)
-                .where(
-                    and_(
-                        RomUser.rom_id.in_(r.id for r in rom.sibling_roms),
-                        RomUser.user_id == rom_user.user_id,
-                    )
+        rom = self.get_rom(rom_user.rom_id)
+        session.execute(
+            update(RomUser)
+            .where(
+                and_(
+                    RomUser.rom_id.in_(r.id for r in rom.sibling_roms),
+                    RomUser.user_id == rom_user.user_id,
                 )
-                .values(is_main_sibling=False)
             )
+            .values(is_main_sibling=False)
+        )
 
         return self.get_rom_user_by_id(id)
diff --git a/frontend/src/components/common/Game/AdminMenu.vue b/frontend/src/components/common/Game/AdminMenu.vue
@@ -64,7 +64,7 @@ async function switchFromFavourites() {
   }
   await collectionApi
     .updateCollection({ collection: favCollection.value as Collection })
-    .then(({ data }) => {
+    .then(() => {
       emitter?.emit("snackbarShow", {
         msg: `${props.rom.name} ${
           collectionsStore.isFav(props.rom) ? "added to" : "removed from"
@@ -101,6 +101,8 @@ async function resetLastPlayed() {
         color: "green",
         timeout: 2000,
       });
+
+      romsStore.removeFromContinuePlaying(props.rom);
     })
     .catch((error) => {
       console.log(error);

diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
@@ -187,7 +187,7 @@ async function updateUserRomProps({
   romId: number;
   data: Partial<RomUserSchema>;
   updateLastPlayed?: boolean;
-}): Promise<{ data: DetailedRom }> {
+}): Promise<{ data: RomUserSchema }> {
   return api.put(`/roms/${romId}/props`, {
     data: data,
     update_last_played: updateLastPlayed,

diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
@@ -101,9 +101,17 @@ export default defineStore("roms", {
     addToRecent(rom: SimpleRom) {
       this.recentRoms = [rom, ...this.recentRoms];
     },
+    removeFromRecent(rom: SimpleRom) {
+      this.recentRoms = this.recentRoms.filter((value) => value.id !== rom.id);
+    },
     addToContinuePlaying(rom: SimpleRom) {
       this.continuePlayingRoms = [rom, ...this.continuePlayingRoms];
     },
+    removeFromContinuePlaying(rom: SimpleRom) {
+      this.continuePlayingRoms = this.continuePlayingRoms.filter(
+        (value) => value.id !== rom.id,
+      );
+    },
     update(rom: SimpleRom) {
       this.allRoms = this.allRoms.map((value) =>
         value.id === rom.id ? rom : value,