Merge remote-tracking branch 'origin/main' into finish-pure-status-component

src/actions/compose.ts

@@ -384,7 +384,10 @@ const uploadCompose = (composeId: string, files: FileList, intl: IntlShape) =>
         f,
         intl,
         (data) => dispatch(uploadComposeSuccess(composeId, data, f)),
-        (error) => dispatch(uploadComposeFail(composeId, error)),
+        (error) => {
+          console.error(error);
+          dispatch(uploadComposeFail(composeId, error));
+        },
         (e: ProgressEvent) => {
           progress[i] = e.loaded;
           dispatch(uploadComposeProgress(composeId, progress.reduce((a, v) => a + v, 0), e.total));

src/api/MastodonResponse.ts

@@ -81,7 +81,7 @@ export class MastodonResponse extends Response {
         z.string(),
         z.object({ error: z.string(), description: z.string() }).array(),
       ).optional(),
-    });
+    }).passthrough();
   }
 
 }

src/main.tsx

@@ -1,3 +1,5 @@
+import 'soapbox/polyfill/Promise.withResolvers.ts';
+
 import { enableMapSet } from 'immer';
 import { createRoot } from 'react-dom/client';
 

src/polyfill/Promise.withResolvers.ts

@@ -0,0 +1,14 @@
+if (!Promise.withResolvers) {
+  Promise.withResolvers = function withResolvers<T>(): PromiseWithResolvers<T> {
+
+    let resolve: (value: T | PromiseLike<T>) => void;
+    let reject: (reason?: any) => void;
+
+    const promise = new this<T>((_resolve, _reject) => {
+      resolve = _resolve;
+      reject = _reject;
+    });
+
+    return { resolve: resolve!, reject: reject!, promise };
+  };
+}

src/toast.tsx

@@ -57,9 +57,13 @@ async function showAlertForError(networkError: HTTPError): Promise<void> {
       return;
     }
 
-    const data = await response.error();
+    try {
-    if (data) {
+      const data = await response.error();
-      return error(data.error);
+      if (data) {
+        return error(data.error);
+      }
+    } catch {
+      // fallthrough
     }
 
     const message = httpErrorMessages.find((httpError) => httpError.code === status)?.description;