From e4d8b324a582190121ba9229aff43cec22a9eff2 Mon Sep 17 00:00:00 2001
From: Jai A <jaiagr+gpg@pm.me>
Date: Sat, 15 Jul 2023 20:39:16 -0700
Subject: [PATCH] fix threads merge bugs

---
 components/ui/report/ReportView.vue  | 2 +-
 components/ui/report/ReportsList.vue | 6 ++----
 pages/moderation/messages.vue        | 5 ++---
 pages/moderation/review.vue          | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/components/ui/report/ReportView.vue b/components/ui/report/ReportView.vue
index 8e8d269f7d..a3d2195bcf 100644
--- a/components/ui/report/ReportView.vue
+++ b/components/ui/report/ReportView.vue
@@ -74,7 +74,7 @@ async function fetchReport() {
   let users = []
   if (userIds.length > 0) {
     const { data: usersVal } = await useAsyncData(`users?ids=${JSON.stringify(userIds)}`, () =>
-      useBaseFetch(`users?ids=${JSON.stringify(userIds)}`, app.$defaultHeaders())
+      useBaseFetch(`users?ids=${JSON.stringify(userIds)}`)
     )
     users = usersVal.value
   }
diff --git a/components/ui/report/ReportsList.vue b/components/ui/report/ReportsList.vue
index 7df778674e..483adfa513 100644
--- a/components/ui/report/ReportsList.vue
+++ b/components/ui/report/ReportsList.vue
@@ -3,7 +3,7 @@
   <ReportInfo
     v-for="report in reports.filter(
       (x) =>
-        (moderation || x.reporterUser.id === props.auth.user.id) &&
+        (moderation || x.reporterUser.id === auth.user.id) &&
         (viewMode === 'open' ? x.open : !x.open)
     )"
     :key="report.id"
@@ -34,9 +34,7 @@ defineProps({
 const viewMode = ref('open')
 const reports = ref([])
 
-let { data: rawReports } = await useAsyncData('report', () =>
-  useBaseFetch('report')
-)
+let { data: rawReports } = await useAsyncData('report', () => useBaseFetch('report'))
 
 rawReports = rawReports.value.map((report) => {
   report.item_id = report.item_id.replace(/"/g, '')
diff --git a/pages/moderation/messages.vue b/pages/moderation/messages.vue
index f7f82f0a04..869a8e8fc5 100644
--- a/pages/moderation/messages.vue
+++ b/pages/moderation/messages.vue
@@ -20,9 +20,8 @@ useHead({
   title: 'Moderation inbox - Modrinth',
 })
 
-const { data: inbox } = await useAsyncData('thread/inbox', () =>
-  useBaseFetch('thread/inbox')
-)
+const auth = await useAuth()
+const { data: inbox } = await useAsyncData('thread/inbox', () => useBaseFetch('thread/inbox'))
 
 function getLink(thread) {
   if (thread.report_id) {
diff --git a/pages/moderation/review.vue b/pages/moderation/review.vue
index 498d2c4978..36fd804a62 100644
--- a/pages/moderation/review.vue
+++ b/pages/moderation/review.vue
@@ -103,7 +103,7 @@ const TIME_24H = 86400000
 const TIME_48H = TIME_24H * 2
 
 const { data: projects } = await useAsyncData('moderation/projects?count=1000', () =>
-  useBaseFetch('moderation/projects?count=1000', app.$defaultHeaders())
+  useBaseFetch('moderation/projects?count=1000')
 )
 const members = ref([])
 const projectType = ref('all')