chore: Try using v2 instance endpoint

Since v1 is deprecated for Mastodon
null2264 · Nov 1, 2023 · 440d8c5 · 440d8c5
1 parent 2e181e8
commit 440d8c5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,15 +1,29 @@
 # Changelog
 
 <!--
+If the update is small (max 5 points):
+
 ## 20xx.xx.x
 - Type: changes
+
+Else:
+
+## 20xx.xx.x
+### Added
+### Changed
+- Type: changes
+### Fixed
+### Removed
 -->
 
 ## 2023.11.0 (Unreleased)
 
+### Added
+- Mastodon: support `/api/v2/instance` 
+
 ### Changed
 - Timeline: re-design ScrollTopButton
-- Mastodon: support `/api/v2/instance` 
+- Backend: try to use v2 instance instead of v1 when possible
 
 ### Fixed
 - Search: disable domain button for autosuggest results

diff --git a/src/soapbox/actions/instance.ts b/src/soapbox/actions/instance.ts
@@ -36,7 +36,14 @@ export const fetchInstance = createAsyncThunk<void, void, { state: RootState }>(
   'instance/fetch',
   async(_arg, { dispatch, getState, rejectWithValue }) => {
     try {
-      const { data: instance } = await api(getState).get('/api/v1/instance');
+      let resp: any;
+      try {
+        resp = await api(getState).get('/api/v2/instance');
+      } catch (e) {
+        resp = await api(getState).get('/api/v1/instance');
+      }
+
+      const { data: instance } = resp;
       if (needsNodeinfo(instance)) {
         dispatch(fetchNodeinfo());
       }