diff --git a/assets/jsons/translations/de.json b/assets/jsons/translations/de.json index d280acd0..f189ba08 100644 --- a/assets/jsons/translations/de.json +++ b/assets/jsons/translations/de.json @@ -832,7 +832,8 @@ "tags": "Stichwörter", "specificities": "Allgemein", "requirements": "Anforderungen", - "exclude": "Ausschließen" + "exclude": "Ausschließen", + "leaderboard": "leaderboard" }, "map-types": { "accuracy": "Präzision", @@ -888,6 +889,12 @@ "verified": "Verifiziert", "fullSpread": "Full Spread" }, + "map-leaderboard": { + "All": "All", + "Ranked": "Ranked", + "BeatLeader": "BeatLeader", + "ScoreSaber": "ScoreSaber" + }, "map-excludes": { "installed": "Installiert" }, diff --git a/assets/jsons/translations/en.json b/assets/jsons/translations/en.json index 6bf60e2f..c9b679a5 100644 --- a/assets/jsons/translations/en.json +++ b/assets/jsons/translations/en.json @@ -839,7 +839,8 @@ "tags": "tags", "specificities": "general", "requirements": "requirements", - "exclude": "exclude" + "exclude": "exclude", + "leaderboard": "leaderboard" }, "map-types": { "accuracy": "accuracy", @@ -895,6 +896,12 @@ "verified": "verified", "fullSpread": "full spread" }, + "map-leaderboard": { + "All": "All", + "Ranked": "Ranked", + "BeatLeader": "BeatLeader", + "ScoreSaber": "ScoreSaber" + }, "map-excludes": { "installed": "installed" }, diff --git a/assets/jsons/translations/es.json b/assets/jsons/translations/es.json index 0ea57cbb..908aa321 100644 --- a/assets/jsons/translations/es.json +++ b/assets/jsons/translations/es.json @@ -832,7 +832,8 @@ "tags": "tags", "specificities": "general", "requirements": "requisitos", - "exclude": "excluir" + "exclude": "excluir", + "leaderboard": "leaderboard" }, "map-types": { "accuracy": "precisión", @@ -888,6 +889,12 @@ "verified": "verificado", "fullSpread": "panel completo" }, + "map-leaderboard": { + "All": "All", + "Ranked": "Ranked", + "BeatLeader": "BeatLeader", + "ScoreSaber": "ScoreSaber" + }, "map-excludes": { "installed": "instalado" }, diff --git a/assets/jsons/translations/fr.json b/assets/jsons/translations/fr.json index 0695a01a..1f7b7103 100644 --- a/assets/jsons/translations/fr.json +++ b/assets/jsons/translations/fr.json @@ -833,7 +833,8 @@ "tags": "tags", "specificities": "général", "requirements": "requis", - "exclude": "exclure" + "exclude": "exclure", + "leaderboard": "leaderboard" }, "map-types": { "accuracy": "précision", @@ -889,6 +890,12 @@ "verified": "vérifiée", "fullSpread": "panel complet" }, + "map-leaderboard": { + "All": "All", + "Ranked": "Ranked", + "BeatLeader": "BeatLeader", + "ScoreSaber": "ScoreSaber" + }, "map-excludes": { "installed": "installé" }, diff --git a/assets/jsons/translations/ja.json b/assets/jsons/translations/ja.json index eb259009..b1209ad2 100644 --- a/assets/jsons/translations/ja.json +++ b/assets/jsons/translations/ja.json @@ -832,7 +832,8 @@ "tags": "タグ", "specificities": "一般", "requirements": "要Mod", - "exclude": "除外する" + "exclude": "除外する", + "leaderboard": "leaderboard" }, "map-types": { "accuracy": "正確", @@ -888,6 +889,12 @@ "verified": "認証済み", "fullSpread": "フルスプレッド" }, + "map-leaderboard": { + "All": "All", + "Ranked": "Ranked", + "BeatLeader": "BeatLeader", + "ScoreSaber": "ScoreSaber" + }, "map-excludes": { "installed": "インストール済み" }, diff --git a/assets/jsons/translations/ru.json b/assets/jsons/translations/ru.json index 7e4c1a13..be1bcba6 100644 --- a/assets/jsons/translations/ru.json +++ b/assets/jsons/translations/ru.json @@ -831,7 +831,8 @@ "tags": "тэги", "specificities": "основное", "requirements": "требуемые моды", - "exclude": "исключить" + "exclude": "исключить", + "leaderboard": "leaderboard" }, "map-types": { "accuracy": "точность", @@ -887,6 +888,12 @@ "verified": "проверенные авторы", "fullSpread": "полный набор" }, + "map-leaderboard": { + "All": "All", + "Ranked": "Ranked", + "BeatLeader": "BeatLeader", + "ScoreSaber": "ScoreSaber" + }, "map-excludes": { "installed": "установленный" }, diff --git a/assets/jsons/translations/zh-tw.json b/assets/jsons/translations/zh-tw.json index 598bd6f1..37aaeace 100644 --- a/assets/jsons/translations/zh-tw.json +++ b/assets/jsons/translations/zh-tw.json @@ -832,7 +832,8 @@ "tags": "標籤", "specificities": "general", "requirements": "要求", - "exclude": "排除" + "exclude": "排除", + "leaderboard": "leaderboard" }, "map-types": { "accuracy": "精確度", @@ -888,6 +889,12 @@ "verified": "Verified", "fullSpread": "Full spread" }, + "map-leaderboard": { + "All": "All", + "Ranked": "Ranked", + "BeatLeader": "BeatLeader", + "ScoreSaber": "ScoreSaber" + }, "map-excludes": { "installed": "已安裝" }, diff --git a/assets/jsons/translations/zh.json b/assets/jsons/translations/zh.json index 3e0f263b..b7f2624d 100644 --- a/assets/jsons/translations/zh.json +++ b/assets/jsons/translations/zh.json @@ -832,7 +832,8 @@ "tags": "标签", "specificities": "general", "requirements": "要求", - "exclude": "排除" + "exclude": "排除", + "leaderboard": "leaderboard" }, "map-types": { "accuracy": "精确度", @@ -888,6 +889,12 @@ "verified": "verified", "fullSpread": "full spread" }, + "map-leaderboard": { + "All": "All", + "Ranked": "Ranked", + "BeatLeader": "BeatLeader", + "ScoreSaber": "ScoreSaber" + }, "map-excludes": { "installed": "已安装" }, diff --git a/src/main/services/thrid-party/beat-saver/beat-saver-api.service.ts b/src/main/services/thrid-party/beat-saver/beat-saver-api.service.ts index 8ccb2eed..75b911d6 100644 --- a/src/main/services/thrid-party/beat-saver/beat-saver-api.service.ts +++ b/src/main/services/thrid-party/beat-saver/beat-saver-api.service.ts @@ -1,5 +1,5 @@ import { BsvMapDetail } from "shared/models/maps"; -import { BsvPlaylistPage, MapFilter, PlaylistSearchParams, PlaylistSearchResponse, SearchParams, SearchResponse } from "shared/models/maps/beat-saver.model"; +import { BsvPlaylistPage, MapFilter, MapLeaderboard, PlaylistSearchParams, PlaylistSearchResponse, SearchParams, SearchResponse } from "shared/models/maps/beat-saver.model"; import { RequestService } from "../../request.service"; import { CustomError } from "shared/models/exceptions/custom-error.class"; @@ -32,6 +32,10 @@ export class BeatSaverApiService { return new URLSearchParams(); } + if (!filter.leaderboard) { + filter.leaderboard = MapLeaderboard.All; + } + const enbledTagsString = filter.enabledTags ? Array.from(filter.enabledTags) : null; const excludedTagsString = filter.excludedTags ? Array.from(filter.excludedTags).map(tag => `!${tag}`) : null; diff --git a/src/renderer/components/maps-playlists-panel/maps/filter-panel.component.tsx b/src/renderer/components/maps-playlists-panel/maps/filter-panel.component.tsx index 07a4fc3e..1917de54 100644 --- a/src/renderer/components/maps-playlists-panel/maps/filter-panel.component.tsx +++ b/src/renderer/components/maps-playlists-panel/maps/filter-panel.component.tsx @@ -1,4 +1,4 @@ -import { BsvMapDetail, MapFilter, MapRequirement, MapSpecificity, MapStyle, MapTag, MapType } from "shared/models/maps/beat-saver.model"; +import { BsvMapDetail, MapFilter, MapLeaderboard, MapRequirement, MapSpecificity, MapStyle, MapTag, MapType } from "shared/models/maps/beat-saver.model"; import { motion } from "framer-motion"; import { MutableRefObject, useEffect, useRef, useState } from "react"; import { BsmCheckbox } from "../../shared/bsm-checkbox.component"; @@ -14,6 +14,8 @@ import { BsmLocalMap } from "shared/models/maps/bsm-local-map.interface"; import { SongDetails } from "shared/models/maps"; import formatDuration from "format-duration"; import { MapInfo } from "shared/models/maps/info/map-info.model"; +import { BsmSelect, BsmSelectOption } from "renderer/components/shared/bsm-select.component"; +import { useConstant } from "renderer/hooks/use-constant.hook"; export type Props = { className?: string; @@ -45,6 +47,13 @@ export function FilterPanel({ className, ref, playlist = false, filter, localDat const isTagActivated = (tag: MapTag): boolean => filter?.enabledTags?.has(tag) || filter?.excludedTags?.has(tag); const isTagExcluded = (tag: MapTag): boolean => filter?.excludedTags?.has(tag); + const leaderboardOptions: BsmSelectOption[] = useConstant( + () => Object.values(MapLeaderboard).map(key => ({ + text: `maps.map-leaderboard.${key}`, + value: key, + })) + ); + useEffect(() => { if (firstRun.current) { firstRun.current = false; @@ -137,10 +146,6 @@ export function FilterPanel({ className, ref, playlist = false, filter, localDat return t(`maps.map-styles.${style}`); }; - const translateMapSpecificity = (specificity: MapSpecificity): string => { - return t(`maps.map-specificities.${specificity}`); - }; - type BooleanKeys = { [k in keyof T]: T[k] extends boolean ? k : never }[keyof T]; const handleCheckbox = (key: BooleanKeys) => { @@ -153,6 +158,12 @@ export function FilterPanel({ className, ref, playlist = false, filter, localDat onChange(newFilter); }; + const handleLeaderboardChange = (value: MapLeaderboard) => { + const newFilter = { ...(filter ?? {}) }; + newFilter.leaderboard = value; + onChange(newFilter); + } + const handleApply = () => { onApply(filter); setHaveChanged(() => false); @@ -173,9 +184,17 @@ export function FilterPanel({ className, ref, playlist = false, filter, localDat {Object.values(MapSpecificity).map(specificity => (
handleCheckbox(specificity)}> handleCheckbox(specificity)} /> - {translateMapSpecificity(specificity)} + {t(`maps.map-specificities.${specificity}`)}
))} + +

{t("maps.map-filter-panel.leaderboard")}

+ +

{t("maps.map-filter-panel.requirements")}

{Object.values(MapRequirement).map(requirement => (
handleCheckbox(requirement)}> diff --git a/src/shared/models/maps/beat-saver.model.ts b/src/shared/models/maps/beat-saver.model.ts index d8d2c1d2..5f1f2322 100644 --- a/src/shared/models/maps/beat-saver.model.ts +++ b/src/shared/models/maps/beat-saver.model.ts @@ -209,11 +209,16 @@ export enum MapRequirement { export enum MapSpecificity { Automapper = "automapper", - Ranked = "ranked", Curated = "curated", Verified = "verified", FullSpread = "fullSpread" +} +export enum MapLeaderboard { + All = "All", + Ranked = "Ranked", + BeatLeader = "BeatLeader", + ScoreSaber = "ScoreSaber", } // [ Admin, Uploader, SageScore, None ] @@ -235,7 +240,7 @@ export interface MapFilter { from?: number; to?: number; fullSpread?: boolean; - ranked?: boolean; + leaderboard?: string; installed?: boolean; minDuration?: number; maxDuration?: number;