fix: Modrinth project search with wrong type

Voxelum · Oct 13, 2023 · 60ae2e7 · 60ae2e7
1 parent f2a65f4
commit 60ae2e7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/xmcl-keystone-ui/src/composables/modContextMenu.ts b/xmcl-keystone-ui/src/composables/modContextMenu.ts
@@ -85,7 +85,7 @@ export function useModItemContextMenuItems(modFile: Ref<ModFile | undefined>, on
       items.push({
         text: t('mod.searchOnModrinth', { name: file.name }),
         onClick: () => {
-          searchInModrinth(file.name)
+          searchInModrinth(file.name, 'mod')
         },
         icon: 'search',
       })

diff --git a/xmcl-keystone-ui/src/composables/useMarketRoute.ts b/xmcl-keystone-ui/src/composables/useMarketRoute.ts
@@ -37,8 +37,8 @@ export function useMarketRoute() {
   function searchInCurseforge(name: string, type: ProjectType) {
     goToCurseforge(`/curseforge/${type}?keyword=${name}`)
   }
-  function searchInModrinth(name: string) {
-    goToModrinth(`/modrinth?query=${name}`)
+  function searchInModrinth(name: string, type: 'mod' | 'modpack' | 'resourcepack' | 'shader') {
+    goToModrinth(`/modrinth?query=${name}&projectType=${type}`)
   }
   function goCurseforgeProject(projectId: number, type: ProjectType) {
     goToCurseforge(`/curseforge/${type}/${projectId}`)

diff --git a/xmcl-keystone-ui/src/views/ResourcePackCard.vue b/xmcl-keystone-ui/src/views/ResourcePackCard.vue
@@ -199,7 +199,7 @@ const contextMenuItems = computed(() => {
     menuItems.push({
       text: t('resourcepack.searchOnModrinth', { name: props.pack.name }),
       onClick: () => {
-        searchInModrinth(props.pack.name)
+        searchInModrinth(props.pack.name, 'resourcepack')
       },
       icon: 'search',
     })

diff --git a/xmcl-keystone-ui/src/windows/app/index.ts b/xmcl-keystone-ui/src/windows/app/index.ts
@@ -53,14 +53,14 @@ app.$mount('#app')
 
 const params = window.location.search.substring(1)
 if (params.startsWith('route=')) {
-  const route = params.substring('route='.length)
+  const route = decodeURIComponent(params.substring('route='.length))
   const split = route.split('/')
   if (split.length > 2) {
     const base = split.slice(0, split.length - 1).join('/')
-    router.push(base)
+    router.replace(base)
     router.push(route)
   } else {
-    router.push(route)
+    router.replace(route)
   }
 }
 

diff --git a/xmcl-keystone-ui/src/windows/app/router.ts b/xmcl-keystone-ui/src/windows/app/router.ts
@@ -10,6 +10,7 @@ import Vue from 'vue'
 Vue.use(Router)
 
 export const router = new Router({
+  mode: 'history',
   routes: [
     {
       path: '/curseforge/:type',