fix: open the home screen if the current server is deleted externally

upryzing · Oct 28, 2023 · a5cdb11 · a5cdb11
1 parent 3abb0be
commit a5cdb11
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/App.tsx b/App.tsx
@@ -293,6 +293,13 @@ class MainView extends React.Component {
         }
       }
     });
+    client.on('server/delete', async s => {
+      const currentServer = app.getCurrentServer();
+      if (currentServer === s) {
+        app.openServer(undefined);
+        app.openChannel(null);
+      }
+    });
     AsyncStorage.getItem('token', async (err, res) => {
       if (!err) {
         if (typeof res !== 'string') {

diff --git a/src/Generic.tsx b/src/Generic.tsx
@@ -291,6 +291,9 @@ export const app = {
   openInvite: i => {},
   openBotInvite: i => {},
   openServer: (s?: Server) => {},
+  getCurrentServer: () => {
+    return undefined as string | undefined;
+  },
   openChannel: c => {},
   openDirectMessage: (c: Channel) => {},
   openImage: a => {},

diff --git a/src/SideMenus.tsx b/src/SideMenus.tsx
@@ -31,6 +31,9 @@ export const LeftMenu = ({
     setCurrentServerInner(s);
     AsyncStorage.setItem('lastServer', s?._id || 'DirectMessage');
   }
+  setFunction('getCurrentServer', () => {
+    return currentServer?._id ?? undefined;
+  })
   setFunction('openServer', (s: Server | null) => {
     setCurrentServer(s);
   });