Revert "Add a page and config option for a room directory server"

This reverts commit 401d8ed930.

Revert "Minor styling changes"

This reverts commit 3de1ce8f2f.

Revert "Use consistent "bookmark" wording in code and UI"

This reverts commit c45cb62e2d.

Revert "Move featured servers into the Featured section"

This reverts commit 53612f4641.

src/app/hooks/router/useExploreSelected.ts

@@ -1,6 +1,5 @@
 import { useMatch, useParams } from 'react-router-dom';
 import { getExploreFeaturedPath, getExplorePath } from '../../pages/pathUtils';
-import { useClientConfig } from '../useClientConfig';
 
 export const useExploreSelected = (): boolean => {
   const match = useMatch({
@@ -27,8 +26,3 @@ export const useExploreServer = (): string | undefined => {
 
   return server;
 };
-
-export const useDirectoryServer = (): string | undefined => {
-  const { featuredCommunities } = useClientConfig();
-  return featuredCommunities?.directoryServer;
-};

src/app/hooks/useBookmarkedServers.ts

@@ -1,43 +0,0 @@
-import { useCallback, useMemo } from 'react';
-import { AccountDataEvent } from '../../types/matrix/accountData';
-import { useAccountData } from './useAccountData';
-import { useMatrixClient } from './useMatrixClient';
-
-export type InCinnyBookmarkedServersContent = {
-  servers?: string[];
-};
-
-export const useBookmarkedServers = (): [
-  string[],
-  (server: string) => Promise<void>,
-  (server: string) => Promise<void>
-] => {
-  const mx = useMatrixClient();
-  const accountData = useAccountData(AccountDataEvent.CinnyBookmarkedServers);
-  const bookmarkedServers = useMemo(
-    () => accountData?.getContent<InCinnyBookmarkedServersContent>()?.servers ?? [],
-    [accountData]
-  );
-
-  const addServerBookmark = useCallback(
-    async (server: string) => {
-      if (bookmarkedServers.indexOf(server) === -1) {
-        await mx.setAccountData(AccountDataEvent.CinnyBookmarkedServers, {
-          servers: [...bookmarkedServers, server],
-        });
-      }
-    },
-    [mx, bookmarkedServers]
-  );
-
-  const removeServerBookmark = useCallback(
-    async (server: string) => {
-      await mx.setAccountData(AccountDataEvent.CinnyBookmarkedServers, {
-        servers: bookmarkedServers.filter((addedServer) => server !== addedServer),
-      });
-    },
-    [mx, bookmarkedServers]
-  );
-
-  return [bookmarkedServers, addServerBookmark, removeServerBookmark];
-};

src/app/hooks/useClientConfig.ts

@@ -15,7 +15,6 @@ export type ClientConfig = {
     spaces?: string[];
     rooms?: string[];
     servers?: string[];
-    directoryServer?: string;
   };
 
   hashRouter?: HashRouterConfig;

src/app/hooks/useExploreServers.ts

@@ -0,0 +1,43 @@
+import { useCallback, useMemo } from 'react';
+import { AccountDataEvent } from '../../types/matrix/accountData';
+import { useAccountData } from './useAccountData';
+import { useMatrixClient } from './useMatrixClient';
+
+export type InCinnyExploreServersContent = {
+  servers?: string[];
+};
+
+export const useExploreServers = (): [
+  string[],
+  (server: string) => Promise<void>,
+  (server: string) => Promise<void>
+] => {
+  const mx = useMatrixClient();
+  const accountData = useAccountData(AccountDataEvent.CinnyExplore);
+  const userAddedServers = useMemo(
+    () => accountData?.getContent<InCinnyExploreServersContent>()?.servers ?? [],
+    [accountData]
+  );
+
+  const addServer = useCallback(
+    async (server: string) => {
+      if (userAddedServers.indexOf(server) === -1) {
+        await mx.setAccountData(AccountDataEvent.CinnyExplore, {
+          servers: [...userAddedServers, server],
+        });
+      }
+    },
+    [mx, userAddedServers]
+  );
+
+  const removeServer = useCallback(
+    async (server: string) => {
+      await mx.setAccountData(AccountDataEvent.CinnyExplore, {
+        servers: userAddedServers.filter((addedServer) => server !== addedServer),
+      });
+    },
+    [mx, userAddedServers]
+  );
+
+  return [userAddedServers, addServer, removeServer];
+};