From 36202a5cc8aed7c45dcccf58454228833f77b143 Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Mon, 9 Oct 2023 15:29:42 +0200
Subject: [PATCH] Add baseUrl state property

---
 app/javascript/flavours/glitch/api.js | 11 +++++++++++
 app/javascript/mastodon/api.js        | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/app/javascript/flavours/glitch/api.js b/app/javascript/flavours/glitch/api.js
index 6bbddbef6..0f27289f6 100644
--- a/app/javascript/flavours/glitch/api.js
+++ b/app/javascript/flavours/glitch/api.js
@@ -51,6 +51,15 @@ const authorizationHeaderFromState = getState => {
   };
 };
 
+/**
+ * @param {() => import('immutable').Map<string,any>} getState
+ * @returns string
+ */
+const baseUrlFromState = getState => {
+  const baseUrl = getState && getState().getIn(['meta', 'base_url'], '');
+  return `${baseUrl}`;
+};
+
 /**
  * @param {() => import('immutable').Map} getState
  * @returns {import('axios').AxiosInstance}
@@ -62,6 +71,8 @@ export default function api(getState) {
       ...authorizationHeaderFromState(getState),
     },
 
+    baseURL: baseUrlFromState(getState),
+
     transformResponse: [
       function (data) {
         try {
diff --git a/app/javascript/mastodon/api.js b/app/javascript/mastodon/api.js
index 42b64d6cc..3d5e13c65 100644
--- a/app/javascript/mastodon/api.js
+++ b/app/javascript/mastodon/api.js
@@ -51,6 +51,15 @@ const authorizationHeaderFromState = getState => {
   };
 };
 
+/**
+ * @param {() => import('immutable').Map<string,any>} getState
+ * @returns string
+ */
+const baseUrlFromState = getState => {
+  const baseUrl = getState && getState().getIn(['meta', 'base_url'], '');
+  return `${baseUrl}`;
+};
+
 /**
  * @param {() => import('immutable').Map<string,any>} getState
  * @returns {import('axios').AxiosInstance}
@@ -62,6 +71,8 @@ export default function api(getState) {
       ...authorizationHeaderFromState(getState),
     },
 
+    baseURL: baseUrlFromState(getState),
+
     transformResponse: [
       function (data) {
         try {