A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix: hide discovery if disabled (#3547)
Jiraliteffdf761d0b0f
diff --git a/fluxer_api/src/api/instance/InstanceController.test.ts b/fluxer_api/src/api/instance/InstanceController.test.tsindex 8fb256210..4d392d074 100644--- a/fluxer_api/src/api/instance/InstanceController.test.ts+++ b/fluxer_api/src/api/instance/InstanceController.test.ts@@ -1,6 +1,7 @@// SPDX-License-Identifier: AGPL-3.0-or-laterimport type {SsoService} from '@app/api/auth/services/SsoService';+import {Config} from '@app/api/Config';import {setCassandraQueryExecutorForTesting} from '@app/api/database/CassandraQueryExecution';import {InstanceConfigRepository} from '@app/api/instance/InstanceConfigRepository';import {InstanceController} from '@app/api/instance/InstanceController';@@ -71,6 +72,25 @@ describe('InstanceController discovery captcha', () => {await expect(readCaptcha(repository)).resolves.toEqual({provider: 'none'});});+ it('publishes whether discovery is enabled', async () => {+ const previousDiscoveryEnabled = Config.discovery.enabled;+ const app = createApp(createRepository());+ const readDiscoveryEnabled = async () => {+ const response = await app.request('http://localhost/.well-known/fluxer');+ expect(response.status).toBe(200);+ return ((await response.json()) as {features: {discovery_enabled?: boolean}}).features.discovery_enabled;+ };+ try {+ Config.discovery.enabled = false;+ await expect(readDiscoveryEnabled()).resolves.toBe(false);++ Config.discovery.enabled = true;+ await expect(readDiscoveryEnabled()).resolves.toBe(true);+ } finally {+ Config.discovery.enabled = previousDiscoveryEnabled;+ }+ });+it('publishes the domain migration kill switch and anonymous rollout without the targeting lists', async () => {const repository = createRepository();const app = createApp(repository);diff --git a/fluxer_api/src/api/instance/InstanceController.ts b/fluxer_api/src/api/instance/InstanceController.tsindex e7e1da0d7..2326d572b 100644--- a/fluxer_api/src/api/instance/InstanceController.ts+++ b/fluxer_api/src/api/instance/InstanceController.ts@@ -85,6 +85,7 @@ function buildDiscoveryStaticInput(self_hosted: Config.instance.selfHosted,presigned_attachment_uploads: Config.presignedAttachmentUploadsEnabled,emails_enabled: runtime.emailEnabled,+ discovery_enabled: Config.discovery.enabled,phone_verification_enabled: false,account_identity: runtime.accountIdentity.mode,tag_style: runtime.accountIdentity.tagStyle,diff --git a/fluxer_api/src/api/openapi/openapi.json b/fluxer_api/src/api/openapi/openapi.jsonindex 2de078c75..7fc00910f 100644--- a/fluxer_api/src/api/openapi/openapi.json+++ b/fluxer_api/src/api/openapi/openapi.json@@ -33940,6 +33940,7 @@"description": "Whether desktop clients may load downloadable modules","type": "boolean"},+ "discovery_enabled": {"description": "Whether community discovery is enabled", "type": "boolean"},"account_deletion_grace_period_hours": {"description": "Hours between a deletion request and the permanent deletion of the account","type": "integer",diff --git a/fluxer_app/src/app/router/routes/AppRoutes.tsx b/fluxer_app/src/app/router/routes/AppRoutes.tsxindex 558314603..e48340dda 100644--- a/fluxer_app/src/app/router/routes/AppRoutes.tsx+++ b/fluxer_app/src/app/router/routes/AppRoutes.tsx@@ -10,6 +10,7 @@ import {DiscoveryLayout} from '@app/features/app/components/layout/DiscoveryLayoimport {FavoritesLayout} from '@app/features/app/components/layout/FavoritesLayout';import {GuildsLayout} from '@app/features/app/components/layout/GuildsLayout';import {NotFoundPage} from '@app/features/app/components/pages/NotFoundPage';+import {isDiscoveryAvailable} from '@app/features/app/utils/DiscoveryFeatures';import {AuthenticatedRuntimeInvariantError,readAuthenticatedRuntimeContext,@@ -40,12 +41,20 @@ import {type ReactNode, useEffect, useState} from 'react';type AppRouteComponentProps = Record<string, unknown>;-function authenticatedRuntimeDisablesDirectMessages(): boolean {+function requireAuthenticatedRuntime() {const runtimeContext = readAuthenticatedRuntimeContext();if (runtimeContext === null) {throw new AuthenticatedRuntimeInvariantError('An authenticated route requires an active account runtime');}- return runtimeContext.runtime.community.direct_messages_disabled;+ return runtimeContext.runtime;+}++function authenticatedRuntimeDisablesDirectMessages(): boolean {+ return requireAuthenticatedRuntime().community.direct_messages_disabled;+}++function authenticatedRuntimeHasDiscovery(): boolean {+ return isDiscoveryAvailable(requireAuthenticatedRuntime());}const YouPage = createNamedLoadableComponent<AppRouteComponentProps>({@@ -209,10 +218,11 @@ const meRoute = createRoute({id: 'me',path: '/channels/@me',onEnter: whenAuthenticated(() => {- if (authenticatedRuntimeDisablesDirectMessages()) {- return new Redirect(getDirectMessagesFallbackPath());+ if (!authenticatedRuntimeDisablesDirectMessages()) {+ return undefined;}- return undefined;+ const fallback = getDirectMessagesFallbackPath();+ return fallback === Routes.ME ? undefined : new Redirect(fallback);}),component: observer(() => {const isMobileLayout = MobileLayout.enabled;@@ -228,6 +238,12 @@ const discoverRoute = createRoute({getParentRoute: () => guildsLayoutRoute,id: 'discover',path: '/channels/@discover',+ onEnter: whenAuthenticated(() => {+ if (authenticatedRuntimeHasDiscovery()) {+ return undefined;+ }+ return new Redirect(Routes.ME);+ }),component: () => <DiscoveryLayout data-flx="app.router.app-routes.discovery-layout" />,});const plutoniumRoute = createRoute({diff --git a/fluxer_app/src/features/app/components/layout/DiscoveryLayout.tsx b/fluxer_app/src/features/app/components/layout/DiscoveryLayout.tsxindex afc39c753..1f4bf1e27 100644--- a/fluxer_app/src/features/app/components/layout/DiscoveryLayout.tsx+++ b/fluxer_app/src/features/app/components/layout/DiscoveryLayout.tsx@@ -1,24 +1,35 @@// SPDX-License-Identifier: AGPL-3.0-or-later+import {Routes} from '@app/app/Routes';import {DiscoveryGuildHeader} from '@app/features/app/components/layout/DiscoveryGuildHeader';import styles from '@app/features/app/components/layout/GuildLayout.module.css';import {GuildSidebar} from '@app/features/app/components/layout/GuildSidebar';+import RuntimeConfig from '@app/features/app/state/RuntimeConfig';import {DiscoveryPage} from '@app/features/discovery/discovery/DiscoveryPage';import {DiscoverySidebar} from '@app/features/discovery/discovery/DiscoverySidebar';import Discovery from '@app/features/discovery/state/Discovery';+import * as RouterUtils from '@app/features/navigation/utils/RouterUtils';import MobileLayout from '@app/features/ui/state/MobileLayout';import {observer} from 'mobx-react-lite';import {useEffect} from 'react';export const DiscoveryLayout = observer(function DiscoveryLayout() {const mobileLayout = MobileLayout;+ const available = RuntimeConfig.discoveryAvailable;useEffect(() => {+ if (!available) {+ RouterUtils.replaceWith(Routes.ME);+ return;+ }void Discovery.loadCategories();void Discovery.search({offset: 0});return () => {Discovery.reset();};- }, []);+ }, [available]);+ if (!available) {+ return null;+ }if (mobileLayout.enabled) {return <DiscoveryPage data-flx="app.discovery-layout.discovery-page.mobile" />;}diff --git a/fluxer_app/src/features/app/components/layout/GuildsLayout.tsx b/fluxer_app/src/features/app/components/layout/GuildsLayout.tsxindex e846d1865..09ba176a6 100644--- a/fluxer_app/src/features/app/components/layout/GuildsLayout.tsx+++ b/fluxer_app/src/features/app/components/layout/GuildsLayout.tsx@@ -207,6 +207,7 @@ interface GuildNavigationVisibility {function useGuildNavigationVisibility(): GuildNavigationVisibility {const communityActionsVisible = !RuntimeConfig.singleCommunityEnabled;+ const discoveryVisible = RuntimeConfig.discoveryAvailable;const fluxerVisible = !RuntimeConfig.directMessagesDisabled;const favoritesVisible = Accessibility.showFavorites;const downloadVisible = !Platform.isElectron && !Platform.isPWA && !HiddenGuildListButtons.downloadButtonHidden;@@ -216,12 +217,12 @@ function useGuildNavigationVisibility(): GuildNavigationVisibility {Object.freeze({fluxerVisible,favoritesVisible,- discoveryVisible: communityActionsVisible,+ discoveryVisible,addGuildVisible: communityActionsVisible,downloadVisible,helpVisible,}),- [communityActionsVisible, downloadVisible, favoritesVisible, fluxerVisible, helpVisible],+ [communityActionsVisible, discoveryVisible, downloadVisible, favoritesVisible, fluxerVisible, helpVisible],);}diff --git a/fluxer_app/src/features/app/components/layout/sidebar_nav/DiscoveryButton.tsx b/fluxer_app/src/features/app/components/layout/sidebar_nav/DiscoveryButton.tsxindex 9a9266086..c9a067a10 100644--- a/fluxer_app/src/features/app/components/layout/sidebar_nav/DiscoveryButton.tsx+++ b/fluxer_app/src/features/app/components/layout/sidebar_nav/DiscoveryButton.tsx@@ -6,7 +6,6 @@ import guildStyles from '@app/features/app/components/layout/GuildsLayout.moduleimport styles from '@app/features/app/components/layout/sidebar_nav/DiscoveryButton.module.css';import {useHover} from '@app/features/app/hooks/useHover';import {useMergeRefs} from '@app/features/app/hooks/useMergeRefs';-import RuntimeConfig from '@app/features/app/state/RuntimeConfig';import Navigation from '@app/features/navigation/state/Navigation';import {useLocation} from '@app/features/platform/components/router/RouterReact';import FocusRing from '@app/features/ui/focus_ring/FocusRing';@@ -33,9 +32,6 @@ export const DiscoveryButton = observer(() => {const handleClick = useCallback(() => {Navigation.navigateToDiscover();}, []);- if (RuntimeConfig.singleCommunityEnabled) {- return null;- }return (<div className={guildStyles.createGuildButton} data-flx="app.sidebar-nav.discovery-button.div"><Tooltipdiff --git a/fluxer_app/src/features/app/components/skeleton/GuildRailSkeleton.tsx b/fluxer_app/src/features/app/components/skeleton/GuildRailSkeleton.tsxindex 673940c5e..521869535 100644--- a/fluxer_app/src/features/app/components/skeleton/GuildRailSkeleton.tsx+++ b/fluxer_app/src/features/app/components/skeleton/GuildRailSkeleton.tsx@@ -15,6 +15,7 @@ import {} from '@app/features/app/components/skeleton/SkeletonLayoutMemory';import {skeletonDirectMessagesDisabled,+ skeletonDiscoveryAvailable,skeletonSingleCommunityEnabled,} from '@app/features/app/components/skeleton/SkeletonRuntimeConfig';import {SkeletonEmphasis, SkeletonRadius} from '@app/features/app/components/skeleton/SkeletonStyle';@@ -467,7 +468,7 @@ export const GuildRailSkeleton: React.FC<GuildRailSkeletonProps> = ({const selectedItemIndex = rememberedLayout?.selectedItemIndex ?? SKELETON_NO_SELECTED_RAIL_ITEM_INDEX;const fluxerVisible = rememberedLayout?.fluxerVisible ?? !skeletonDirectMessagesDisabled();const favoritesVisible = rememberedLayout?.favoritesVisible ?? true;- const discoveryVisible = rememberedLayout?.discoveryVisible ?? communityActionsAvailable;+ const discoveryVisible = rememberedLayout?.discoveryVisible ?? skeletonDiscoveryAvailable();const addGuildVisible = rememberedLayout?.addGuildVisible ?? communityActionsAvailable;const downloadVisible = rememberedLayout?.downloadVisible ?? SHOWS_DOWNLOAD_ACTION;const helpVisible = rememberedLayout?.helpVisible ?? true;diff --git a/fluxer_app/src/features/app/components/skeleton/ShellHint.ts b/fluxer_app/src/features/app/components/skeleton/ShellHint.tsindex 45f04fb01..c0cb595d5 100644--- a/fluxer_app/src/features/app/components/skeleton/ShellHint.ts+++ b/fluxer_app/src/features/app/components/skeleton/ShellHint.ts@@ -41,6 +41,7 @@ import {} from '@app/features/app/components/skeleton/SkeletonLayoutMemory';import {skeletonDirectMessagesDisabled,+ skeletonDiscoveryAvailable,skeletonGifEnabled,skeletonSelfHosted,skeletonSingleCommunityEnabled,@@ -182,7 +183,7 @@ function resolveRailProjection(layout: RememberedSkeletonGuildRailLayout | null)outageVisible: layout?.outageVisible ?? false,organizedItems: layout?.organizedItems ?? SKELETON_GUILD_RAIL_FALLBACK_ITEMS,selectedItemIndex: layout?.selectedItemIndex ?? NO_SELECTED_ROW_INDEX,- discoveryVisible: layout?.discoveryVisible ?? communityActionsAvailable,+ discoveryVisible: layout?.discoveryVisible ?? skeletonDiscoveryAvailable(),addGuildVisible: layout?.addGuildVisible ?? communityActionsAvailable,downloadVisible: layout?.downloadVisible ?? SHOWS_DOWNLOAD_ACTION,helpVisible: layout?.helpVisible ?? true,diff --git a/fluxer_app/src/features/app/components/skeleton/SkeletonLayoutMemory.ts b/fluxer_app/src/features/app/components/skeleton/SkeletonLayoutMemory.tsindex 58d336196..f7b975866 100644--- a/fluxer_app/src/features/app/components/skeleton/SkeletonLayoutMemory.ts+++ b/fluxer_app/src/features/app/components/skeleton/SkeletonLayoutMemory.ts@@ -992,7 +992,7 @@ function parseGuildRailLayout(value: unknown, now: number): OptionalParseResult<typeof value.addGuildVisible !== 'boolean' ||typeof value.downloadVisible !== 'boolean' ||typeof value.helpVisible !== 'boolean' ||- value.discoveryVisible !== value.addGuildVisible ||+ (value.discoveryVisible && !value.addGuildVisible) ||(!value.fluxerVisible && inlineDmRowCount > 0) ||!Array.isArray(value.organizedItems) ||value.organizedItems.length > SKELETON_GUILD_RAIL_ORGANIZED_VISUAL_ROW_LIMIT@@ -2842,7 +2842,7 @@ export function reportSkeletonGuildRailLayout(layout: Omit<RememberedSkeletonGuitypeof layout.addGuildVisible !== 'boolean' ||typeof layout.downloadVisible !== 'boolean' ||typeof layout.helpVisible !== 'boolean' ||- layout.discoveryVisible !== layout.addGuildVisible ||+ (layout.discoveryVisible && !layout.addGuildVisible) ||(!layout.fluxerVisible && inlineDmRowCount > 0) ||!Array.isArray(layout.organizedItems) ||!Array.isArray(layout.inlineDmUnreadFlags)diff --git a/fluxer_app/src/features/app/components/skeleton/SkeletonRuntimeConfig.ts b/fluxer_app/src/features/app/components/skeleton/SkeletonRuntimeConfig.tsindex d2588c77c..aa3370af0 100644--- a/fluxer_app/src/features/app/components/skeleton/SkeletonRuntimeConfig.ts+++ b/fluxer_app/src/features/app/components/skeleton/SkeletonRuntimeConfig.ts@@ -1,12 +1,18 @@// SPDX-License-Identifier: AGPL-3.0-or-laterimport RuntimeConfig from '@app/features/app/state/RuntimeConfig';+import {isDiscoveryAvailable} from '@app/features/app/utils/DiscoveryFeatures';import DeveloperOptions from '@app/features/devtools/state/DeveloperOptions';export function skeletonSingleCommunityEnabled(): boolean {return RuntimeConfig.getSnapshotOrNull()?.community.single_community ?? false;}+export function skeletonDiscoveryAvailable(): boolean {+ const snapshot = RuntimeConfig.getSnapshotOrNull();+ return snapshot === null || isDiscoveryAvailable(snapshot);+}+export function skeletonDirectMessagesDisabled(): boolean {return RuntimeConfig.getSnapshotOrNull()?.community.direct_messages_disabled ?? false;}diff --git a/fluxer_app/src/features/app/state/RuntimeConfig.test.ts b/fluxer_app/src/features/app/state/RuntimeConfig.test.tsindex 96a6b972c..caeae52f2 100644--- a/fluxer_app/src/features/app/state/RuntimeConfig.test.ts+++ b/fluxer_app/src/features/app/state/RuntimeConfig.test.ts@@ -144,6 +144,39 @@ describe('applySnapshot', () => {});});+describe('discovery', () => {+ test('treats an instance that does not report discovery as enabled', () => {+ RuntimeConfig.applySnapshot(runtimeSnapshotFromDiscovery(parsedDocument('legacy-discovery.test')));+ expect(RuntimeConfig.discoveryEnabled).toBe(true);+ expect(RuntimeConfig.discoveryAvailable).toBe(true);+ });++ test('follows an instance that switches discovery off', () => {+ const document = discoveryDocument('no-discovery.test');+ RuntimeConfig.applySnapshot(+ runtimeSnapshotFromDiscovery(+ parseInstanceDiscoveryDocument({...document, features: {...document.features, discovery_enabled: false}}),+ ),+ );+ expect(RuntimeConfig.discoveryEnabled).toBe(false);+ expect(RuntimeConfig.discoveryAvailable).toBe(false);+ });++ test('keeps discovery unavailable on a single-community instance', () => {+ const document = discoveryDocument('single-community.test');+ RuntimeConfig.applySnapshot(+ runtimeSnapshotFromDiscovery(+ parseInstanceDiscoveryDocument({+ ...document,+ community: {...document.community, single_community: true, single_community_guild_id: '1400000000000000001'},+ }),+ ),+ );+ expect(RuntimeConfig.discoveryEnabled).toBe(true);+ expect(RuntimeConfig.discoveryAvailable).toBe(false);+ });+});+describe('applySnapshotAndWaitForDesktop', () => {test('applies immediately when no desktop shell exposes the runtime bridge', async () => {await RuntimeConfig.applySnapshotAndWaitForDesktop({diff --git a/fluxer_app/src/features/app/state/RuntimeConfig.ts b/fluxer_app/src/features/app/state/RuntimeConfig.tsindex f44a11fe5..9e91aa9bb 100644--- a/fluxer_app/src/features/app/state/RuntimeConfig.ts+++ b/fluxer_app/src/features/app/state/RuntimeConfig.ts@@ -26,6 +26,7 @@ import {usesUniqueUsernames,usesUsernameSignIn,} from '@app/features/app/utils/AccountIdentityFeatures';+import {discoveryEnabledOf, isDiscoveryAvailable} from '@app/features/app/utils/DiscoveryFeatures';import DeveloperOptions from '@app/features/devtools/state/DeveloperOptions';import {Logger} from '@app/features/platform/utils/AppLogger';import {getElectronAPI} from '@app/features/ui/utils/NativeUtils';@@ -754,6 +755,14 @@ class RuntimeConfig {return this.features.emails_enabled;}+ get discoveryEnabled(): boolean {+ return discoveryEnabledOf(this.features);+ }++ get discoveryAvailable(): boolean {+ return isDiscoveryAvailable(this);+ }+get accountIdentity(): AccountIdentityMode {return accountIdentityOf(this.features);}diff --git a/fluxer_app/src/features/app/state/RuntimeConfigSnapshot.ts b/fluxer_app/src/features/app/state/RuntimeConfigSnapshot.tsindex 9432607bb..38f50079f 100644--- a/fluxer_app/src/features/app/state/RuntimeConfigSnapshot.ts+++ b/fluxer_app/src/features/app/state/RuntimeConfigSnapshot.ts@@ -247,6 +247,10 @@ function readFeatures(value: unknown): InstanceFeatures {if (desktopModulesEnabled !== undefined) {features.desktop_modules_enabled = desktopModulesEnabled;}+ const discoveryEnabled = readOptionalBoolean(source, 'discovery_enabled', 'features.discovery_enabled');+ if (discoveryEnabled !== undefined) {+ features.discovery_enabled = discoveryEnabled;+ }const deletionGracePeriod = readOptionalBoundedInteger(source,'account_deletion_grace_period_hours',diff --git a/fluxer_app/src/features/app/utils/DiscoveryFeatures.ts b/fluxer_app/src/features/app/utils/DiscoveryFeatures.tsnew file mode 100644index 000000000..2cd84e3ca--- /dev/null+++ b/fluxer_app/src/features/app/utils/DiscoveryFeatures.ts@@ -0,0 +1,18 @@+// SPDX-License-Identifier: AGPL-3.0-or-later++import type {InstanceCommunity, InstanceFeatures} from '@fluxer/schema/src/domains/instance/InstanceSchemas';++type DiscoveryFeatures = Pick<InstanceFeatures, 'discovery_enabled'>;++interface DiscoveryRuntime {+ readonly features: DiscoveryFeatures;+ readonly community: Pick<InstanceCommunity, 'single_community'>;+}++export function discoveryEnabledOf(features: DiscoveryFeatures): boolean {+ return features.discovery_enabled !== false;+}++export function isDiscoveryAvailable(runtime: DiscoveryRuntime): boolean {+ return !runtime.community.single_community && discoveryEnabledOf(runtime.features);+}diff --git a/fluxer_app/src/features/channel/components/CrosspostCommunityCard.tsx b/fluxer_app/src/features/channel/components/CrosspostCommunityCard.tsxindex 37585ee72..6b529ad1e 100644--- a/fluxer_app/src/features/channel/components/CrosspostCommunityCard.tsx+++ b/fluxer_app/src/features/channel/components/CrosspostCommunityCard.tsx@@ -119,7 +119,7 @@ function useCommunityCardView(message: Message, sourceGuildId: string | null): ConlineCount: card.approximate_presence_count,memberCount: card.approximate_member_count,isMember: false,- canJoin: card.discoverable && !RuntimeConfig.singleCommunityEnabled,+ canJoin: card.discoverable && RuntimeConfig.discoveryAvailable,},};}diff --git a/fluxer_app/src/features/discovery/state/DiscoveryChannelPreviews.ts b/fluxer_app/src/features/discovery/state/DiscoveryChannelPreviews.tsindex b17ce2f72..1e20a2530 100644--- a/fluxer_app/src/features/discovery/state/DiscoveryChannelPreviews.ts+++ b/fluxer_app/src/features/discovery/state/DiscoveryChannelPreviews.ts@@ -1,7 +1,9 @@// SPDX-License-Identifier: AGPL-3.0-or-later+import RuntimeConfig from '@app/features/app/state/RuntimeConfig';import type {DiscoveryChannelPreview} from '@app/features/discovery/commands/DiscoveryCommands';import * as DiscoveryCommands from '@app/features/discovery/commands/DiscoveryCommands';+import {AccountScopedWork} from '@app/features/platform/state/AccountScopedWork';import {failureCode} from '@app/features/platform/utils/ResponseInspection';import {APIErrorCodes} from '@fluxer/constants/src/ApiErrorCodes';import {makeAutoObservable, observable, runInAction} from 'mobx';@@ -17,12 +19,16 @@ function entryKey(guildId: string, channelId: string): string {class DiscoveryChannelPreviews {private entries = observable.map<string, DiscoveryChannelPreviewEntry>();- private discoveryDisabled = false;+ private discoveryDisabledByApi = false;constructor() {makeAutoObservable(this, {}, {autoBind: true});}+ private get discoveryDisabled(): boolean {+ return !RuntimeConfig.discoveryEnabled || this.discoveryDisabledByApi;+ }+get(guildId: string, channelId: string): DiscoveryChannelPreviewEntry | undefined {return this.entries.get(entryKey(guildId, channelId));}@@ -39,7 +45,7 @@ class DiscoveryChannelPreviews {const code = failureCode(error);runInAction(() => {if (code === APIErrorCodes.DISCOVERY_DISABLED) {- this.discoveryDisabled = true;+ this.discoveryDisabledByApi = true;this.entries.set(key, {status: 'unavailable'});} else if (code === APIErrorCodes.DISCOVERY_NOT_DISCOVERABLE) {this.entries.set(key, {status: 'unavailable'});@@ -50,6 +56,15 @@ class DiscoveryChannelPreviews {},);}++ reset(): void {+ this.entries.clear();+ this.discoveryDisabledByApi = false;+ }}-export default new DiscoveryChannelPreviews();+const discoveryChannelPreviews = new DiscoveryChannelPreviews();++AccountScopedWork.registerCancellation(() => discoveryChannelPreviews.reset());++export default discoveryChannelPreviews;diff --git a/fluxer_app/src/features/expressions/components/ExpressionInfoCard.tsx b/fluxer_app/src/features/expressions/components/ExpressionInfoCard.tsxindex 48e5d2e8f..148521e74 100644--- a/fluxer_app/src/features/expressions/components/ExpressionInfoCard.tsx+++ b/fluxer_app/src/features/expressions/components/ExpressionInfoCard.tsx@@ -281,7 +281,7 @@ const ExpressionSourceGuildRow = observer(function ExpressionSourceGuildRow({modalKey,);}, [guild, kind, expressionName, i18n, onClose]);- const canJoin = isDiscoverable && !RuntimeConfig.singleCommunityEnabled;+ const canJoin = isDiscoverable && RuntimeConfig.discoveryAvailable;const activate = isMember ? handleJump : canJoin ? handleJoin : null;const accessibleName = isMember? i18n._(GO_TO_NAMED_COMMUNITY_DESCRIPTOR, {communityName: guild.name})diff --git a/fluxer_app/src/features/guild/components/modals/GuildSettingsModal.tsx b/fluxer_app/src/features/guild/components/modals/GuildSettingsModal.tsxindex 70731e063..fe4100866 100644--- a/fluxer_app/src/features/guild/components/modals/GuildSettingsModal.tsx+++ b/fluxer_app/src/features/guild/components/modals/GuildSettingsModal.tsx@@ -5,6 +5,7 @@ import {DesktopGuildSettingsView} from '@app/features/app/components/dialogs/comimport {MobileGuildSettingsView} from '@app/features/app/components/dialogs/components/MobileGuildSettingsView';import * as Modal from '@app/features/app/components/dialogs/Modal';import {SettingsModalContainer} from '@app/features/app/components/dialogs/shared/SettingsModalLayout';+import RuntimeConfig from '@app/features/app/state/RuntimeConfig';import GatewaySessions from '@app/features/gateway/transport/GatewaySessionPool';import GuildSettingsModalState from '@app/features/guild/state/GuildSettingsModal';import Guilds from '@app/features/guild/state/Guilds';@@ -35,6 +36,7 @@ export const GuildSettingsModal: React.FC<GuildSettingsModalProps> = observer(const {i18n} = useLingui();const guild = Guilds.getGuild(guildId);const [selectedTab, setSelectedTab] = useState<GuildSettingsTabType>(initialTabProp ?? 'overview');+ const discoveryEnabled = RuntimeConfig.discoveryEnabled;const availableTabs = useMemo(() => {const guildSettingsTabs = getGuildSettingsTabs(i18n);if (!guild) return guildSettingsTabs;@@ -48,9 +50,12 @@ export const GuildSettingsModal: React.FC<GuildSettingsModalProps> = observer(if (tab.requireFeature && !guild.features.has(tab.requireFeature)) {return false;}+ if (tab.requireDiscovery && !discoveryEnabled) {+ return false;+ }return true;});- }, [guild, guildId, i18n.locale]);+ }, [discoveryEnabled, guild, guildId, i18n.locale]);const mobileNav = useMobileNavigation<GuildSettingsTabType>();const mobileNavigateTo = mobileNav.navigateTo;diff --git a/fluxer_app/src/features/navigation/utils/AppPageLinks.ts b/fluxer_app/src/features/navigation/utils/AppPageLinks.tsindex b0d2a1c05..f428c77ca 100644--- a/fluxer_app/src/features/navigation/utils/AppPageLinks.ts+++ b/fluxer_app/src/features/navigation/utils/AppPageLinks.ts@@ -55,7 +55,7 @@ function isWebAppHost(host: string): boolean {function isPageAvailable(page: AppPageDefinition): boolean {if (page.id === 'plutonium') return shouldShowPremiumFeatures();- if (page.id === 'discovery') return !RuntimeConfig.singleCommunityEnabled;+ if (page.id === 'discovery') return RuntimeConfig.discoveryAvailable;if (page.id === 'direct_messages') return !RuntimeConfig.directMessagesDisabled;return true;}diff --git a/fluxer_app/src/features/navigation/utils/DefaultLandingUtils.ts b/fluxer_app/src/features/navigation/utils/DefaultLandingUtils.tsindex 6dbe46453..6eb434089 100644--- a/fluxer_app/src/features/navigation/utils/DefaultLandingUtils.ts+++ b/fluxer_app/src/features/navigation/utils/DefaultLandingUtils.ts@@ -23,7 +23,7 @@ export function getDirectMessagesFallbackPath(): string {if (Accessibility.showFavorites) {return Routes.FAVORITES;}- if (!RuntimeConfig.singleCommunityEnabled) {+ if (RuntimeConfig.discoveryAvailable) {return Routes.DISCOVER;}return Routes.ME;diff --git a/fluxer_app/src/features/ui/action_menu/items/GuildMenuData.tsx b/fluxer_app/src/features/ui/action_menu/items/GuildMenuData.tsxindex 9cf7aa96d..0fb38c725 100644--- a/fluxer_app/src/features/ui/action_menu/items/GuildMenuData.tsx+++ b/fluxer_app/src/features/ui/action_menu/items/GuildMenuData.tsx@@ -2,6 +2,7 @@import {Routes} from '@app/app/Routes';import {GuildSettingsModal, UserSettingsModal} from '@app/features/app/components/dialogs/LoadableSettingsModals';+import RuntimeConfig from '@app/features/app/state/RuntimeConfig';import Authentication from '@app/features/auth/state/Authentication';import {CategoryCreateModal} from '@app/features/channel/components/modals/CategoryCreateModal';import {ChannelCreateModal} from '@app/features/channel/components/modals/ChannelCreateModal';@@ -284,6 +285,7 @@ export function useGuildMenuData(guild: Guild, options: UseGuildMenuDataOptions)}),[channels, deleteMyMessagesInGuild, guild, i18n.locale, leaveGuild, onClose],);+ const discoveryEnabled = RuntimeConfig.discoveryEnabled;const availableSettingsTabs = useMemo(() => {const allTabs = getGuildSettingsTabs(i18n);return allTabs.filter((tab) => {@@ -296,9 +298,12 @@ export function useGuildMenuData(guild: Guild, options: UseGuildMenuDataOptions)if (tab.requireFeature && !guild.features.has(tab.requireFeature)) {return false;}+ if (tab.requireDiscovery && !discoveryEnabled) {+ return false;+ }return true;});- }, [guild.features, guild.id, i18n.locale]);+ }, [discoveryEnabled, guild.features, guild.id, i18n.locale]);const groups = useMemo(() => {const menuGroups: Array<MenuGroupType> = [];const quickActions: Array<MenuItemType | MenuSubmenuItemType> = [];diff --git a/fluxer_app/src/features/user/components/settings_utils/GuildSettingsConstants.ts b/fluxer_app/src/features/user/components/settings_utils/GuildSettingsConstants.tsindex a16c946af..283fb76f1 100644--- a/fluxer_app/src/features/user/components/settings_utils/GuildSettingsConstants.ts+++ b/fluxer_app/src/features/user/components/settings_utils/GuildSettingsConstants.ts@@ -114,6 +114,7 @@ export interface GuildSettingsTab {iconWeight?: IconWeight;permission?: bigint | ReadonlyArray<bigint>;requireFeature?: string;+ requireDiscovery?: boolean;}interface GuildSettingsTabDescriptor {@@ -124,6 +125,7 @@ interface GuildSettingsTabDescriptor {iconWeight?: IconWeight;permission?: bigint | ReadonlyArray<bigint>;requireFeature?: string;+ requireDiscovery?: boolean;}const GUILD_SETTINGS_TABS_DESCRIPTORS: Array<GuildSettingsTabDescriptor> = [@@ -176,6 +178,7 @@ const GUILD_SETTINGS_TABS_DESCRIPTORS: Array<GuildSettingsTabDescriptor> = [icon: CompassIcon,iconWeight: 'fill',permission: Permissions.MANAGE_GUILD,+ requireDiscovery: true,},{type: 'vanity_url',diff --git a/fluxer_docs/src/content/docs/http-api/deployment-availability.md b/fluxer_docs/src/content/docs/http-api/deployment-availability.mdindex 09659fddc..65a12555c 100644--- a/fluxer_docs/src/content/docs/http-api/deployment-availability.md+++ b/fluxer_docs/src/content/docs/http-api/deployment-availability.md@@ -98,6 +98,6 @@ A route every deployment registers can still produce a different answer on a selPremium state is the clearest case. Every deployment registers [Get premium state](/http-api/premium/#get-premium-state) and [Set premium perks disabled](/http-api/premium/#set-premium-perks-disabled). A self-hosted instance still reports premium state and still records the perks-disabled flag. The response repeats the deployment kind in `self_hosted` on the [effective premium state object](/http-api/premium/#effective-premium-state-object). That flag alone does not make `is_premium` true. A self-hosted deployment grants premium to every account only while its instance [premium mode](/admin-api/instance/#premium-modes) is `everyone`. That mode also overrides the perks-disabled flag, so `is_premium` stays true while `premium_perks_disabled` is true.-The other instance feature flags published by [instance discovery](/http-api/instance/#instance-features-object) work the same way. `voice_enabled`, `presigned_attachment_uploads`, and `emails_enabled` each report whether a capability is switched on. The routes for that capability stay registered when the flag is false, so a client reads the flag before it uses them.+The other instance feature flags published by [instance discovery](/http-api/instance/#instance-features-object) work the same way. `voice_enabled`, `presigned_attachment_uploads`, `emails_enabled`, and `discovery_enabled` each report whether a capability is switched on. The routes for that capability stay registered when the flag is false, so a client reads the flag before it uses them.`account_identity` is the same kind of flag. Every deployment registers the email routes and the username-only routes alike. A `username` deployment answers the email routes with 400 `EMAIL_UNAVAILABLE_ON_INSTANCE`, and an `email` deployment answers the username-only routes with 400 `USERNAME_SIGN_IN_ONLY`. A hosted deployment is always `email`.diff --git a/fluxer_docs/src/content/docs/http-api/instance.mdx b/fluxer_docs/src/content/docs/http-api/instance.mdxindex 595020b70..91f55631f 100644--- a/fluxer_docs/src/content/docs/http-api/instance.mdx+++ b/fluxer_docs/src/content/docs/http-api/instance.mdx@@ -146,6 +146,7 @@ Deployment-wide switches a client reads before it offers a feature, plus whether| account_identity<sup>5</sup> | string | How members sign in, one of the [account identity modes](#account-identity-modes) || tag_style<sup>6</sup> | string | How usernames are tagged, one of the [tag styles](#tag-styles) || desktop_modules_enabled? | boolean | Whether desktop clients may load downloadable modules |+| discovery_enabled?<sup>7</sup> | boolean | Whether community discovery is enabled || account_deletion_grace_period_hours? | integer | Hours between a deletion request and the permanent deletion of the account (1-8,760) || max_background_gateway_connections? | integer | Maximum Gateway connections a client may keep open for background accounts (0-64) |@@ -161,6 +162,8 @@ Deployment-wide switches a client reads before it offers a feature, plus whether<sup>6</sup> Always `none` on a `username` deployment. Always `random` on a hosted deployment and on an instance that existed before the field. A client treats a missing value as `random`+<sup>7</sup> A client treats a missing value as true+A deployment that reports `emails_enabled` as false sends no verification, password recovery, or IP authorisation message, and the flows that depend on one are unusable there. [Deployment availability](/http-api/deployment-availability/) states which routes a self-hosted deployment does not serve at all.### Account identity modesdiff --git a/packages/instance_bootstrap/src/Discovery.ts b/packages/instance_bootstrap/src/Discovery.tsindex 150f507a0..0bac63821 100644--- a/packages/instance_bootstrap/src/Discovery.ts+++ b/packages/instance_bootstrap/src/Discovery.ts@@ -62,6 +62,7 @@ const FEATURE_FLAG_KEYS = Object.freeze(['stripe_serviceable','phone_verification_enabled','desktop_modules_enabled',+ 'discovery_enabled',] as const) satisfies ReadonlyArray<keyof InstanceFeatures>;const BRANDING_URL_KEYS = Object.freeze([diff --git a/packages/schema/src/domains/instance/InstanceSchemas.ts b/packages/schema/src/domains/instance/InstanceSchemas.tsindex bd946b77c..b2e0bb06d 100644--- a/packages/schema/src/domains/instance/InstanceSchemas.ts+++ b/packages/schema/src/domains/instance/InstanceSchemas.ts@@ -150,6 +150,7 @@ export const InstanceFeaturesSchema = zemails_enabled: z.boolean().describe('Whether the instance sends emails (verification, password reset, etc.)'),phone_verification_enabled: z.boolean().describe('Deprecated. Always false.'),desktop_modules_enabled: z.boolean().optional().describe('Whether desktop clients may load downloadable modules'),+ discovery_enabled: z.boolean().optional().describe('Whether community discovery is enabled'),account_deletion_grace_period_hours: z.number().int()