diff --git a/apps/app-frontend/src/locales/ar-SA/index.json b/apps/app-frontend/src/locales/ar-SA/index.json index afe728b790..a49b70a290 100644 --- a/apps/app-frontend/src/locales/ar-SA/index.json +++ b/apps/app-frontend/src/locales/ar-SA/index.json @@ -455,9 +455,6 @@ "app.project.install-context.back-to-browse": { "message": "العودة إلى الاستكشاف" }, - "app.project.install-context.install-content-to-instance": { - "message": "تثبيت المحتويات الى النموذج" - }, "app.project.version.all-versions": { "message": "جميع الإصدارات" }, diff --git a/apps/app-frontend/src/locales/cs-CZ/index.json b/apps/app-frontend/src/locales/cs-CZ/index.json index ced52dbe9d..e638f5384e 100644 --- a/apps/app-frontend/src/locales/cs-CZ/index.json +++ b/apps/app-frontend/src/locales/cs-CZ/index.json @@ -392,9 +392,6 @@ "app.project.install-context.back-to-browse": { "message": "Zpět k Objevování" }, - "app.project.install-context.install-content-to-instance": { - "message": "Nainstalovat obsah do instance" - }, "app.project.version.all-versions": { "message": "Všechny verze" }, diff --git a/apps/app-frontend/src/locales/da-DK/index.json b/apps/app-frontend/src/locales/da-DK/index.json index 7c82bf3f57..335285b5a2 100644 --- a/apps/app-frontend/src/locales/da-DK/index.json +++ b/apps/app-frontend/src/locales/da-DK/index.json @@ -296,9 +296,6 @@ "app.project.install-context.back-to-browse": { "message": "Tilbage til udforsk" }, - "app.project.install-context.install-content-to-instance": { - "message": "Installer indhold til instance" - }, "app.project.versions.already-installed": { "message": "Allerede installeret" }, diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json index 812d8092f3..0aaf9c234b 100644 --- a/apps/app-frontend/src/locales/de-CH/index.json +++ b/apps/app-frontend/src/locales/de-CH/index.json @@ -455,9 +455,6 @@ "app.project.install-context.back-to-browse": { "message": "Zurück zu Entdecken" }, - "app.project.install-context.install-content-to-instance": { - "message": "Inhalt in Instanz installieren" - }, "app.project.version.all-versions": { "message": "Alle Versionen" }, diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json index 29aafd0a7d..4a90ed285b 100644 --- a/apps/app-frontend/src/locales/de-DE/index.json +++ b/apps/app-frontend/src/locales/de-DE/index.json @@ -455,9 +455,6 @@ "app.project.install-context.back-to-browse": { "message": "Zurück zum Entdecken" }, - "app.project.install-context.install-content-to-instance": { - "message": "Inhalt in Instanz installieren" - }, "app.project.version.all-versions": { "message": "Alle Versionen" }, diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json index fa1ab6c67c..0ac2a27637 100644 --- a/apps/app-frontend/src/locales/en-US/index.json +++ b/apps/app-frontend/src/locales/en-US/index.json @@ -479,9 +479,6 @@ "app.project.install-context.back-to-browse": { "message": "Back to discover" }, - "app.project.install-context.install-content-to-instance": { - "message": "Install content to instance" - }, "app.project.version.all-versions": { "message": "All versions" }, diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json index b153103776..f15e7aa424 100644 --- a/apps/app-frontend/src/locales/es-419/index.json +++ b/apps/app-frontend/src/locales/es-419/index.json @@ -455,9 +455,6 @@ "app.project.install-context.back-to-browse": { "message": "Volver al explorador" }, - "app.project.install-context.install-content-to-instance": { - "message": "Instalar contenido a la instancia" - }, "app.project.version.all-versions": { "message": "Todas las versiones" }, diff --git a/apps/app-frontend/src/locales/es-ES/index.json b/apps/app-frontend/src/locales/es-ES/index.json index 78b4bb0801..4debc08ce9 100644 --- a/apps/app-frontend/src/locales/es-ES/index.json +++ b/apps/app-frontend/src/locales/es-ES/index.json @@ -296,9 +296,6 @@ "app.project.install-context.back-to-browse": { "message": "Volver a descubrir" }, - "app.project.install-context.install-content-to-instance": { - "message": "Instalar contenido" - }, "app.settings.developer-mode-enabled": { "message": "Modo desarrollador activado." }, diff --git a/apps/app-frontend/src/locales/fi-FI/index.json b/apps/app-frontend/src/locales/fi-FI/index.json index 2cb4f475b2..ea075da8f9 100644 --- a/apps/app-frontend/src/locales/fi-FI/index.json +++ b/apps/app-frontend/src/locales/fi-FI/index.json @@ -377,9 +377,6 @@ "app.project.install-context.back-to-browse": { "message": "Takaisin sisällön löytöön" }, - "app.project.install-context.install-content-to-instance": { - "message": "Asenna sisältöä instanssiin" - }, "app.settings.developer-mode-enabled": { "message": "Kehittäjätila käytössä." }, diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json index e48b58427f..76d4e6f3db 100644 --- a/apps/app-frontend/src/locales/fr-FR/index.json +++ b/apps/app-frontend/src/locales/fr-FR/index.json @@ -431,9 +431,6 @@ "app.project.install-context.back-to-browse": { "message": "Retour vers la page découvrir" }, - "app.project.install-context.install-content-to-instance": { - "message": "Installer du contenu à l'instance" - }, "app.project.version.all-versions": { "message": "Toutes les versions" }, diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json index 9968e504d9..473e9d8116 100644 --- a/apps/app-frontend/src/locales/hu-HU/index.json +++ b/apps/app-frontend/src/locales/hu-HU/index.json @@ -455,9 +455,6 @@ "app.project.install-context.back-to-browse": { "message": "Vissza a böngészéshez" }, - "app.project.install-context.install-content-to-instance": { - "message": "Tartalom telepítése a példányba" - }, "app.project.version.all-versions": { "message": "Összes verzió" }, diff --git a/apps/app-frontend/src/locales/id-ID/index.json b/apps/app-frontend/src/locales/id-ID/index.json index cb9c1ec662..9b809dd0c9 100644 --- a/apps/app-frontend/src/locales/id-ID/index.json +++ b/apps/app-frontend/src/locales/id-ID/index.json @@ -272,9 +272,6 @@ "app.project.install-context.back-to-browse": { "message": "Kembali ke halaman pencarian" }, - "app.project.install-context.install-content-to-instance": { - "message": "Pasang konten ke instans" - }, "app.settings.developer-mode-enabled": { "message": "Mode pengembang dihidupkan." }, diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json index e777f291f2..128a94c905 100644 --- a/apps/app-frontend/src/locales/it-IT/index.json +++ b/apps/app-frontend/src/locales/it-IT/index.json @@ -452,9 +452,6 @@ "app.project.install-context.back-to-browse": { "message": "Torna a Esplora" }, - "app.project.install-context.install-content-to-instance": { - "message": "Installa il contenuto nell'istanza" - }, "app.project.version.all-versions": { "message": "Tutte le versioni" }, diff --git a/apps/app-frontend/src/locales/ko-KR/index.json b/apps/app-frontend/src/locales/ko-KR/index.json index 1130c6faaa..3794025bc2 100644 --- a/apps/app-frontend/src/locales/ko-KR/index.json +++ b/apps/app-frontend/src/locales/ko-KR/index.json @@ -383,9 +383,6 @@ "app.project.install-context.back-to-browse": { "message": "탐색으로 돌아가기" }, - "app.project.install-context.install-content-to-instance": { - "message": "인스턴스에 콘텐츠 설치" - }, "app.settings.developer-mode-enabled": { "message": "개발자 모드가 활성화되었습니다." }, diff --git a/apps/app-frontend/src/locales/ms-MY/index.json b/apps/app-frontend/src/locales/ms-MY/index.json index a9264ff154..3a106aa251 100644 --- a/apps/app-frontend/src/locales/ms-MY/index.json +++ b/apps/app-frontend/src/locales/ms-MY/index.json @@ -287,9 +287,6 @@ "app.project.install-context.back-to-browse": { "message": "Kembali menemukan" }, - "app.project.install-context.install-content-to-instance": { - "message": "Pasang kandungan ke dalam pemasangan" - }, "app.settings.developer-mode-enabled": { "message": "Mod pembangun didayakan." }, diff --git a/apps/app-frontend/src/locales/nl-NL/index.json b/apps/app-frontend/src/locales/nl-NL/index.json index 9110075f4e..d23d1c2183 100644 --- a/apps/app-frontend/src/locales/nl-NL/index.json +++ b/apps/app-frontend/src/locales/nl-NL/index.json @@ -272,9 +272,6 @@ "app.project.install-context.back-to-browse": { "message": "Terug naar Ontdekken" }, - "app.project.install-context.install-content-to-instance": { - "message": "Installeer content naar instantie" - }, "app.settings.developer-mode-enabled": { "message": "Ontwikkelaarsmodus ingeschakeld." }, diff --git a/apps/app-frontend/src/locales/pl-PL/index.json b/apps/app-frontend/src/locales/pl-PL/index.json index 017d58e8ff..42b0026901 100644 --- a/apps/app-frontend/src/locales/pl-PL/index.json +++ b/apps/app-frontend/src/locales/pl-PL/index.json @@ -452,9 +452,6 @@ "app.project.install-context.back-to-browse": { "message": "Powróć do odkrywania" }, - "app.project.install-context.install-content-to-instance": { - "message": "Zainstaluj zasoby do instancji" - }, "app.project.version.all-versions": { "message": "Wszystkie wersje" }, diff --git a/apps/app-frontend/src/locales/pt-BR/index.json b/apps/app-frontend/src/locales/pt-BR/index.json index 450b9d5272..96fe5f3eb1 100644 --- a/apps/app-frontend/src/locales/pt-BR/index.json +++ b/apps/app-frontend/src/locales/pt-BR/index.json @@ -455,9 +455,6 @@ "app.project.install-context.back-to-browse": { "message": "Voltar a descobrir" }, - "app.project.install-context.install-content-to-instance": { - "message": "Instalar conteúdo para a instância" - }, "app.project.version.all-versions": { "message": "Todas as versões" }, diff --git a/apps/app-frontend/src/locales/ru-RU/index.json b/apps/app-frontend/src/locales/ru-RU/index.json index fe45983a29..7cbc67c537 100644 --- a/apps/app-frontend/src/locales/ru-RU/index.json +++ b/apps/app-frontend/src/locales/ru-RU/index.json @@ -449,9 +449,6 @@ "app.project.install-context.back-to-browse": { "message": "Вернуться к поиску" }, - "app.project.install-context.install-content-to-instance": { - "message": "Установка контента в сборку" - }, "app.project.version.all-versions": { "message": "Все версии" }, diff --git a/apps/app-frontend/src/locales/sr-CS/index.json b/apps/app-frontend/src/locales/sr-CS/index.json index 63a677601f..4cf48d28fc 100644 --- a/apps/app-frontend/src/locales/sr-CS/index.json +++ b/apps/app-frontend/src/locales/sr-CS/index.json @@ -401,9 +401,6 @@ "app.project.install-context.back-to-browse": { "message": "Nazad da otkrivanje" }, - "app.project.install-context.install-content-to-instance": { - "message": "Instaliraj sadržaj na instancu" - }, "app.project.version.all-versions": { "message": "Sve verzije" }, diff --git a/apps/app-frontend/src/locales/sv-SE/index.json b/apps/app-frontend/src/locales/sv-SE/index.json index 3834d74dd3..3873b255a7 100644 --- a/apps/app-frontend/src/locales/sv-SE/index.json +++ b/apps/app-frontend/src/locales/sv-SE/index.json @@ -437,9 +437,6 @@ "app.project.install-context.back-to-browse": { "message": "Tillbaka till upptäck" }, - "app.project.install-context.install-content-to-instance": { - "message": "Installera innehåll till instans" - }, "app.project.version.all-versions": { "message": "Alla versioner" }, diff --git a/apps/app-frontend/src/locales/th-TH/index.json b/apps/app-frontend/src/locales/th-TH/index.json index 21b2a6fe54..26a7ecd51e 100644 --- a/apps/app-frontend/src/locales/th-TH/index.json +++ b/apps/app-frontend/src/locales/th-TH/index.json @@ -272,9 +272,6 @@ "app.project.install-context.back-to-browse": { "message": "กลับไปที่หน้าค้นหา" }, - "app.project.install-context.install-content-to-instance": { - "message": "ติดตั้งเนื้อหาลงสู่อินสแตนซ์" - }, "app.settings.developer-mode-enabled": { "message": "โหมดนักพัฒนาเปิดอยู่" }, diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json index c792865f6d..85ec4095d4 100644 --- a/apps/app-frontend/src/locales/tr-TR/index.json +++ b/apps/app-frontend/src/locales/tr-TR/index.json @@ -455,9 +455,6 @@ "app.project.install-context.back-to-browse": { "message": "Keşfete geri dön" }, - "app.project.install-context.install-content-to-instance": { - "message": "İçeriği kuruluma yükle" - }, "app.project.version.all-versions": { "message": "Tüm sürümler" }, diff --git a/apps/app-frontend/src/locales/uk-UA/index.json b/apps/app-frontend/src/locales/uk-UA/index.json index ba7ef5c2fe..38518ccfd6 100644 --- a/apps/app-frontend/src/locales/uk-UA/index.json +++ b/apps/app-frontend/src/locales/uk-UA/index.json @@ -416,9 +416,6 @@ "app.project.install-context.back-to-browse": { "message": "Повернутися до дослідження" }, - "app.project.install-context.install-content-to-instance": { - "message": "Установити вміст до профілю" - }, "app.settings.developer-mode-enabled": { "message": "Увімкнено режим розробника." }, diff --git a/apps/app-frontend/src/locales/vi-VN/index.json b/apps/app-frontend/src/locales/vi-VN/index.json index 409ee82634..f776d660f3 100644 --- a/apps/app-frontend/src/locales/vi-VN/index.json +++ b/apps/app-frontend/src/locales/vi-VN/index.json @@ -272,9 +272,6 @@ "app.project.install-context.back-to-browse": { "message": "Quay lại trang Khám Phá" }, - "app.project.install-context.install-content-to-instance": { - "message": "Cài đặt nội dung vào phiên bản" - }, "app.settings.developer-mode-enabled": { "message": "Chế độ nhà phát triển đã được bật." }, diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json index 2e0e470cd4..479d8af71b 100644 --- a/apps/app-frontend/src/locales/zh-CN/index.json +++ b/apps/app-frontend/src/locales/zh-CN/index.json @@ -455,9 +455,6 @@ "app.project.install-context.back-to-browse": { "message": "返回发现页" }, - "app.project.install-context.install-content-to-instance": { - "message": "将内容安装到实例中" - }, "app.project.version.all-versions": { "message": "所有版本" }, diff --git a/apps/app-frontend/src/locales/zh-TW/index.json b/apps/app-frontend/src/locales/zh-TW/index.json index 1c53292acd..ecf676ad56 100644 --- a/apps/app-frontend/src/locales/zh-TW/index.json +++ b/apps/app-frontend/src/locales/zh-TW/index.json @@ -455,9 +455,6 @@ "app.project.install-context.back-to-browse": { "message": "返回瀏覽" }, - "app.project.install-context.install-content-to-instance": { - "message": "將內容安裝至實例" - }, "app.project.version.all-versions": { "message": "所有版本" }, diff --git a/apps/app-frontend/src/pages/Browse.vue b/apps/app-frontend/src/pages/Browse.vue index 815aa137c1..cc0fe68582 100644 --- a/apps/app-frontend/src/pages/Browse.vue +++ b/apps/app-frontend/src/pages/Browse.vue @@ -72,6 +72,7 @@ const debugLog = useDebugLogger('Browse') const router = useRouter() const route = useRoute() const themeStore = useTheming() +const browseRouteActive = computed(() => route.path.startsWith('/browse/')) const serverSetupModalRef = ref | null>(null) const serverInstallContent = createServerInstallContent({ serverSetupModalRef }) provideServerInstallContent(serverInstallContent) @@ -490,6 +491,9 @@ function resetInstanceContext() { watch( () => route.params.projectType as ProjectType, async (newType) => { + if (!browseRouteActive.value) { + return + } if (isSetupServerContext.value) { enforceSetupModpackRoute(newType) if (newType !== 'modpack') return @@ -960,6 +964,7 @@ const lockedFilterMessages = computed(() => ({ const searchState = useBrowseSearch({ projectType, tags, + active: browseRouteActive, providedFilters: combinedProvidedFilters, search, persistentQueryParams: ['i', 'ai', 'shi', 'sid', 'wid', 'from'], @@ -1035,6 +1040,9 @@ onUnmounted(() => { }) function getProjectBrowseQuery() { + if (!browseRouteActive.value) { + return undefined + } if (!installContext.value) return undefined return { ...route.query, @@ -1139,7 +1147,7 @@ provideBrowseManager({ @browse-modpacks="() => {}" @create="handleServerModpackFlowCreate" /> - + diff --git a/apps/app-frontend/src/pages/project/Index.vue b/apps/app-frontend/src/pages/project/Index.vue index a4aff5dfa6..52c50fc968 100644 --- a/apps/app-frontend/src/pages/project/Index.vue +++ b/apps/app-frontend/src/pages/project/Index.vue @@ -320,10 +320,6 @@ const messages = defineMessages({ id: 'app.project.install-button.already-installed', defaultMessage: 'This project is already installed', }, - installContentToInstance: { - id: 'app.project.install-context.install-content-to-instance', - defaultMessage: 'Install content to instance', - }, switchVersion: { id: 'app.project.install-button.switch-version', defaultMessage: 'Switch version', @@ -450,7 +446,7 @@ const projectInstallContext = computed(() => { iconSrc: instance.value.icon_path ? convertFileSrc(instance.value.icon_path) : null, backUrl: projectBrowseBackUrl.value, backLabel: formatMessage(messages.backToBrowse), - heading: formatMessage(messages.installContentToInstance), + heading: formatMessage(commonMessages.installingContentLabel), } } diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json index a3fbe84593..5bc45be605 100644 --- a/apps/frontend/src/locales/en-US/index.json +++ b/apps/frontend/src/locales/en-US/index.json @@ -3455,6 +3455,9 @@ "project.gallery.title": { "message": "Gallery" }, + "project.install-context.back-to-discover": { + "message": "Back to discover" + }, "project.license.error": { "message": "License text could not be retrieved." }, diff --git a/apps/frontend/src/locales/hu-HU/index.json b/apps/frontend/src/locales/hu-HU/index.json index 0eed49da95..4faa0c0824 100644 --- a/apps/frontend/src/locales/hu-HU/index.json +++ b/apps/frontend/src/locales/hu-HU/index.json @@ -2963,9 +2963,6 @@ "profile.label.collection": { "message": "Gyűjtemény" }, - "profile.label.downloads": { - "message": "{count} {countPlural, plural, one {letöltés} other {letöltések}}" - }, "profile.label.joined": { "message": "Csatlakozott" }, @@ -2984,9 +2981,6 @@ "profile.label.organizations": { "message": "Szervezetek" }, - "profile.label.projects": { - "message": "{count} {countPlural, plural, one {projekt} other {projektek}}" - }, "profile.label.saving": { "message": "Mentés..." }, @@ -3458,12 +3452,6 @@ "project.settings.visit-dashboard": { "message": "Projektek irányítópult megnyitása" }, - "project.stats.downloads-label": { - "message": "{count} letöltés" - }, - "project.stats.followers-label": { - "message": "{count} követő" - }, "project.status.archived.message": { "message": "A(z) {title} archiválásra került. A(z) {title} nem kap további frissítéseket, kivéve, ha a fejlesztő úgy dönt, hogy visszavonja a projekt archiválását." }, diff --git a/apps/frontend/src/locales/no-NO/index.json b/apps/frontend/src/locales/no-NO/index.json index 503ff00e81..3ed6bb01dd 100644 --- a/apps/frontend/src/locales/no-NO/index.json +++ b/apps/frontend/src/locales/no-NO/index.json @@ -3032,12 +3032,6 @@ "project.settings.visit-dashboard": { "message": "Besøk prosjekt-dashbordet" }, - "project.stats.downloads-label": { - "message": "{count, plural, one {nedlasting} other {nedlastinger}}" - }, - "project.stats.followers-label": { - "message": "{count, plural, one {følger} other {følgere}}" - }, "project.status.archived.message": { "message": "{title} har blitt arkivert. {title} kommer ikke til å få noen nye oppdateringer, hvis ikke forfatteren bestemmer seg for å dearkivere prosjektet." }, diff --git a/apps/frontend/src/pages/[type]/[project].vue b/apps/frontend/src/pages/[type]/[project].vue index 7f908b9904..429efe8d5f 100644 --- a/apps/frontend/src/pages/[type]/[project].vue +++ b/apps/frontend/src/pages/[type]/[project].vue @@ -97,6 +97,22 @@ +
+ +
+
-
+
-
-
+
+
diff --git a/apps/frontend/src/pages/discover/[type]/index.vue b/apps/frontend/src/pages/discover/[type]/index.vue index 5e6721b8c2..350d9bf44f 100644 --- a/apps/frontend/src/pages/discover/[type]/index.vue +++ b/apps/frontend/src/pages/discover/[type]/index.vue @@ -33,6 +33,7 @@ import { cycleValue } from '@modrinth/utils' import { useQueryClient } from '@tanstack/vue-query' import { useTimeoutFn } from '@vueuse/core' import { computed, ref, watch } from 'vue' +import type { LocationQueryRaw } from 'vue-router' import LogoAnimated from '~/components/brand/LogoAnimated.vue' import AdPlaceholder from '~/components/ui/AdPlaceholder.vue' @@ -55,10 +56,6 @@ const client = injectModrinthClient() const queryClient = useQueryClient() const filtersMenuOpen = ref(false) -const stickyInstallHeaderRef = ref(null) - -useStickyObserver(stickyInstallHeaderRef, 'DiscoverInstallHeader') - const route = useRoute() const cosmetics = useCosmetics() @@ -202,49 +199,83 @@ function getServerModpackContent(project: Labrinth.Search.v3.ResultSearchProject return undefined } -async function search(requestParams: string) { +type DiscoverProjectSearchHit = Labrinth.Search.v2.ResultSearchProject & { + version_id?: string | null +} + +function mapV3ProjectHit(hit: Labrinth.Search.v3.ResultSearchProject): DiscoverProjectSearchHit { + return { + ...hit, + project_type: hit.project_types[0] ?? projectTypeId.value, + title: hit.name, + description: hit.summary, + versions: hit.version_id ? [hit.version_id] : [], + latest_version: hit.version_id, + icon_url: hit.icon_url ?? '', + client_side: 'unknown', + server_side: 'unknown', + } +} + +const hostingContextQuery = computed(() => { + const query: LocationQueryRaw = {} + + for (const key of ['sid', 'wid', 'from', 'shi']) { + const value = route.query[key] + if (value != null) { + query[key] = value + } + } + + return Object.keys(query).length > 0 ? query : undefined +}) + +function withHostingContext(path: string) { + return hostingContextQuery.value ? { path, query: hostingContextQuery.value } : path +} + +async function fetchSearch(requestParams: string) { debug('search() called', { requestParams: requestParams.substring(0, 100), isServer: isServerType.value, projectTypeId: projectTypeId.value, }) - const config = useRuntimeConfig() - let base = import.meta.server ? config.apiBaseUrl : config.public.apiBaseUrl - - if (isServerType.value) { - base = base.replace(/\/v\d\//, '/v3/').replace(/\/v\d$/, '/v3') - } - - const url = `${base}search${requestParams}` - debug('search() fetching:', url.substring(0, 120)) - const raw = await $fetch( - url, - { - headers: withLabrinthCanaryHeader(), - }, - ) + const raw = await client.request('/search', { + api: 'labrinth', + version: 3, + method: 'GET', + params: Object.fromEntries(new URLSearchParams(requestParams.replace(/^\?/, ''))), + headers: withLabrinthCanaryHeader(), + }) debug('search() response', { total_hits: raw.total_hits, hitCount: raw.hits?.length }) - if ('hits_per_page' in raw) { - // v3 response (servers) + if (isServerType.value) { return { projectHits: [], - serverHits: raw.hits as Labrinth.Search.v3.ResultSearchProject[], + serverHits: raw.hits, total_hits: raw.total_hits, per_page: raw.hits_per_page, } } return { - projectHits: raw.hits as Labrinth.Search.v2.ResultSearchProject[], + projectHits: raw.hits.map(mapV3ProjectHit), serverHits: [], total_hits: raw.total_hits, - per_page: raw.limit, + per_page: raw.hits_per_page, } } +async function search(requestParams: string) { + return await queryClient.ensureQueryData({ + queryKey: ['discover', 'search', 'v3', requestParams], + queryFn: () => fetchSearch(requestParams), + staleTime: 30_000, + }) +} + function getCardActions( result: Labrinth.Search.v2.ResultSearchProject | Labrinth.Search.v3.ResultSearchProject, currentProjectType: string, @@ -424,7 +455,7 @@ watch( ) debug('calling initial refreshSearch') -searchState.refreshSearch() +await searchState.refreshSearch() const ogTitle = computed(() => searchState.query.value @@ -462,9 +493,11 @@ provideBrowseManager({ projectType: projectTypeId, ...searchState, getProjectLink: (result: Labrinth.Search.v2.ResultSearchProject) => - `/${projectType.value?.id ?? 'project'}/${result.slug ? result.slug : result.project_id}`, + withHostingContext( + `/${projectType.value?.id ?? 'project'}/${result.slug ? result.slug : result.project_id}`, + ), getServerProjectLink: (result: Labrinth.Search.v3.ResultSearchProject) => - `/server/${result.slug ?? result.project_id}`, + withHostingContext(`/server/${result.slug ?? result.project_id}`), selectableProjectTypes: computed(() => []), showProjectTypeTabs: computed(() => false), variant: 'web', @@ -504,25 +537,41 @@ provideBrowseManager({ }, loadingComponent: LogoAnimated, }) + +const stickyInstallHeaderRef = ref(null) +const { isStuck: isInstallHeaderStuck } = useStickyObserver( + stickyInstallHeaderRef, + 'DiscoverInstallHeader', +)