fix: Improve some implicit playtime filtering

FlashpointProject · Mar 21, 2024 · 54d4255 · 54d4255
1 parent fbf1ed5
commit 54d4255
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "@fortawesome/fontawesome-svg-core": "1.2.36",
     "@fortawesome/free-solid-svg-icons": "5.15.4",
     "@fortawesome/react-fontawesome": "0.1.18",
-    "@fparchive/flashpoint-archive": "0.7.4",
+    "@fparchive/flashpoint-archive": "0.7.5",
     "@types/react-virtualized": "^9.21.21",
     "axios": "1.6.7",
     "connected-react-router": "6.9.2",

diff --git a/src/back/responses.ts b/src/back/responses.ts
@@ -2499,14 +2499,14 @@ function adjustGameFilter(state: BackState, query: ViewQuery, search: GameSearch
       search.order.column = GameSearchSortable.RELEASEDATE;
       break;
     case 'lastPlayed':
-      if (!search.filter.higherThan.playtime && search.filter.equalTo.playcount === undefined && !query.playlistId) {
+      if (!search.filter.higherThan.playcount && search.filter.equalTo.playcount === undefined && search.filter.equalTo.playtime === undefined && !query.playlistId) {
         // When searching outside a playlist, treat playtime sorting like a history
         search.filter.higherThan.playcount = 0;
       }
       search.order.column = GameSearchSortable.LASTPLAYED;
       break;
     case 'playtime':
-      if (!search.filter.higherThan.playcount && search.filter.equalTo.playcount === undefined && !query.playlistId) {
+      if (!search.filter.higherThan.playcount && search.filter.equalTo.playcount === undefined && search.filter.equalTo.playtime === undefined && !query.playlistId) {
         // When searching outside a playlist, treat playtime sorting like a history
         search.filter.higherThan.playcount = 0;
       }