diff --git a/package-lock.json b/package-lock.json index 89f05c433..b871fbf2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,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", @@ -991,24 +991,24 @@ } }, "node_modules/@fparchive/flashpoint-archive": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@fparchive/flashpoint-archive/-/flashpoint-archive-0.7.4.tgz", - "integrity": "sha512-XbfSdQECaWPIJQrk5XB3ydA7ddAFvClhqWt7Vx6SAWNI68ckcASX/RCjtZodNdPj6ueU+SVGj03Jgu3M6oeFQg==", + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@fparchive/flashpoint-archive/-/flashpoint-archive-0.7.5.tgz", + "integrity": "sha512-bUOwIcFybrgrd6OQ4odReBAs4zHKysKh4QvBpuekG6qJg+8n1oTA8TiB5U4j8xSJZIa7/OrNe2DhQMhSZSEdfg==", "engines": { "node": ">= 10" }, "optionalDependencies": { - "@fparchive/flashpoint-archive-darwin-arm64": "0.7.4", - "@fparchive/flashpoint-archive-darwin-x64": "0.7.4", - "@fparchive/flashpoint-archive-linux-x64-gnu": "0.7.4", - "@fparchive/flashpoint-archive-win32-ia32-msvc": "0.7.4", - "@fparchive/flashpoint-archive-win32-x64-msvc": "0.7.4" + "@fparchive/flashpoint-archive-darwin-arm64": "0.7.5", + "@fparchive/flashpoint-archive-darwin-x64": "0.7.5", + "@fparchive/flashpoint-archive-linux-x64-gnu": "0.7.5", + "@fparchive/flashpoint-archive-win32-ia32-msvc": "0.7.5", + "@fparchive/flashpoint-archive-win32-x64-msvc": "0.7.5" } }, "node_modules/@fparchive/flashpoint-archive-darwin-arm64": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@fparchive/flashpoint-archive-darwin-arm64/-/flashpoint-archive-darwin-arm64-0.7.4.tgz", - "integrity": "sha512-FVbQEoJnttPEYhaeaK8i7McOnEWX6hMRX//c6BFHqzeuybP+EHkqQP9dLE5dvGIuPvn/M/prbpBvTMnLP7laqQ==", + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@fparchive/flashpoint-archive-darwin-arm64/-/flashpoint-archive-darwin-arm64-0.7.5.tgz", + "integrity": "sha512-m/gojNfchwviHaT+hLJzL1q/1cVS5h9qKlLd8ZgmqAMpD1FvGXOsgc3Rl109/W65tz6Xq4LKIaat6IJTDqRsYQ==", "cpu": [ "arm64" ], @@ -1021,9 +1021,9 @@ } }, "node_modules/@fparchive/flashpoint-archive-darwin-x64": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@fparchive/flashpoint-archive-darwin-x64/-/flashpoint-archive-darwin-x64-0.7.4.tgz", - "integrity": "sha512-3h8fdfW+mx3rp2dCg1gtDbmSybqOgGP85F2g01HHLkKDXFwqP0iGt3VNgsQjDiPapQBkxQFvENhM50jJzGIrjg==", + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@fparchive/flashpoint-archive-darwin-x64/-/flashpoint-archive-darwin-x64-0.7.5.tgz", + "integrity": "sha512-qzftPyV5AmGEY/Ua/Y3DTRhexIVsZMcgnPui72GG3G9V6X3U9kqRERL8azZjV1/OyNVGnhWbW5h/HJIPSO6fjw==", "cpu": [ "x64" ], @@ -1036,9 +1036,9 @@ } }, "node_modules/@fparchive/flashpoint-archive-linux-x64-gnu": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@fparchive/flashpoint-archive-linux-x64-gnu/-/flashpoint-archive-linux-x64-gnu-0.7.4.tgz", - "integrity": "sha512-TEMb2TzqdOtPbg/ulwOZ7eo8dD1wAuK7FdC4N5NAwVZQ4HKtFVsyZ33IbGUb85+bQG/V1QQoTyQf/Hy15+erWA==", + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@fparchive/flashpoint-archive-linux-x64-gnu/-/flashpoint-archive-linux-x64-gnu-0.7.5.tgz", + "integrity": "sha512-jjBqT68wqJmBwW0PJ/1ObhgjBPxMUJyZWjiTkPAzyQ+7dGjMyqfweDXERfycMtsBg3Oda3fcMM0R7PnQ/SgK4A==", "cpu": [ "x64" ], @@ -1051,9 +1051,9 @@ } }, "node_modules/@fparchive/flashpoint-archive-win32-ia32-msvc": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@fparchive/flashpoint-archive-win32-ia32-msvc/-/flashpoint-archive-win32-ia32-msvc-0.7.4.tgz", - "integrity": "sha512-MIYICKlXZ6ymUB/LLzJuHiySphz9Vh0+sTFAGIFhjRkp8UAlhfWLh1B7coAvCu/3n9bfoAyyKBZJCAqoV8m7jw==", + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@fparchive/flashpoint-archive-win32-ia32-msvc/-/flashpoint-archive-win32-ia32-msvc-0.7.5.tgz", + "integrity": "sha512-nwOI8Lv/F5yMOTB2fJrPnKTzOKVvdpJdbyBaNqz6MhlUhqzurzO3muxrjfuRdwt6NpkcsBK9xGNznhfy2IiP3A==", "cpu": [ "ia32" ], @@ -1066,9 +1066,9 @@ } }, "node_modules/@fparchive/flashpoint-archive-win32-x64-msvc": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@fparchive/flashpoint-archive-win32-x64-msvc/-/flashpoint-archive-win32-x64-msvc-0.7.4.tgz", - "integrity": "sha512-pEnU3p/+MO4FQkee1qErqYl4HeLrJuDIAzBhZ7iNpnHQy0+Vpkaa44VObCZBqp0NhMnZa9RwnCCb5A1jdiAl2w==", + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@fparchive/flashpoint-archive-win32-x64-msvc/-/flashpoint-archive-win32-x64-msvc-0.7.5.tgz", + "integrity": "sha512-1vm0PBMhg3uqwrR2ISF/Wx2Z6si0kwT5WG2ADPU+KZ7Hb8egVDLEDPtJmvXIvwvKnwnze3CMAWjH4PylfFTQRw==", "cpu": [ "x64" ], diff --git a/package.json b/package.json index d7656ba28..fdf364746 100644 --- 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 index 563ded8cf..0f36cc3b5 100644 --- 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; }