From 778d2fcbd4cda7d712a8e843fab0fbde8041e018 Mon Sep 17 00:00:00 2001
From: Kasper Seweryn <github@wvffle.net>
Date: Wed, 7 Sep 2022 13:10:22 +0000
Subject: [PATCH] Fix remote search

---
 api/funkwhale_api/federation/tasks.py     |  2 +-
 changes/changelog.d/1976.bugfix           |  1 +
 front/src/components/RemoteSearchForm.vue | 16 +++++++++-------
 3 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 changes/changelog.d/1976.bugfix

diff --git a/api/funkwhale_api/federation/tasks.py b/api/funkwhale_api/federation/tasks.py
index 9ad4da160..aac52ce9c 100644
--- a/api/funkwhale_api/federation/tasks.py
+++ b/api/funkwhale_api/federation/tasks.py
@@ -350,7 +350,7 @@ def fetch(fetch_obj):
         return error(
             "http",
             status_code=e.response.status_code if e.response else None,
-            message=response.text,
+            message=e.response.text,
         )
     except requests.exceptions.Timeout:
         return error("timeout")
diff --git a/changes/changelog.d/1976.bugfix b/changes/changelog.d/1976.bugfix
new file mode 100644
index 000000000..f82a110ce
--- /dev/null
+++ b/changes/changelog.d/1976.bugfix
@@ -0,0 +1 @@
+Fix remote search (#1857)
diff --git a/front/src/components/RemoteSearchForm.vue b/front/src/components/RemoteSearchForm.vue
index 797c7803a..302ccb96a 100644
--- a/front/src/components/RemoteSearchForm.vue
+++ b/front/src/components/RemoteSearchForm.vue
@@ -1,11 +1,14 @@
 <script setup lang="ts">
 import type { BackendError } from '~/types'
 
-import axios from 'axios'
-import { useStore } from '~/store'
 import { ref, computed, watch, watchEffect } from 'vue'
-import { useRouter } from 'vue-router'
 import { useGettext } from 'vue3-gettext'
+import { useRouter } from 'vue-router'
+import { useStore } from '~/store'
+
+import axios from 'axios'
+
+import updateQueryString from '~/composables/updateQueryString'
 
 type Type = 'rss' | 'artists' | 'both'
 
@@ -99,10 +102,10 @@ const submit = () => {
 
 const isLoading = ref(false)
 const createFetch = async () => {
+  console.log(id.value, props.standalone)
   if (!id.value) return
   if (props.standalone) {
-    // TODO (wvffle): Check if this needs to be handled
-    return router.replace({ name: 'search', query: { id: id.value } })
+    history.replaceState(history.state, '', updateQueryString(location.href, 'id', id.value))
   }
 
   obj.value = undefined
@@ -128,8 +131,7 @@ const store = useStore()
 const rssSubscribe = async () => {
   if (!id.value) return
   if (props.standalone) {
-    // TODO (wvffle): Check if this needs to be handled
-    return router.replace({ name: 'search', query: { id: id.value, type: 'rss' } })
+    history.replaceState(history.state, '', updateQueryString(location.href, 'id', id.value))
   }
 
   obj.value = undefined