Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

refactor(app): merge duplicated components and stores (#3383)

Hampus569551098056
diff --git a/fluxer_app/package.json b/fluxer_app/package.json
index 23fb4d1bd..b5108ae0e 100644
--- a/fluxer_app/package.json
+++ b/fluxer_app/package.json
@@ -190,8 +190,6 @@
"@lingui/react": "catalog:",
"@livekit/components-react": "catalog:",
"@phosphor-icons/react": "catalog:",
- "@pkgs/list_utils": "workspace:*",
- "@pkgs/number_utils": "workspace:*",
"@radix-ui/react-checkbox": "catalog:",
"@radix-ui/react-radio-group": "catalog:",
"@radix-ui/react-switch": "catalog:",
@@ -239,7 +237,6 @@
"rxjs": "catalog:",
"thumbhash": "catalog:",
"tiny-invariant": "catalog:",
- "uint8array-extras": "catalog:",
"unique-names-generator": "catalog:",
"upng-js": "^2.1.0",
"urlpattern-polyfill": "catalog:",
diff --git a/fluxer_app/pkgs/list_utils/package.json b/fluxer_app/pkgs/list_utils/package.json
deleted file mode 100644
index 8d4456f01..000000000
--- a/fluxer_app/pkgs/list_utils/package.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "@pkgs/list_utils",
- "version": "0.0.0",
- "type": "module",
- "exports": {
- "./src/*": "./src/*",
- "./*": "./*"
- },
- "dependencies": {
- "@fluxer/constants": "workspace:*"
- }
-}
diff --git a/fluxer_app/pkgs/list_utils/src/ListFormatting.ts b/fluxer_app/pkgs/list_utils/src/ListFormatting.ts
deleted file mode 100644
index cda3f69ec..000000000
--- a/fluxer_app/pkgs/list_utils/src/ListFormatting.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-import {Locales} from '@fluxer/constants/src/Locales';
-import {getCachedListFormatter} from '@pkgs/list_utils/src/ListFormattingCache';
-import {formatListWithFallback} from '@pkgs/list_utils/src/ListFormattingFallback';
-import {isIntlListFormatLocaleSupported, isIntlListFormatSupported} from '@pkgs/list_utils/src/ListFormattingSupport';
-import type {
- ListFormatStyle,
- ListFormatType,
- ListFormatterConfig,
- ResolvedListFormatterConfig,
-} from '@pkgs/list_utils/src/ListFormattingTypes';
-
-const DEFAULT_LOCALE = Locales.EN_US;
-const DEFAULT_LIST_FORMAT_STYLE: ListFormatStyle = 'long';
-const DEFAULT_LIST_FORMAT_TYPE: ListFormatType = 'conjunction';
-
-function normalizeLocale(locale: string): string {
- if (!isIntlListFormatLocaleSupported(locale)) {
- return DEFAULT_LOCALE;
- }
- return locale;
-}
-
-function resolveListFormatterConfig(config: ListFormatterConfig): ResolvedListFormatterConfig {
- const requestedLocale = config.locale?.trim();
- const locale = requestedLocale == null || requestedLocale === '' ? DEFAULT_LOCALE : normalizeLocale(requestedLocale);
- const style = config.style ?? DEFAULT_LIST_FORMAT_STYLE;
- const type = config.type ?? DEFAULT_LIST_FORMAT_TYPE;
- return {
- locale,
- style,
- type,
- };
-}
-
-function formatWithIntl(items: ReadonlyArray<string>, config: ResolvedListFormatterConfig): string {
- try {
- return getCachedListFormatter(config).format(items);
- } catch {
- return formatListWithFallback(items, config.type);
- }
-}
-
-function formatItems(items: ReadonlyArray<string>, config: ResolvedListFormatterConfig): string {
- if (items.length === 0) {
- return '';
- }
- if (items.length === 1) {
- return items[0] ?? '';
- }
- if (!isIntlListFormatSupported()) {
- return formatListWithFallback(items, config.type);
- }
- return formatWithIntl(items, config);
-}
-
-export function formatListWithConfig(items: ReadonlyArray<string>, config: ListFormatterConfig = {}): string {
- const resolvedConfig = resolveListFormatterConfig(config);
- return formatItems(items, resolvedConfig);
-}
diff --git a/fluxer_app/pkgs/list_utils/src/ListFormattingCache.ts b/fluxer_app/pkgs/list_utils/src/ListFormattingCache.ts
deleted file mode 100644
index 48eaf228b..000000000
--- a/fluxer_app/pkgs/list_utils/src/ListFormattingCache.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-import type {ResolvedListFormatterConfig} from '@pkgs/list_utils/src/ListFormattingTypes';
-
-const formatterCache = new Map<string, Intl.ListFormat>();
-
-export function getCachedListFormatter(config: ResolvedListFormatterConfig): Intl.ListFormat {
- const cacheKey = `${config.locale}:${config.style}:${config.type}`;
- const cachedFormatter = formatterCache.get(cacheKey);
- if (cachedFormatter != null) {
- return cachedFormatter;
- }
- const formatter = new Intl.ListFormat(config.locale, {
- style: config.style,
- type: config.type,
- });
- formatterCache.set(cacheKey, formatter);
- return formatter;
-}
diff --git a/fluxer_app/pkgs/list_utils/src/ListFormattingFallback.ts b/fluxer_app/pkgs/list_utils/src/ListFormattingFallback.ts
deleted file mode 100644
index b85ab6909..000000000
--- a/fluxer_app/pkgs/list_utils/src/ListFormattingFallback.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-import type {ListFormatType} from '@pkgs/list_utils/src/ListFormattingTypes';
-
-function getFallbackConjunction(type: ListFormatType): string {
- if (type === 'disjunction') {
- return 'or';
- }
- return 'and';
-}
-
-export function formatListWithFallback(items: ReadonlyArray<string>, type: ListFormatType): string {
- if (items.length === 0) {
- return '';
- }
- if (items.length === 1) {
- return items[0] ?? '';
- }
- if (type === 'unit') {
- return items.join(', ');
- }
- const conjunction = getFallbackConjunction(type);
- if (items.length === 2) {
- return `${items[0]} ${conjunction} ${items[1]}`;
- }
- const lastItem = items[items.length - 1];
- const leadingItems = items.slice(0, -1).join(', ');
- return `${leadingItems}, ${conjunction} ${lastItem}`;
-}
diff --git a/fluxer_app/pkgs/list_utils/src/ListFormattingSupport.ts b/fluxer_app/pkgs/list_utils/src/ListFormattingSupport.ts
deleted file mode 100644
index 600b8c2bb..000000000
--- a/fluxer_app/pkgs/list_utils/src/ListFormattingSupport.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-export function isIntlListFormatSupported(): boolean {
- return typeof Intl !== 'undefined' && typeof Intl.ListFormat !== 'undefined';
-}
-
-export function isIntlListFormatLocaleSupported(locale: string): boolean {
- if (!isIntlListFormatSupported()) {
- return false;
- }
- try {
- return Intl.ListFormat.supportedLocalesOf([locale]).length > 0;
- } catch {
- return false;
- }
-}
diff --git a/fluxer_app/pkgs/list_utils/src/ListFormattingTypes.ts b/fluxer_app/pkgs/list_utils/src/ListFormattingTypes.ts
deleted file mode 100644
index 9efebaeae..000000000
--- a/fluxer_app/pkgs/list_utils/src/ListFormattingTypes.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-export type ListFormatStyle = 'long' | 'short' | 'narrow';
-export type ListFormatType = 'conjunction' | 'disjunction' | 'unit';
-
-export interface ListFormatOptions {
- style?: ListFormatStyle;
- type?: ListFormatType;
-}
-
-export interface ListFormatterConfig extends ListFormatOptions {
- locale?: string;
-}
-
-export interface ResolvedListFormatterConfig {
- locale: string;
- style: ListFormatStyle;
- type: ListFormatType;
-}
diff --git a/fluxer_app/pkgs/list_utils/tsconfig.json b/fluxer_app/pkgs/list_utils/tsconfig.json
deleted file mode 100644
index bfec7ccc9..000000000
--- a/fluxer_app/pkgs/list_utils/tsconfig.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "extends": "../../../tsconfigs/package.json",
- "compilerOptions": {
- "paths": {
- "@fluxer/*": ["../../../packages/*", "../../../packages/*/src/index.ts"],
- "@pkgs/*": ["../*"]
- }
- }
-}
diff --git a/fluxer_app/pkgs/number_utils/package.json b/fluxer_app/pkgs/number_utils/package.json
deleted file mode 100644
index e3c5c3bfc..000000000
--- a/fluxer_app/pkgs/number_utils/package.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "@pkgs/number_utils",
- "version": "0.0.0",
- "type": "module",
- "dependencies": {
- "@fluxer/constants": "workspace:*"
- },
- "exports": {
- "./src/*": "./src/*",
- "./*": "./*"
- }
-}
diff --git a/fluxer_app/pkgs/number_utils/src/NumberConstants.ts b/fluxer_app/pkgs/number_utils/src/NumberConstants.ts
deleted file mode 100644
index f2773ef44..000000000
--- a/fluxer_app/pkgs/number_utils/src/NumberConstants.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-import {Locales} from '@fluxer/constants/src/Locales';
-
-export const DEFAULT_COMPACT_MAX_FRACTION_DIGITS = 1;
-export const DEFAULT_NUMBER_FALLBACK = 0;
-export const DEFAULT_NUMBER_LOCALE = Locales.EN_US;
diff --git a/fluxer_app/pkgs/number_utils/src/NumberFormatterCache.ts b/fluxer_app/pkgs/number_utils/src/NumberFormatterCache.ts
deleted file mode 100644
index 9facfb278..000000000
--- a/fluxer_app/pkgs/number_utils/src/NumberFormatterCache.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-const numberFormatterCache = new Map<string, Intl.NumberFormat>();
-
-export function getNumberFormatter(
- locale: string,
- numberFormatOptions: Intl.NumberFormatOptions = {},
-): Intl.NumberFormat {
- const cacheKey = buildFormatterCacheKey(locale, numberFormatOptions);
- const cachedFormatter = numberFormatterCache.get(cacheKey);
- if (cachedFormatter !== undefined) {
- return cachedFormatter;
- }
- const formatter = new Intl.NumberFormat(locale, numberFormatOptions);
- numberFormatterCache.set(cacheKey, formatter);
- return formatter;
-}
-
-function buildFormatterCacheKey(locale: string, numberFormatOptions: Intl.NumberFormatOptions): string {
- const optionEntries = Object.entries(numberFormatOptions)
- .filter(([, value]) => value !== undefined)
- .sort(([left], [right]) => left.localeCompare(right));
- const optionKey = optionEntries.map(([key, value]) => `${key}:${String(value)}`).join('|');
- return `${locale}|${optionKey}`;
-}
diff --git a/fluxer_app/pkgs/number_utils/src/NumberFormatting.ts b/fluxer_app/pkgs/number_utils/src/NumberFormatting.ts
deleted file mode 100644
index 66859597a..000000000
--- a/fluxer_app/pkgs/number_utils/src/NumberFormatting.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-import {
- DEFAULT_COMPACT_MAX_FRACTION_DIGITS,
- DEFAULT_NUMBER_FALLBACK,
- DEFAULT_NUMBER_LOCALE,
-} from '@pkgs/number_utils/src/NumberConstants';
-import {getNumberFormatter} from '@pkgs/number_utils/src/NumberFormatterCache';
-import {parseNumberInput} from '@pkgs/number_utils/src/NumberParsing';
-import type {
- CompactNumberFormatOptions,
- NumberFormatBaseOptions,
- NumberFormatOptions,
- NumberInput,
-} from '@pkgs/number_utils/src/NumberTypes';
-
-interface ResolvedNumberFormatBaseOptions {
- locale: string;
- fallbackValue: number;
-}
-
-interface CompactFormatOptionsInput {
- maximumFractionDigits?: number;
- minimumFractionDigits?: number;
-}
-
-function resolveBaseOptions(options?: NumberFormatBaseOptions): ResolvedNumberFormatBaseOptions {
- return {
- locale: options?.locale ?? DEFAULT_NUMBER_LOCALE,
- fallbackValue: options?.fallbackValue ?? DEFAULT_NUMBER_FALLBACK,
- };
-}
-
-function resolveNumberFormatOptions(optionsOrLocale: NumberFormatOptions | string | undefined): NumberFormatOptions {
- if (typeof optionsOrLocale === 'string') {
- return {locale: optionsOrLocale};
- }
- return optionsOrLocale ?? {};
-}
-
-function resolveCompactFormatOptions(
- optionsOrLocale: CompactNumberFormatOptions | string | undefined,
- maximumFractionDigits: number | undefined,
-): CompactNumberFormatOptions {
- if (typeof optionsOrLocale === 'string') {
- return {
- locale: optionsOrLocale,
- maximumFractionDigits,
- };
- }
- if (optionsOrLocale === undefined) {
- if (maximumFractionDigits === undefined) {
- return {};
- }
- return {maximumFractionDigits};
- }
- if (maximumFractionDigits === undefined) {
- return optionsOrLocale;
- }
- return {
- ...optionsOrLocale,
- maximumFractionDigits: optionsOrLocale.maximumFractionDigits ?? maximumFractionDigits,
- };
-}
-
-function formatNumberValue(
- value: NumberInput,
- resolvedOptions: ResolvedNumberFormatBaseOptions,
- numberFormatOptions: Intl.NumberFormatOptions = {},
-): string {
- const parsedValue = parseNumberInput(value, resolvedOptions.fallbackValue);
- return getNumberFormatter(resolvedOptions.locale, numberFormatOptions).format(parsedValue);
-}
-
-function buildCompactFormatOptions(options: CompactFormatOptionsInput): Intl.NumberFormatOptions {
- const numberFormatOptions: Intl.NumberFormatOptions = {
- notation: 'compact',
- maximumFractionDigits: options.maximumFractionDigits ?? DEFAULT_COMPACT_MAX_FRACTION_DIGITS,
- };
- if (options.minimumFractionDigits !== undefined) {
- numberFormatOptions.minimumFractionDigits = options.minimumFractionDigits;
- }
- return numberFormatOptions;
-}
-
-export function formatNumber(value: NumberInput, locale?: string): string;
-export function formatNumber(value: NumberInput, options?: NumberFormatOptions): string;
-export function formatNumber(value: NumberInput, optionsOrLocale: NumberFormatOptions | string = {}): string {
- const options = resolveNumberFormatOptions(optionsOrLocale);
- const resolvedOptions = resolveBaseOptions(options);
- return formatNumberValue(value, resolvedOptions, options.numberFormatOptions);
-}
-
-export function formatCompactNumber(value: NumberInput, locale?: string, maximumFractionDigits?: number): string;
-export function formatCompactNumber(value: NumberInput, options?: CompactNumberFormatOptions): string;
-export function formatCompactNumber(
- value: NumberInput,
- optionsOrLocale: CompactNumberFormatOptions | string = {},
- maximumFractionDigits?: number,
-): string {
- const options = resolveCompactFormatOptions(optionsOrLocale, maximumFractionDigits);
- const resolvedOptions = resolveBaseOptions(options);
- return formatNumberValue(value, resolvedOptions, buildCompactFormatOptions(options));
-}
diff --git a/fluxer_app/pkgs/number_utils/src/NumberParsing.ts b/fluxer_app/pkgs/number_utils/src/NumberParsing.ts
deleted file mode 100644
index a9743a9ab..000000000
--- a/fluxer_app/pkgs/number_utils/src/NumberParsing.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-import {DEFAULT_NUMBER_FALLBACK} from '@pkgs/number_utils/src/NumberConstants';
-import type {NumberInput} from '@pkgs/number_utils/src/NumberTypes';
-
-export function parseNumberInput(value: NumberInput, fallbackValue: number = DEFAULT_NUMBER_FALLBACK): number {
- if (typeof value === 'number') {
- if (Number.isFinite(value)) {
- return value;
- }
- return fallbackValue;
- }
- if (typeof value === 'string') {
- const trimmedValue = value.trim();
- if (trimmedValue === '') {
- return fallbackValue;
- }
- const parsedValue = Number(trimmedValue);
- if (Number.isFinite(parsedValue)) {
- return parsedValue;
- }
- }
- return fallbackValue;
-}
diff --git a/fluxer_app/pkgs/number_utils/src/NumberTypes.ts b/fluxer_app/pkgs/number_utils/src/NumberTypes.ts
deleted file mode 100644
index 12c425b6a..000000000
--- a/fluxer_app/pkgs/number_utils/src/NumberTypes.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-export type NumberInput = number | string | null | undefined;
-
-export interface NumberFormatBaseOptions {
- locale?: string;
- fallbackValue?: number;
-}
-
-export interface NumberFormatOptions extends NumberFormatBaseOptions {
- numberFormatOptions?: Intl.NumberFormatOptions;
-}
-
-export interface CompactNumberFormatOptions extends NumberFormatBaseOptions {
- maximumFractionDigits?: number;
- minimumFractionDigits?: number;
-}
diff --git a/fluxer_app/pkgs/number_utils/tsconfig.json b/fluxer_app/pkgs/number_utils/tsconfig.json
deleted file mode 100644
index bfec7ccc9..000000000
--- a/fluxer_app/pkgs/number_utils/tsconfig.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "extends": "../../../tsconfigs/package.json",
- "compilerOptions": {
- "paths": {
- "@fluxer/*": ["../../../packages/*", "../../../packages/*/src/index.ts"],
- "@pkgs/*": ["../*"]
- }
- }
-}
diff --git a/fluxer_app/src/env.d.ts b/fluxer_app/src/env.d.ts
index b5709013c..0e772361e 100644
--- a/fluxer_app/src/env.d.ts
+++ b/fluxer_app/src/env.d.ts
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import MediaEngineFacade from '@app/features/voice/engine/MediaEngineFacade';
-import type {ElectronAPI} from '@app/features/platform/types/Electron';
+import type {ElectronAPI} from '@app/types/electron.d';
import {Buffer} from 'buffer';
type MediaEngineInstance = typeof MediaEngineFacade;
diff --git a/fluxer_app/src/features/accessibility/state/Accessibility.ts b/fluxer_app/src/features/accessibility/state/Accessibility.ts
index 9b405497f..94234e09a 100644
--- a/fluxer_app/src/features/accessibility/state/Accessibility.ts
+++ b/fluxer_app/src/features/accessibility/state/Accessibility.ts
@@ -22,8 +22,8 @@ import {initializeStore} from '@app/features/platform/utils/StoreInitialization'
import MobileLayout from '@app/features/ui/state/MobileLayout';
import {applyAppZoomToDocument} from '@app/features/ui/utils/AppZoomUtils';
import {makeSyncedField} from '@app/features/user/state/SyncedField';
-import {decodeSyncedPreferencesLenient} from '@app/features/user/state/SyncedPreferencesEngine';
import {StickerAnimationOptions} from '@fluxer/constants/src/UserConstants';
+import {decodeSyncedPreferencesLenient} from '@fluxer/schema/src/domains/user/SyncedPreferencesCodec';
import {
AccessibilitySettingsSchema,
ChannelTypingIndicatorMode as ProtoChannelTypingIndicatorMode,
diff --git a/fluxer_app/src/features/app/components/dialogs/components/AllSettingsRenderer.tsx b/fluxer_app/src/features/app/components/dialogs/components/AllSettingsRenderer.tsx
index 00cc766b1..e1bf2dea0 100644
--- a/fluxer_app/src/features/app/components/dialogs/components/AllSettingsRenderer.tsx
+++ b/fluxer_app/src/features/app/components/dialogs/components/AllSettingsRenderer.tsx
@@ -19,7 +19,7 @@ import KeybindsTab from '@app/features/user/components/modals/tabs/KeybindsTab';
import LanguageTab from '@app/features/user/components/modals/tabs/LanguageTab';
import LinkedAccountsTab from '@app/features/user/components/modals/tabs/LinkedAccountsTab';
import MyProfileTab from '@app/features/user/components/modals/tabs/MyProfileTab';
-import {NotificationsInlineContent} from '@app/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline';
+import {NotificationsInlineContent} from '@app/features/user/components/modals/tabs/NotificationsTab';
import {PlutoniumInlineTab} from '@app/features/user/components/modals/tabs/PlutoniumTab';
import {PrivacyDashboardContent} from '@app/features/user/components/modals/tabs/privacy_safety_tab/PrivacySafetyTabInline';
import {VoiceVideoInlineContent} from '@app/features/user/components/modals/tabs/voice_video_tab/VoiceVideoTabInline';
diff --git a/fluxer_app/src/features/app/components/dialogs/components/FeatureComparisonTable.tsx b/fluxer_app/src/features/app/components/dialogs/components/FeatureComparisonTable.tsx
index 304df825a..998c12091 100644
--- a/fluxer_app/src/features/app/components/dialogs/components/FeatureComparisonTable.tsx
+++ b/fluxer_app/src/features/app/components/dialogs/components/FeatureComparisonTable.tsx
@@ -6,6 +6,7 @@ import styles from '@app/features/app/components/dialogs/components/FeatureCompa
import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
import {Limits} from '@app/features/app/utils/UserLimits';
import {COMMUNITIES_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
+import {formatNumber} from '@app/features/i18n/utils/IntlCache';
import {formatFileSize} from '@app/features/messaging/utils/FileUtils';
import {getPremiumProductName} from '@app/features/premium/utils/PremiumUtils';
import {
@@ -17,7 +18,6 @@ import {
} from '@fluxer/constants/src/LimitTierPerks';
import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
-import {formatNumber} from '@pkgs/number_utils/src/NumberFormatting';
import {observer} from 'mobx-react-lite';
import {useMemo} from 'react';
diff --git a/fluxer_app/src/features/app/components/dialogs/components/MobileGuildSettingsView.tsx b/fluxer_app/src/features/app/components/dialogs/components/MobileGuildSettingsView.tsx
index c5426a2e0..4b3543830 100644
--- a/fluxer_app/src/features/app/components/dialogs/components/MobileGuildSettingsView.tsx
+++ b/fluxer_app/src/features/app/components/dialogs/components/MobileGuildSettingsView.tsx
@@ -8,13 +8,14 @@ import {
MobileSettingsDangerItem,
MobileSettingsList,
} from '@app/features/app/components/dialogs/shared/MobileSettingsComponents';
+import {usePreservedScrollerPosition} from '@app/features/app/components/dialogs/shared/UsePreservedScrollerPosition';
import Authentication from '@app/features/auth/state/Authentication';
import {GuildDeleteModal} from '@app/features/guild/components/modals/GuildDeleteModal';
import type {Guild} from '@app/features/guild/models/Guild';
import {isStockCommunityGuild} from '@app/features/guild/utils/GuildCommunityUtils';
import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
import {modal} from '@app/features/ui/commands/ModalCommands';
-import {Scroller, type ScrollerHandle} from '@app/features/ui/components/Scroller';
+import {Scroller} from '@app/features/ui/components/Scroller';
import userSettingsStyles from '@app/features/user/components/modals/UserSettingsModal.module.css';
import type {
GuildSettingsTab,
@@ -30,7 +31,7 @@ import {TrashIcon} from '@phosphor-icons/react';
import {AnimatePresence, motion} from 'framer-motion';
import {observer} from 'mobx-react-lite';
import type React from 'react';
-import {type UIEvent, useCallback, useEffect, useRef} from 'react';
+import {useCallback} from 'react';
const DELETE_COMMUNITY_DESCRIPTOR = msg({
message: 'Delete community',
@@ -104,19 +105,7 @@ export const MobileGuildSettingsView: React.FC<MobileGuildSettingsViewProps> = o
);
const showMobileList = mobileNav.isRootView;
const showMobileContent = !mobileNav.isRootView;
- const listScrollPositionRef = useRef(0);
- const listScrollerRef = useRef<ScrollerHandle | null>(null);
- const handleListScroll = useCallback((event: UIEvent<HTMLDivElement>) => {
- listScrollPositionRef.current = event.currentTarget.scrollTop;
- }, []);
- useEffect(() => {
- if (!showMobileList) return;
- const scroller = listScrollerRef.current;
- if (!scroller) return;
- const target = listScrollPositionRef.current;
- if (target === 0) return;
- scroller.scrollTo({to: target, animate: false});
- }, [showMobileList]);
+ const {scrollerRef: listScrollerRef, handleScroll: handleListScroll} = usePreservedScrollerPosition(showMobileList);
const dangerAction =
guild.isOwner(Authentication.currentUserId) && !isStockCommunityGuild(guild.id) ? (
<MobileSettingsDangerItem
diff --git a/fluxer_app/src/features/app/components/dialogs/components/PricingCard.tsx b/fluxer_app/src/features/app/components/dialogs/components/PricingCard.tsx
index f1081c7bf..b1e07a26c 100644
--- a/fluxer_app/src/features/app/components/dialogs/components/PricingCard.tsx
+++ b/fluxer_app/src/features/app/components/dialogs/components/PricingCard.tsx
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import styles from '@app/features/app/components/dialogs/components/PricingCard.module.css';
+import {formatNumber} from '@app/features/i18n/utils/IntlCache';
import {Button} from '@app/features/ui/button/Button';
import * as LocaleUtils from '@app/features/user/utils/LocaleUtils';
import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
-import {formatNumber} from '@pkgs/number_utils/src/NumberFormatting';
import {clsx} from 'clsx';
import {observer} from 'mobx-react-lite';
import {useCallback} from 'react';
diff --git a/fluxer_app/src/features/app/components/layout/sidebar_nav/AddGuildButton.tsx b/fluxer_app/src/features/app/components/layout/sidebar_nav/AddGuildButton.tsx
index b373b7b23..91cca5ece 100644
--- a/fluxer_app/src/features/app/components/layout/sidebar_nav/AddGuildButton.tsx
+++ b/fluxer_app/src/features/app/components/layout/sidebar_nav/AddGuildButton.tsx
@@ -1,11 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import Accessibility from '@app/features/accessibility/state/Accessibility';
-import guildStyles from '@app/features/app/components/layout/GuildsLayout.module.css';
-import styles from '@app/features/app/components/layout/sidebar_nav/AddGuildButton.module.css';
-import {useContextMenuHoverState} from '@app/features/app/hooks/useContextMenuHoverState';
-import {useHover} from '@app/features/app/hooks/useHover';
-import {useMergeRefs} from '@app/features/app/hooks/useMergeRefs';
+import {GuildListActionButton} from '@app/features/app/components/layout/sidebar_nav/GuildListActionButton';
+import styles from '@app/features/app/components/layout/sidebar_nav/GuildListActionButton.module.css';
import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
import {AddGuildModal, type AddGuildModalView} from '@app/features/guild/components/modals/AddGuildModal';
import {
@@ -17,17 +13,12 @@ import {MenuItem} from '@app/features/ui/action_menu/MenuItem';
import * as ContextMenuCommands from '@app/features/ui/commands/ContextMenuCommands';
import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
import {modal} from '@app/features/ui/commands/ModalCommands';
-import FocusRing from '@app/features/ui/focus_ring/FocusRing';
import {TooltipWithKeybind} from '@app/features/ui/keybind_hint/KeybindHint';
-import {Tooltip} from '@app/features/ui/tooltip/Tooltip';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
import {HouseIcon, LinkIcon, PlusIcon} from '@phosphor-icons/react';
-import {clsx} from 'clsx';
-import {motion} from 'framer-motion';
import {observer} from 'mobx-react-lite';
import type React from 'react';
-import {useRef} from 'react';
const CREATE_OR_JOIN_A_COMMUNITY_DESCRIPTOR = msg({
message: 'Create or join a community',
@@ -35,12 +26,6 @@ const CREATE_OR_JOIN_A_COMMUNITY_DESCRIPTOR = msg({
});
export const AddGuildButton = observer(() => {
const {i18n} = useLingui();
- const [hoverRef, isHovering] = useHover();
- const buttonRef = useRef<HTMLButtonElement | null>(null);
- const iconRef = useRef<HTMLDivElement | null>(null);
- const itemRef = useRef<HTMLElement | null>(null);
- const contextMenuOpen = useContextMenuHoverState(itemRef);
- const mergedButtonRef = useMergeRefs([hoverRef, buttonRef, itemRef]);
const buttonLabel = i18n._(CREATE_OR_JOIN_A_COMMUNITY_DESCRIPTOR);
const handleAddGuild = (view?: AddGuildModalView) => {
ModalCommands.push(
@@ -91,61 +76,27 @@ export const AddGuildButton = observer(() => {
</MenuGroup>
));
};
- const shouldShowHoverState = isHovering || contextMenuOpen;
if (RuntimeConfig.singleCommunityEnabled) {
return null;
}
return (
- <div
- className={clsx(guildStyles.createGuildButton, contextMenuOpen && guildStyles.contextMenuHover)}
- data-flx="app.sidebar-nav.add-guild-button.div"
- >
- <Tooltip
- position="right"
- size="large"
- text={() => (
- <TooltipWithKeybind
- label={buttonLabel}
- action="nav_add_guild"
- data-flx="app.sidebar-nav.add-guild-button.tooltip-with-keybind"
- />
- )}
- data-flx="app.sidebar-nav.add-guild-button.tooltip"
- >
- <FocusRing
- offset={-2}
- focusTarget={buttonRef}
- ringTarget={iconRef}
- data-flx="app.sidebar-nav.add-guild-button.focus-ring"
- >
- <button
- type="button"
- aria-label={buttonLabel}
- aria-haspopup="dialog"
- data-guild-list-focus-item="true"
- onClick={() => handleAddGuild()}
- onContextMenu={handleContextMenu}
- className={styles.button}
- ref={mergedButtonRef}
- data-flx="app.sidebar-nav.add-guild-button.button.add-guild"
- >
- <motion.div
- ref={iconRef}
- className={guildStyles.createGuildButtonIcon}
- animate={{borderRadius: shouldShowHoverState ? '30%' : '50%'}}
- initial={{borderRadius: shouldShowHoverState ? '30%' : '50%'}}
- transition={{duration: Accessibility.useReducedMotion ? 0 : 0.07, ease: 'easeOut'}}
- data-flx="app.sidebar-nav.add-guild-button.div--2"
- >
- <PlusIcon
- weight="bold"
- className={styles.iconText}
- data-flx="app.sidebar-nav.add-guild-button.icon-text"
- />
- </motion.div>
- </button>
- </FocusRing>
- </Tooltip>
- </div>
+ <GuildListActionButton
+ label={buttonLabel}
+ tooltip={() => (
+ <TooltipWithKeybind
+ label={buttonLabel}
+ action="nav_add_guild"
+ data-flx="app.sidebar-nav.add-guild-button.tooltip-with-keybind"
+ />
+ )}
+ icon={
+ <PlusIcon weight="bold" className={styles.iconText} data-flx="app.sidebar-nav.add-guild-button.icon-text" />
+ }
+ onClick={() => handleAddGuild()}
+ onContextMenu={handleContextMenu}
+ hasDialogPopup
+ buttonDataFlx="app.sidebar-nav.add-guild-button.button.add-guild"
+ data-flx="app.sidebar-nav.add-guild-button"
+ />
);
});
diff --git a/fluxer_app/src/features/app/components/layout/sidebar_nav/DownloadButton.module.css b/fluxer_app/src/features/app/components/layout/sidebar_nav/DownloadButton.module.css
deleted file mode 100644
index 79393dbb0..000000000
--- a/fluxer_app/src/features/app/components/layout/sidebar_nav/DownloadButton.module.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: AGPL-3.0-or-later */
-
-.button {
- position: relative;
- display: flex;
- width: 100%;
- justify-content: center;
- border: none;
- background-color: transparent;
- padding: 0;
-}
-
-.iconText {
- height: 1.25rem;
- width: 1.25rem;
- color: var(--text-primary);
-}
-
-.menuIcon {
- height: 1rem;
- width: 1rem;
-}
diff --git a/fluxer_app/src/features/app/components/layout/sidebar_nav/DownloadButton.tsx b/fluxer_app/src/features/app/components/layout/sidebar_nav/DownloadButton.tsx
index 3fbf66877..ade74a032 100644
--- a/fluxer_app/src/features/app/components/layout/sidebar_nav/DownloadButton.tsx
+++ b/fluxer_app/src/features/app/components/layout/sidebar_nav/DownloadButton.tsx
@@ -1,28 +1,19 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import Accessibility from '@app/features/accessibility/state/Accessibility';
-import guildStyles from '@app/features/app/components/layout/GuildsLayout.module.css';
-import styles from '@app/features/app/components/layout/sidebar_nav/DownloadButton.module.css';
+import {GuildListActionButton} from '@app/features/app/components/layout/sidebar_nav/GuildListActionButton';
+import styles from '@app/features/app/components/layout/sidebar_nav/GuildListActionButton.module.css';
import {DESKTOP_DOWNLOAD_URL} from '@app/features/app/config/I18nDisplayConstants';
-import {useContextMenuHoverState} from '@app/features/app/hooks/useContextMenuHoverState';
-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 HiddenGuildListButtons from '@app/features/guild/state/HiddenGuildListButtons';
import {openExternalUrlWithWarning} from '@app/features/messaging/utils/ExternalLinkUtils';
import {MenuGroup} from '@app/features/ui/action_menu/MenuGroup';
import {MenuItem} from '@app/features/ui/action_menu/MenuItem';
import * as ContextMenuCommands from '@app/features/ui/commands/ContextMenuCommands';
-import FocusRing from '@app/features/ui/focus_ring/FocusRing';
-import {Tooltip} from '@app/features/ui/tooltip/Tooltip';
import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
import {DownloadSimpleIcon, EyeSlashIcon} from '@phosphor-icons/react';
-import {clsx} from 'clsx';
-import {motion} from 'framer-motion';
import {observer} from 'mobx-react-lite';
import type React from 'react';
-import {useRef} from 'react';
const DOWNLOAD_DESCRIPTOR = msg({
message: 'Download {productName}',
@@ -30,12 +21,6 @@ const DOWNLOAD_DESCRIPTOR = msg({
});
export const DownloadButton = observer(() => {
const {i18n} = useLingui();
- const [hoverRef, isHovering] = useHover();
- const buttonRef = useRef<HTMLButtonElement | null>(null);
- const iconRef = useRef<HTMLDivElement | null>(null);
- const itemRef = useRef<HTMLElement | null>(null);
- const contextMenuOpen = useContextMenuHoverState(itemRef);
- const mergedButtonRef = useMergeRefs([hoverRef, buttonRef, itemRef]);
if (HiddenGuildListButtons.downloadButtonHidden) {
return null;
}
@@ -65,51 +50,21 @@ export const DownloadButton = observer(() => {
</MenuGroup>
));
};
- const shouldShowHoverState = isHovering || contextMenuOpen;
return (
- <div
- className={clsx(guildStyles.createGuildButton, contextMenuOpen && guildStyles.contextMenuHover)}
- data-flx="app.sidebar-nav.download-button.div"
- >
- <Tooltip
- position="right"
- size="large"
- text={() => i18n._(DOWNLOAD_DESCRIPTOR, {productName: RuntimeConfig.productName})}
- data-flx="app.sidebar-nav.download-button.tooltip"
- >
- <FocusRing
- offset={-2}
- focusTarget={buttonRef}
- ringTarget={iconRef}
- data-flx="app.sidebar-nav.download-button.focus-ring"
- >
- <button
- type="button"
- aria-label={i18n._(DOWNLOAD_DESCRIPTOR, {productName: RuntimeConfig.productName})}
- data-guild-list-focus-item="true"
- onClick={handleDownload}
- onContextMenu={handleContextMenu}
- className={styles.button}
- ref={mergedButtonRef}
- data-flx="app.sidebar-nav.download-button.button.download"
- >
- <motion.div
- ref={iconRef}
- className={guildStyles.createGuildButtonIcon}
- animate={{borderRadius: shouldShowHoverState ? '30%' : '50%'}}
- initial={{borderRadius: shouldShowHoverState ? '30%' : '50%'}}
- transition={{duration: Accessibility.useReducedMotion ? 0 : 0.07, ease: 'easeOut'}}
- data-flx="app.sidebar-nav.download-button.div--2"
- >
- <DownloadSimpleIcon
- weight="bold"
- className={styles.iconText}
- data-flx="app.sidebar-nav.download-button.icon-text"
- />
- </motion.div>
- </button>
- </FocusRing>
- </Tooltip>
- </div>
+ <GuildListActionButton
+ label={i18n._(DOWNLOAD_DESCRIPTOR, {productName: RuntimeConfig.productName})}
+ tooltip={() => i18n._(DOWNLOAD_DESCRIPTOR, {productName: RuntimeConfig.productName})}
+ icon={
+ <DownloadSimpleIcon
+ weight="bold"
+ className={styles.iconText}
+ data-flx="app.sidebar-nav.download-button.icon-text"
+ />
+ }
+ onClick={handleDownload}
+ onContextMenu={handleContextMenu}
+ buttonDataFlx="app.sidebar-nav.download-button.button.download"
+ data-flx="app.sidebar-nav.download-button"
+ />
);
});
diff --git a/fluxer_app/src/features/app/components/layout/sidebar_nav/AddGuildButton.module.css b/fluxer_app/src/features/app/components/layout/sidebar_nav/GuildListActionButton.module.css
similarity index 100%
rename from fluxer_app/src/features/app/components/layout/sidebar_nav/AddGuildButton.module.css
rename to fluxer_app/src/features/app/components/layout/sidebar_nav/GuildListActionButton.module.css
diff --git a/fluxer_app/src/features/app/components/layout/sidebar_nav/GuildListActionButton.tsx b/fluxer_app/src/features/app/components/layout/sidebar_nav/GuildListActionButton.tsx
new file mode 100644
index 000000000..7bfcdd1a8
--- /dev/null
+++ b/fluxer_app/src/features/app/components/layout/sidebar_nav/GuildListActionButton.tsx
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import Accessibility from '@app/features/accessibility/state/Accessibility';
+import guildStyles from '@app/features/app/components/layout/GuildsLayout.module.css';
+import styles from '@app/features/app/components/layout/sidebar_nav/GuildListActionButton.module.css';
+import {useContextMenuHoverState} from '@app/features/app/hooks/useContextMenuHoverState';
+import {useHover} from '@app/features/app/hooks/useHover';
+import {useMergeRefs} from '@app/features/app/hooks/useMergeRefs';
+import FocusRing from '@app/features/ui/focus_ring/FocusRing';
+import {Tooltip} from '@app/features/ui/tooltip/Tooltip';
+import {clsx} from 'clsx';
+import {motion} from 'framer-motion';
+import {observer} from 'mobx-react-lite';
+import type React from 'react';
+import {useRef} from 'react';
+
+interface GuildListActionButtonProps {
+ label: string;
+ tooltip: () => React.ReactNode;
+ icon: React.ReactNode;
+ onClick: () => void;
+ onContextMenu: (event: React.MouseEvent) => void;
+ hasDialogPopup?: boolean;
+ buttonDataFlx: string;
+ 'data-flx': string;
+}
+
+export const GuildListActionButton = observer(
+ ({
+ label,
+ tooltip,
+ icon,
+ onClick,
+ onContextMenu,
+ hasDialogPopup = false,
+ buttonDataFlx,
+ 'data-flx': dataFlx,
+ }: GuildListActionButtonProps) => {
+ const [hoverRef, isHovering] = useHover();
+ const buttonRef = useRef<HTMLButtonElement | null>(null);
+ const iconRef = useRef<HTMLDivElement | null>(null);
+ const itemRef = useRef<HTMLElement | null>(null);
+ const contextMenuOpen = useContextMenuHoverState(itemRef);
+ const mergedButtonRef = useMergeRefs([hoverRef, buttonRef, itemRef]);
+ const shouldShowHoverState = isHovering || contextMenuOpen;
+ return (
+ <div
+ className={clsx(guildStyles.createGuildButton, contextMenuOpen && guildStyles.contextMenuHover)}
+ data-flx={`${dataFlx}.div`}
+ >
+ <Tooltip position="right" size="large" text={tooltip} data-flx={`${dataFlx}.tooltip`}>
+ <FocusRing offset={-2} focusTarget={buttonRef} ringTarget={iconRef} data-flx={`${dataFlx}.focus-ring`}>
+ <button
+ type="button"
+ aria-label={label}
+ aria-haspopup={hasDialogPopup ? 'dialog' : undefined}
+ data-guild-list-focus-item="true"
+ onClick={onClick}
+ onContextMenu={onContextMenu}
+ className={styles.button}
+ ref={mergedButtonRef}
+ data-flx={buttonDataFlx}
+ >
+ <motion.div
+ ref={iconRef}
+ className={guildStyles.createGuildButtonIcon}
+ animate={{borderRadius: shouldShowHoverState ? '30%' : '50%'}}
+ initial={{borderRadius: shouldShowHoverState ? '30%' : '50%'}}
+ transition={{duration: Accessibility.useReducedMotion ? 0 : 0.07, ease: 'easeOut'}}
+ data-flx={`${dataFlx}.div--2`}
+ >
+ {icon}
+ </motion.div>
+ </button>
+ </FocusRing>
+ </Tooltip>
+ </div>
+ );
+ },
+);
diff --git a/fluxer_app/src/features/app/components/layout/sidebar_nav/GuildListItemTooltip.tsx b/fluxer_app/src/features/app/components/layout/sidebar_nav/GuildListItemTooltip.tsx
index 21b6f703c..fb4d7b944 100644
--- a/fluxer_app/src/features/app/components/layout/sidebar_nav/GuildListItemTooltip.tsx
+++ b/fluxer_app/src/features/app/components/layout/sidebar_nav/GuildListItemTooltip.tsx
@@ -6,6 +6,7 @@ import type {SidebarVoiceRow} from '@app/features/app/hooks/useSidebarVoiceSumma
import {GuildBadge} from '@app/features/guild/components/GuildBadge';
import type {Guild} from '@app/features/guild/models/Guild';
import type {GuildCounts} from '@app/features/guild/state/GuildCount';
+import {formatNumber} from '@app/features/i18n/utils/IntlCache';
import type {KeyCombo} from '@app/features/input/state/InputKeybind';
import {AvatarStack} from '@app/features/ui/avatars/AvatarStack';
import {KeybindHint} from '@app/features/ui/keybind_hint/KeybindHint';
@@ -14,7 +15,6 @@ import {GuildFeatures} from '@fluxer/constants/src/GuildConstants';
import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
import {BellSlashIcon, MonitorPlayIcon, SpeakerHighIcon} from '@phosphor-icons/react';
-import {formatNumber} from '@pkgs/number_utils/src/NumberFormatting';
import type React from 'react';
const INVITES_PAUSED_RAID_TOOLTIP_DESCRIPTOR = msg({
diff --git a/fluxer_app/src/features/app/components/layout/sidebar_nav/HelpButton.module.css b/fluxer_app/src/features/app/components/layout/sidebar_nav/HelpButton.module.css
deleted file mode 100644
index 79393dbb0..000000000
--- a/fluxer_app/src/features/app/components/layout/sidebar_nav/HelpButton.module.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: AGPL-3.0-or-later */
-
-.button {
- position: relative;
- display: flex;
- width: 100%;
- justify-content: center;
- border: none;
- background-color: transparent;
- padding: 0;
-}
-
-.iconText {
- height: 1.25rem;
- width: 1.25rem;
- color: var(--text-primary);
-}
-
-.menuIcon {
- height: 1rem;
- width: 1rem;
-}
diff --git a/fluxer_app/src/features/app/components/layout/sidebar_nav/HelpButton.tsx b/fluxer_app/src/features/app/components/layout/sidebar_nav/HelpButton.tsx
index 84b258293..279bbe941 100644
--- a/fluxer_app/src/features/app/components/layout/sidebar_nav/HelpButton.tsx
+++ b/fluxer_app/src/features/app/components/layout/sidebar_nav/HelpButton.tsx
@@ -1,28 +1,19 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {Routes} from '@app/app/Routes';
-import Accessibility from '@app/features/accessibility/state/Accessibility';
-import guildStyles from '@app/features/app/components/layout/GuildsLayout.module.css';
-import styles from '@app/features/app/components/layout/sidebar_nav/HelpButton.module.css';
-import {useContextMenuHoverState} from '@app/features/app/hooks/useContextMenuHoverState';
-import {useHover} from '@app/features/app/hooks/useHover';
-import {useMergeRefs} from '@app/features/app/hooks/useMergeRefs';
+import {GuildListActionButton} from '@app/features/app/components/layout/sidebar_nav/GuildListActionButton';
+import styles from '@app/features/app/components/layout/sidebar_nav/GuildListActionButton.module.css';
import HiddenGuildListButtons from '@app/features/guild/state/HiddenGuildListButtons';
import {openExternalUrlWithWarning} from '@app/features/messaging/utils/ExternalLinkUtils';
import {MenuGroup} from '@app/features/ui/action_menu/MenuGroup';
import {MenuItem} from '@app/features/ui/action_menu/MenuItem';
import * as ContextMenuCommands from '@app/features/ui/commands/ContextMenuCommands';
-import FocusRing from '@app/features/ui/focus_ring/FocusRing';
import {TooltipWithKeybind} from '@app/features/ui/keybind_hint/KeybindHint';
-import {Tooltip} from '@app/features/ui/tooltip/Tooltip';
import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
import {EyeSlashIcon, QuestionMarkIcon} from '@phosphor-icons/react';
-import {clsx} from 'clsx';
-import {motion} from 'framer-motion';
import {observer} from 'mobx-react-lite';
import type React from 'react';
-import {useRef} from 'react';
const HELP_CENTER_DESCRIPTOR = msg({
message: 'Help center',
@@ -30,12 +21,6 @@ const HELP_CENTER_DESCRIPTOR = msg({
});
export const HelpButton = observer(() => {
const {i18n} = useLingui();
- const [hoverRef, isHovering] = useHover();
- const buttonRef = useRef<HTMLButtonElement | null>(null);
- const iconRef = useRef<HTMLDivElement | null>(null);
- const itemRef = useRef<HTMLElement | null>(null);
- const contextMenuOpen = useContextMenuHoverState(itemRef);
- const mergedButtonRef = useMergeRefs([hoverRef, buttonRef, itemRef]);
const helpUrl = Routes.help();
if (HiddenGuildListButtons.helpButtonHidden || !helpUrl) {
return null;
@@ -66,57 +51,23 @@ export const HelpButton = observer(() => {
</MenuGroup>
));
};
- const shouldShowHoverState = isHovering || contextMenuOpen;
return (
- <div
- className={clsx(guildStyles.createGuildButton, contextMenuOpen && guildStyles.contextMenuHover)}
- data-flx="app.sidebar-nav.help-button.div"
- >
- <Tooltip
- position="right"
- size="large"
- text={() => (
- <TooltipWithKeybind
- label={i18n._(HELP_CENTER_DESCRIPTOR)}
- action="misc_help"
- data-flx="app.sidebar-nav.help-button.tooltip-with-keybind"
- />
- )}
- data-flx="app.sidebar-nav.help-button.tooltip"
- >
- <FocusRing
- offset={-2}
- focusTarget={buttonRef}
- ringTarget={iconRef}
- data-flx="app.sidebar-nav.help-button.focus-ring"
- >
- <button
- type="button"
- aria-label={i18n._(HELP_CENTER_DESCRIPTOR)}
- data-guild-list-focus-item="true"
- onClick={handleHelp}
- onContextMenu={handleContextMenu}
- className={styles.button}
- ref={mergedButtonRef}
- data-flx="app.sidebar-nav.help-button.button.help"
- >
- <motion.div
- ref={iconRef}
- className={guildStyles.createGuildButtonIcon}
- animate={{borderRadius: shouldShowHoverState ? '30%' : '50%'}}
- initial={{borderRadius: shouldShowHoverState ? '30%' : '50%'}}
- transition={{duration: Accessibility.useReducedMotion ? 0 : 0.07, ease: 'easeOut'}}
- data-flx="app.sidebar-nav.help-button.div--2"
- >
- <QuestionMarkIcon
- weight="bold"
- className={styles.iconText}
- data-flx="app.sidebar-nav.help-button.icon-text"
- />
- </motion.div>
- </button>
- </FocusRing>
- </Tooltip>
- </div>
+ <GuildListActionButton
+ label={i18n._(HELP_CENTER_DESCRIPTOR)}
+ tooltip={() => (
+ <TooltipWithKeybind
+ label={i18n._(HELP_CENTER_DESCRIPTOR)}
+ action="misc_help"
+ data-flx="app.sidebar-nav.help-button.tooltip-with-keybind"
+ />
+ )}
+ icon={
+ <QuestionMarkIcon weight="bold" className={styles.iconText} data-flx="app.sidebar-nav.help-button.icon-text" />
+ }
+ onClick={handleHelp}
+ onContextMenu={handleContextMenu}
+ buttonDataFlx="app.sidebar-nav.help-button.button.help"
+ data-flx="app.sidebar-nav.help-button"
+ />
);
});
diff --git a/fluxer_app/src/features/app/keybindings/KeybindEventUtils.ts b/fluxer_app/src/features/app/keybindings/KeybindEventUtils.ts
index 8cb8f62ca..0b8a0dd0c 100644
--- a/fluxer_app/src/features/app/keybindings/KeybindEventUtils.ts
+++ b/fluxer_app/src/features/app/keybindings/KeybindEventUtils.ts
@@ -7,7 +7,7 @@ export type KeyboardShortcutEvent = Pick<KeyboardEvent, 'key' | 'ctrlKey' | 'alt
Partial<Pick<KeyboardEvent, 'code'>>;
export type KeyboardShortcutPressEvent = KeyboardShortcutEvent & Pick<KeyboardEvent, 'repeat'>;
-const normalizeKeyboardShortcutKey = (key: string): string => {
+export const normalizeKeyboardShortcutKey = (key: string): string => {
if (key === ' ') return 'space';
if (key === 'Break') return 'pause';
return key.toLowerCase();
diff --git a/fluxer_app/src/features/app/keybindings/KeybindManager.ts b/fluxer_app/src/features/app/keybindings/KeybindManager.ts
index 21528cffe..eee9ffd8b 100644
--- a/fluxer_app/src/features/app/keybindings/KeybindManager.ts
+++ b/fluxer_app/src/features/app/keybindings/KeybindManager.ts
@@ -7,6 +7,7 @@ import {
keyboardEventReleasesComboModifier,
keyboardEventStartsComboPress,
keyboardEventTriggerMatchesCombo,
+ normalizeKeyboardShortcutKey,
shouldAllowLocalShortcutForChannelTextarea,
} from '@app/features/app/keybindings/KeybindEventUtils';
import {
@@ -105,11 +106,6 @@ import type {I18n} from '@lingui/core';
import CombokeysImport from 'combokeys';
import {autorun, compareStructural, computed, reaction} from 'mobx';
-const normalizeKeyboardShortcutKey = (key: string): string => {
- if (key === ' ') return 'space';
- if (key === 'Break') return 'pause';
- return key.toLowerCase();
-};
const ROUTE_ALLOWED_ACTIONS = new Set<KeybindCommand>(['system_open_theme_studio_popout']);
const GAMEPAD_POLL_INTERVAL_MS = 50;
const PORTAL_SOURCE_ID_PREFIX = 'portal:';
diff --git a/fluxer_app/src/features/app/state/Updater.ts b/fluxer_app/src/features/app/state/Updater.ts
index 46029221d..4bce426c0 100644
--- a/fluxer_app/src/features/app/state/Updater.ts
+++ b/fluxer_app/src/features/app/state/Updater.ts
@@ -4,7 +4,6 @@ import Config from '@app/features/app/config/Config';
import {DESKTOP_DOWNLOAD_URL} from '@app/features/app/config/I18nDisplayConstants';
import {WORKER_NAVIGATION_CACHE_PREFIX} from '@app/features/platform/service_worker/WorkerCacheCleanup';
import {getProtectedCacheStorage} from '@app/features/platform/state/ProtectedWebStorage';
-import type {UpdaterContext, UpdaterDownloadOption, UpdaterEvent} from '@app/features/platform/types/Electron';
import {Logger} from '@app/features/platform/utils/AppLogger';
import {getClientInfo} from '@app/features/platform/utils/ClientInfo';
import {flushPendingPersistWrites} from '@app/features/platform/utils/MobXPersistence';
@@ -27,9 +26,42 @@ import {
type UpdaterMachineSnapshot,
} from '@app/features/updater/state/UpdaterStateMachine';
import {buildLinuxManualUpdateOptions} from '@app/features/updater/utils/LinuxManualUpdateOptions';
-import type {UpdaterEvent as NativeUpdaterEvent} from '@app/types/electron.d';
+import type {UpdaterEvent as NativeUpdaterEvent, UpdaterDownloadOption} from '@app/types/electron.d';
import {makeAutoObservable, runInAction} from 'mobx';
+type UpdaterContext = NonNullable<NativeUpdaterEvent['context']>;
+type UpdaterEvent =
+ | {
+ type: 'checking';
+ context: UpdaterContext;
+ }
+ | {
+ type: 'available';
+ context: UpdaterContext;
+ version: string | null;
+ downloadUrl?: string;
+ downloadOptions?: Array<UpdaterDownloadOption>;
+ }
+ | {
+ type: 'not-available';
+ context: UpdaterContext;
+ }
+ | {
+ type: 'downloaded';
+ context: UpdaterContext;
+ }
+ | {
+ type: 'error';
+ context: UpdaterContext;
+ message: string;
+ }
+ | {
+ type: 'unsupported';
+ context: UpdaterContext;
+ reason: 'platform' | 'unpackaged' | 'managed-package';
+ downloadUrl?: string;
+ };
+
const logger = new Logger('Updater');
const CHECK_INTERVAL_MS = 5 * 60 * 1000;
const MIN_CHECK_INTERVAL_MS = 60 * 1000;
diff --git a/fluxer_app/src/features/auth/InstanceBranding.ts b/fluxer_app/src/features/auth/InstanceBranding.ts
index 4ec0b8362..784bfe638 100644
--- a/fluxer_app/src/features/auth/InstanceBranding.ts
+++ b/fluxer_app/src/features/auth/InstanceBranding.ts
@@ -9,7 +9,7 @@ type BrandingSnapshot = Pick<
const ASSET_PROTOCOLS: ReadonlySet<string> = new Set(['https:', 'http:']);
-function originOf(value: string | null | undefined): string | null {
+export function originOf(value: string | null | undefined): string | null {
if (value == null || value.length === 0) {
return null;
}
diff --git a/fluxer_app/src/features/auth/commands/AuthenticationCommands.ts b/fluxer_app/src/features/auth/commands/AuthenticationCommands.ts
index b1614bb99..f6d260b7b 100644
--- a/fluxer_app/src/features/auth/commands/AuthenticationCommands.ts
+++ b/fluxer_app/src/features/auth/commands/AuthenticationCommands.ts
@@ -16,10 +16,13 @@ import {APIErrorCodes} from '@fluxer/constants/src/ApiErrorCodes';
import type {ValueOf} from '@fluxer/constants/src/ValueOf';
import type {
AuthRegistrationPendingApprovalResponse,
+ DesktopHandoffReturnMethod,
RegisterRequest,
SsoCompleteResponse,
SsoStartRequest,
SsoStartResponse,
+ UsernameAvailabilityResponse,
+ UsernameSuggestionsResponse,
} from '@fluxer/schema/src/domains/auth/AuthSchemas';
import type {UserPartial} from '@fluxer/schema/src/domains/user/UserResponseSchemas';
import type {AuthenticationResponseJSON, PublicKeyCredentialRequestOptionsJSON} from '@simplewebauthn/browser';
@@ -131,8 +134,6 @@ interface RecoveryKitIssued {
export type RecoverAccountResponse = (AuthTokenResponse | MfaLoginResponse) & RecoveryKitIssued;
-export type DesktopHandoffReturnMethod = 'deep_link' | 'code';
-
interface DesktopHandoffInitiateResponse {
code: string;
expires_at: string;
@@ -443,10 +444,6 @@ export async function register(data: RegisterRequest, target: AuthRequestTarget)
}
}
-interface UsernameSuggestionsResponse {
- suggestions: Array<string>;
-}
-
export async function getUsernameSuggestions(globalName: string, target: InstanceHTTPTarget): Promise<Array<string>> {
try {
const response = await instanceRequest<UsernameSuggestionsResponse>({
@@ -465,10 +462,6 @@ export async function getUsernameSuggestions(globalName: string, target: Instanc
}
}
-interface UsernameAvailabilityResponse {
- available: boolean;
-}
-
export async function checkUsernameAvailability(
username: string,
target: InstanceHTTPTarget,
diff --git a/fluxer_app/src/features/auth/components/pages/oauth_authorize_page/hooks/useBotInviteDestinations.ts b/fluxer_app/src/features/auth/components/pages/oauth_authorize_page/hooks/useBotInviteDestinations.ts
index a2f5636ea..51530a600 100644
--- a/fluxer_app/src/features/auth/components/pages/oauth_authorize_page/hooks/useBotInviteDestinations.ts
+++ b/fluxer_app/src/features/auth/components/pages/oauth_authorize_page/hooks/useBotInviteDestinations.ts
@@ -9,6 +9,7 @@ import {
logger,
} from '@app/features/auth/components/pages/oauth_authorize_page/OAuthAuthorizePageShared';
import Accounts from '@app/features/auth/state/Accounts';
+import {formatList} from '@app/features/i18n/utils/IntlCache';
import {http} from '@app/features/platform/transport/RestTransport';
import {failureMessage} from '@app/features/platform/utils/ResponseInspection';
import * as AvatarUtils from '@app/features/user/utils/AvatarUtils';
@@ -17,7 +18,6 @@ import {ChannelTypes} from '@fluxer/constants/src/ChannelConstants';
import type {ChannelResponse} from '@fluxer/schema/src/domains/channel/ChannelSchemas';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
-import {formatListWithConfig} from '@pkgs/list_utils/src/ListFormatting';
import {useEffect, useMemo, useRef, useState} from 'react';
const UNKNOWN_COMMUNITY_DESCRIPTOR = msg({
@@ -102,7 +102,7 @@ function getGroupDmLabel(channel: ChannelResponse, unknownGroupDmLabel: string,
const names = recipients
.map((recipient) => recipient.global_name?.trim() || recipient.username?.trim())
.filter((name): name is string => Boolean(name));
- if (names.length > 0) return formatListWithConfig(names, {locale, style: 'narrow', type: 'conjunction'});
+ if (names.length > 0) return formatList(names, {locale, style: 'narrow', type: 'conjunction'});
return unknownGroupDmLabel;
}
diff --git a/fluxer_app/src/features/auth/flow/AuthMinimalRegisterFormCore.tsx b/fluxer_app/src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
deleted file mode 100644
index 0052f52a1..000000000
--- a/fluxer_app/src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
+++ /dev/null
@@ -1,277 +0,0 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-import type {RuntimeConfigSnapshot} from '@app/features/app/state/InstanceSnapshotStore';
-import * as AuthenticationCommands from '@app/features/auth/commands/AuthenticationCommands';
-import FormField from '@app/features/auth/flow/AuthFormField';
-import styles from '@app/features/auth/flow/AuthPageStyles.module.css';
-import {DateOfBirthField} from '@app/features/auth/flow/DateOfBirthField';
-import {
- getRegistrationLegalConsentConfig,
- RegistrationLegalConsent,
-} from '@app/features/auth/flow/RegistrationLegalConsent';
-import {type MissingField, SubmitTooltip, shouldDisableSubmit} from '@app/features/auth/flow/SubmitTooltip';
-import {useAuthForm} from '@app/features/auth/hooks/useAuthForm';
-import {
- type AuthRegisterFormDraft,
- EMPTY_AUTH_REGISTER_FORM_DRAFT,
- useAuthRegisterDraftContext,
-} from '@app/features/auth/state/AuthRegisterDraftContext';
-import {authRequestTargetFromSnapshot} from '@app/features/auth/state/AuthRequestTarget';
-import {
- DISPLAY_NAME_OPTIONAL_DESCRIPTOR,
- WHAT_SHOULD_PEOPLE_CALL_YOU_DESCRIPTOR,
-} from '@app/features/i18n/utils/CommonMessageDescriptors';
-import {useLocation} from '@app/features/platform/components/router/RouterReact';
-import {Button} from '@app/features/ui/button/Button';
-import type {ThemeType} from '@fluxer/constants/src/UserConstants';
-import {msg} from '@lingui/core/macro';
-import {Trans, useLingui} from '@lingui/react/macro';
-import {observer} from 'mobx-react-lite';
-import {useCallback, useId, useMemo, useRef, useState} from 'react';
-
-const DATE_OF_BIRTH_DESCRIPTOR = msg({
- message: 'Date of birth',
- comment: 'Short label in the authentication auth minimal register form core. Keep the tone plain and specific.',
-});
-
-interface AuthMinimalRegisterFormCoreProps {
- submitLabel: React.ReactNode;
- redirectPath: string;
- runtimeSnapshot: RuntimeConfigSnapshot;
- onRegister?: (response: AuthenticationCommands.TokenResponse) => Promise<void>;
- onAuthenticated?: () => void;
- inviteCode?: string;
- extraContent?: React.ReactNode;
- theme?: ThemeType;
-}
-
-export const AuthMinimalRegisterFormCore = observer(function AuthMinimalRegisterFormCore({
- submitLabel,
- redirectPath,
- runtimeSnapshot,
- onRegister,
- onAuthenticated,
- inviteCode,
- extraContent,
- theme,
-}: AuthMinimalRegisterFormCoreProps) {
- const {i18n} = useLingui();
- const location = useLocation();
- const draftKey = `register:${location.pathname}${location.search}`;
- const registrationUrlCode = useMemo(() => {
- const value = new URLSearchParams(location.search).get('registration_url')?.trim();
- return value || undefined;
- }, [location.search]);
- const registrationTarget = useMemo(() => authRequestTargetFromSnapshot(runtimeSnapshot), [runtimeSnapshot]);
- const isPublicRegistrationClosed = runtimeSnapshot.registration.mode === 'closed' && !registrationUrlCode;
- const collectDateOfBirth = runtimeSnapshot.appPublic.registration.collect_date_of_birth;
- const {getRegisterFormDraft, setRegisterFormDraft, clearRegisterFormDraft} = useAuthRegisterDraftContext();
- const globalNameId = useId();
- const initialDraft = useMemo<AuthRegisterFormDraft>(() => {
- const persistedDraft = getRegisterFormDraft(draftKey);
- if (!persistedDraft) {
- return EMPTY_AUTH_REGISTER_FORM_DRAFT;
- }
- return {
- ...persistedDraft,
- formValues: {...persistedDraft.formValues},
- };
- }, [draftKey, getRegisterFormDraft]);
- const draftRef = useRef<AuthRegisterFormDraft>({
- ...initialDraft,
- formValues: {...initialDraft.formValues},
- });
- const [selectedMonth, setSelectedMonthState] = useState(initialDraft.selectedMonth);
- const [selectedDay, setSelectedDayState] = useState(initialDraft.selectedDay);
- const [selectedYear, setSelectedYearState] = useState(initialDraft.selectedYear);
- const [consent, setConsentState] = useState(initialDraft.consent);
- const [pendingApprovalUserId, setPendingApprovalUserId] = useState<string | null>(null);
- const legalConsentConfig = getRegistrationLegalConsentConfig(runtimeSnapshot);
- const effectiveConsent = legalConsentConfig.requirement ? consent : true;
- const initialValues: Record<string, string> = {
- global_name: initialDraft.formValues.global_name ?? '',
- };
- const persistDraft = useCallback(
- (partialDraft: Partial<AuthRegisterFormDraft>) => {
- const currentDraft = draftRef.current;
- const nextDraft: AuthRegisterFormDraft = {
- ...currentDraft,
- ...partialDraft,
- formValues: partialDraft.formValues ? {...partialDraft.formValues} : currentDraft.formValues,
- };
- draftRef.current = nextDraft;
- setRegisterFormDraft(draftKey, nextDraft);
- },
- [draftKey, setRegisterFormDraft],
- );
- const handleMonthChange = useCallback(
- (month: string) => {
- setSelectedMonthState(month);
- persistDraft({selectedMonth: month});
- },
- [persistDraft],
- );
- const handleDayChange = useCallback(
- (day: string) => {
- setSelectedDayState(day);
- persistDraft({selectedDay: day});
- },
- [persistDraft],
- );
- const handleYearChange = useCallback(
- (year: string) => {
- setSelectedYearState(year);
- persistDraft({selectedYear: year});
- },
- [persistDraft],
- );
- const handleConsentChange = useCallback(
- (nextConsent: boolean) => {
- setConsentState(nextConsent);
- persistDraft({consent: nextConsent});
- },
- [persistDraft],
- );
- const handleRegisterSubmit = async (values: Record<string, string>) => {
- if (isPublicRegistrationClosed) {
- return false;
- }
- setPendingApprovalUserId(null);
- const dateOfBirth =
- collectDateOfBirth && selectedYear && selectedMonth && selectedDay
- ? `${selectedYear}-${selectedMonth.padStart(2, '0')}-${selectedDay.padStart(2, '0')}`
- : undefined;
- const response = await AuthenticationCommands.register(
- {
- global_name: values.global_name || undefined,
- date_of_birth: dateOfBirth,
- consent: effectiveConsent,
- invite_code: inviteCode,
- registration_url_code: registrationUrlCode,
- theme,
- },
- registrationTarget,
- );
- if (AuthenticationCommands.isRegistrationPendingApprovalResponse(response)) {
- clearRegisterFormDraft(draftKey);
- setPendingApprovalUserId(response.user_id);
- return false;
- }
- if (onRegister) {
- await onRegister(response);
- } else {
- const userData = AuthenticationCommands.authResponseUserToUserData(response.user);
- await AuthenticationCommands.completeLogin({
- token: response.token,
- userId: response.user_id,
- ...(userData ? {userData} : {}),
- runtimeSnapshot,
- });
- }
- onAuthenticated?.();
- clearRegisterFormDraft(draftKey);
- return undefined;
- };
- const {form, isLoading, fieldErrors} = useAuthForm({
- initialValues,
- onSubmit: handleRegisterSubmit,
- redirectPath,
- firstFieldName: 'global_name',
- });
- const setDraftedFormValue = useCallback(
- (fieldName: string, value: string) => {
- form.setValue(fieldName, value);
- const nextFormValues = {
- ...draftRef.current.formValues,
- [fieldName]: value,
- };
- persistDraft({formValues: nextFormValues});
- },
- [form, persistDraft],
- );
- const missingFields = useMemo(() => {
- const missing: Array<MissingField> = [];
- if (collectDateOfBirth && (!selectedMonth || !selectedDay || !selectedYear)) {
- missing.push({key: 'date_of_birth', label: i18n._(DATE_OF_BIRTH_DESCRIPTOR)});
- }
- return missing;
- }, [selectedMonth, selectedDay, selectedYear, collectDateOfBirth, i18n.locale]);
- const globalNameValue = form.getValue('global_name');
- const submitDisabled =
- isLoading ||
- form.isSubmitting ||
- isPublicRegistrationClosed ||
- pendingApprovalUserId !== null ||
- shouldDisableSubmit(effectiveConsent, missingFields);
- return (
- <form
- className={styles.form}
- onSubmit={form.handleSubmit}
- data-flx="auth.flow.auth-minimal-register-form-core.form.submit"
- >
- {isPublicRegistrationClosed ? (
- <div
- className={styles.registrationNotice}
- role="alert"
- data-flx="auth.flow.auth-minimal-register-form-core.closed-notice"
- >
- <Trans>Registration is currently closed. Use a registration link from an admin to create an account.</Trans>
- </div>
- ) : null}
- {pendingApprovalUserId ? (
- <div
- className={styles.registrationNotice}
- role="status"
- data-flx="auth.flow.auth-minimal-register-form-core.pending-approval-notice"
- >
- <Trans>Your account request is pending approval. You can sign in after an admin approves it.</Trans>
- </div>
- ) : null}
- <FormField
- id={globalNameId}
- name="global_name"
- type="text"
- label={i18n._(DISPLAY_NAME_OPTIONAL_DESCRIPTOR)}
- placeholder={i18n._(WHAT_SHOULD_PEOPLE_CALL_YOU_DESCRIPTOR)}
- value={globalNameValue}
- onChange={(value) => setDraftedFormValue('global_name', value)}
- error={form.getError('global_name') || fieldErrors?.get('global_name')}
- data-flx="auth.flow.auth-minimal-register-form-core.form-field.set-drafted-form-value.text"
- />
- {collectDateOfBirth ? (
- <DateOfBirthField
- selectedMonth={selectedMonth}
- selectedDay={selectedDay}
- selectedYear={selectedYear}
- onMonthChange={handleMonthChange}
- onDayChange={handleDayChange}
- onYearChange={handleYearChange}
- error={fieldErrors?.get('date_of_birth')}
- data-flx="auth.flow.auth-minimal-register-form-core.date-of-birth-field"
- />
- ) : null}
- {extraContent}
- <RegistrationLegalConsent
- checked={consent}
- config={legalConsentConfig}
- onChange={handleConsentChange}
- data-flx="auth.flow.auth-minimal-register-form-core.registration-legal-consent.consent-change"
- />
- <SubmitTooltip
- consent={effectiveConsent}
- legalConsentRequirement={legalConsentConfig.requirement ?? undefined}
- missingFields={missingFields}
- data-flx="auth.flow.auth-minimal-register-form-core.submit-tooltip"
- >
- <Button
- type="submit"
- fitContainer
- disabled={submitDisabled}
- data-flx="auth.flow.auth-minimal-register-form-core.button.submit"
- >
- {submitLabel}
- </Button>
- </SubmitTooltip>
- </form>
- );
-});
diff --git a/fluxer_app/src/features/auth/flow/AuthRegisterFormCore.tsx b/fluxer_app/src/features/auth/flow/AuthRegisterFormCore.tsx
index 43a583b1e..089f47b18 100644
--- a/fluxer_app/src/features/auth/flow/AuthRegisterFormCore.tsx
+++ b/fluxer_app/src/features/auth/flow/AuthRegisterFormCore.tsx
@@ -47,6 +47,10 @@ const DATE_OF_BIRTH_DESCRIPTOR = msg({
message: 'Date of birth',
comment: 'Short label in the authentication auth register form core. Keep the tone plain and specific.',
});
+const DATE_OF_BIRTH_WITHOUT_USERNAME_DESCRIPTOR = msg({
+ message: 'Date of birth',
+ comment: 'Short label in the authentication auth minimal register form core. Keep the tone plain and specific.',
+});
const USERNAME_MUST_BE_CHARACTERS_OR_LESS_DESCRIPTOR = msg({
message: 'Username must be {maxUsernameLength} characters or fewer',
comment: 'Registration form validation error when the username exceeds the maximum length. Limit is interpolated.',
@@ -82,6 +86,7 @@ interface FieldConfig {
showEmail?: boolean;
showPassword?: boolean;
showPasswordConfirmation?: boolean;
+ showUsername?: boolean;
showUsernameValidation?: boolean;
requireUsername?: boolean;
}
@@ -118,9 +123,11 @@ export const AuthRegisterFormCore = observer(function AuthRegisterFormCore({
showEmail = false,
showPassword = false,
showPasswordConfirmation = false,
+ showUsername = true,
showUsernameValidation = false,
requireUsername = false,
} = fields;
+ const flx = showUsername ? 'auth.flow.auth-register-form-core' : 'auth.flow.auth-minimal-register-form-core';
const location = useLocation();
const draftKey = `register:${location.pathname}${location.search}`;
const registrationUrlCode = useMemo(() => {
@@ -159,8 +166,8 @@ export const AuthRegisterFormCore = observer(function AuthRegisterFormCore({
const effectiveConsent = legalConsentConfig.requirement ? consent : true;
const initialValues: Record<string, string> = {
global_name: initialDraft.formValues.global_name ?? '',
- username: initialDraft.formValues.username ?? '',
};
+ if (showUsername) initialValues.username = initialDraft.formValues.username ?? '';
if (showEmail) initialValues.email = initialDraft.formValues.email ?? '';
if (showPassword) initialValues.password = initialDraft.formValues.password ?? '';
if (showPassword && showPasswordConfirmation) {
@@ -283,6 +290,7 @@ export const AuthRegisterFormCore = observer(function AuthRegisterFormCore({
globalName: form.getValue('global_name'),
username: form.getValue('username'),
target: registrationTarget.http,
+ enabled: showUsername,
});
const missingFields = useMemo(() => {
const missing: Array<MissingField> = [];
@@ -299,7 +307,10 @@ export const AuthRegisterFormCore = observer(function AuthRegisterFormCore({
missing.push({key: 'confirm_password', label: i18n._(CONFIRM_PASSWORD_DESCRIPTOR)});
}
if (collectDateOfBirth && (!selectedMonth || !selectedDay || !selectedYear)) {
- missing.push({key: 'date_of_birth', label: i18n._(DATE_OF_BIRTH_DESCRIPTOR)});
+ missing.push({
+ key: 'date_of_birth',
+ label: i18n._(showUsername ? DATE_OF_BIRTH_DESCRIPTOR : DATE_OF_BIRTH_WITHOUT_USERNAME_DESCRIPTOR),
+ });
}
return missing;
}, [
@@ -311,6 +322,7 @@ export const AuthRegisterFormCore = observer(function AuthRegisterFormCore({
requireUsername,
showPassword,
showPasswordConfirmation,
+ showUsername,
collectDateOfBirth,
i18n.locale,
]);
@@ -326,7 +338,7 @@ export const AuthRegisterFormCore = observer(function AuthRegisterFormCore({
const usernameAvailability = useUsernameAvailability(
registrationTarget.http,
trimmedUsername,
- uniqueUsernames && trimmedUsername.length > 0 && usernameFormatValid,
+ showUsername && uniqueUsernames && trimmedUsername.length > 0 && usernameFormatValid,
);
const helperTextState = useMemo<HelperTextState>(() => {
if ((showUsernameValidation || requireUsername) && trimmedUsername.length > 0) {
@@ -371,22 +383,14 @@ export const AuthRegisterFormCore = observer(function AuthRegisterFormCore({
(uniqueUsernames && usernameAvailability === 'taken') ||
shouldDisableSubmit(effectiveConsent, missingFields);
return (
- <form className={styles.form} onSubmit={form.handleSubmit} data-flx="auth.flow.auth-register-form-core.form.submit">
+ <form className={styles.form} onSubmit={form.handleSubmit} data-flx={`${flx}.form.submit`}>
{isPublicRegistrationClosed ? (
- <div
- className={styles.registrationNotice}
- role="alert"
- data-flx="auth.flow.auth-register-form-core.closed-notice"
- >
+ <div className={styles.registrationNotice} role="alert" data-flx={`${flx}.closed-notice`}>
<Trans>Registration is currently closed. Use a registration link from an admin to create an account.</Trans>
</div>
) : null}
{pendingApprovalUserId ? (
- <div
- className={styles.registrationNotice}
- role="status"
- data-flx="auth.flow.auth-register-form-core.pending-approval-notice"
- >
+ <div className={styles.registrationNotice} role="status" data-flx={`${flx}.pending-approval-notice`}>
<Trans>Your account request is pending approval. You can sign in after an admin approves it.</Trans>
</div>
) : null}
@@ -413,75 +417,77 @@ export const AuthRegisterFormCore = observer(function AuthRegisterFormCore({
value={form.getValue('global_name')}
onChange={(value) => setDraftedFormValue('global_name', value)}
error={form.getError('global_name') || fieldErrors?.get('global_name')}
- data-flx="auth.flow.auth-register-form-core.form-field.set-drafted-form-value.text"
+ data-flx={`${flx}.form-field.set-drafted-form-value.text`}
/>
- <div data-flx="auth.flow.auth-register-form-core.div">
- <FormField
- id={usernameId}
- name="username"
- type="text"
- autoComplete="username"
- autoCapitalize={requireUsername ? 'none' : undefined}
- autoCorrect={requireUsername ? 'off' : undefined}
- spellCheck={requireUsername ? false : undefined}
- required={requireUsername}
- label={i18n._(requireUsername ? USERNAME_DESCRIPTOR : USERNAME_OPTIONAL_DESCRIPTOR)}
- placeholder={requireUsername ? undefined : i18n._(LEAVE_BLANK_FOR_A_RANDOM_USERNAME_DESCRIPTOR)}
- value={usernameValue}
- onChange={(value) => setDraftedFormValue('username', value)}
- error={form.getError('username') || fieldErrors?.get('username')}
- data-flx="auth.flow.auth-register-form-core.form-field.set-drafted-form-value.text--2"
- />
- <AnimatePresence mode="wait" initial={false} data-flx="auth.flow.auth-register-form-core.animate-presence">
- {helperTextState?.type === 'error' && (
- <motion.span
- key="error"
- className={styles.usernameError}
- initial={Accessibility.useReducedMotion ? {opacity: 1, y: 0} : {opacity: 0, y: -5}}
- animate={{opacity: 1, y: 0}}
- exit={Accessibility.useReducedMotion ? {opacity: 1, y: 0} : {opacity: 0, y: 5}}
- transition={{duration: Accessibility.useReducedMotion ? 0 : 0.2}}
- data-flx="auth.flow.auth-register-form-core.username-error"
- >
- {helperTextState.message}
- </motion.span>
- )}
- {helperTextState?.type === 'hint' && (
- <motion.span
- key={`hint-${helperTextState.message}`}
- className={styles.usernameHint}
- initial={Accessibility.useReducedMotion ? {opacity: 1, y: 0} : {opacity: 0, y: -5}}
- animate={{opacity: 1, y: 0}}
- exit={Accessibility.useReducedMotion ? {opacity: 1, y: 0} : {opacity: 0, y: 5}}
- transition={{duration: Accessibility.useReducedMotion ? 0 : 0.2}}
- data-flx="auth.flow.auth-register-form-core.username-sign-in-hint"
- >
- {helperTextState.message}
- </motion.span>
- )}
- {helperTextState?.type === 'suggestion' && (
- <motion.span
- key="suggestion"
- className={styles.usernameHint}
- initial={Accessibility.useReducedMotion ? {opacity: 1, y: 0} : {opacity: 0, y: -5}}
- animate={{opacity: 1, y: 0}}
- exit={Accessibility.useReducedMotion ? {opacity: 1, y: 0} : {opacity: 0, y: 5}}
- transition={{duration: Accessibility.useReducedMotion ? 0 : 0.2}}
- data-flx="auth.flow.auth-register-form-core.username-hint"
- >
- <Trans>How about:</Trans>{' '}
- <button
- type="button"
- className={styles.suggestionLink}
- onClick={() => setDraftedFormValue('username', helperTextState.username)}
- data-flx="auth.flow.auth-register-form-core.suggestion-link.set-drafted-form-value.button"
+ {showUsername && (
+ <div data-flx="auth.flow.auth-register-form-core.div">
+ <FormField
+ id={usernameId}
+ name="username"
+ type="text"
+ autoComplete="username"
+ autoCapitalize={requireUsername ? 'none' : undefined}
+ autoCorrect={requireUsername ? 'off' : undefined}
+ spellCheck={requireUsername ? false : undefined}
+ required={requireUsername}
+ label={i18n._(requireUsername ? USERNAME_DESCRIPTOR : USERNAME_OPTIONAL_DESCRIPTOR)}
+ placeholder={requireUsername ? undefined : i18n._(LEAVE_BLANK_FOR_A_RANDOM_USERNAME_DESCRIPTOR)}
+ value={usernameValue}
+ onChange={(value) => setDraftedFormValue('username', value)}
+ error={form.getError('username') || fieldErrors?.get('username')}
+ data-flx="auth.flow.auth-register-form-core.form-field.set-drafted-form-value.text--2"
+ />
+ <AnimatePresence mode="wait" initial={false} data-flx="auth.flow.auth-register-form-core.animate-presence">
+ {helperTextState?.type === 'error' && (
+ <motion.span
+ key="error"
+ className={styles.usernameError}
+ initial={Accessibility.useReducedMotion ? {opacity: 1, y: 0} : {opacity: 0, y: -5}}
+ animate={{opacity: 1, y: 0}}
+ exit={Accessibility.useReducedMotion ? {opacity: 1, y: 0} : {opacity: 0, y: 5}}
+ transition={{duration: Accessibility.useReducedMotion ? 0 : 0.2}}
+ data-flx="auth.flow.auth-register-form-core.username-error"
>
- {helperTextState.username}
- </button>
- </motion.span>
- )}
- </AnimatePresence>
- </div>
+ {helperTextState.message}
+ </motion.span>
+ )}
+ {helperTextState?.type === 'hint' && (
+ <motion.span
+ key={`hint-${helperTextState.message}`}
+ className={styles.usernameHint}
+ initial={Accessibility.useReducedMotion ? {opacity: 1, y: 0} : {opacity: 0, y: -5}}
+ animate={{opacity: 1, y: 0}}
+ exit={Accessibility.useReducedMotion ? {opacity: 1, y: 0} : {opacity: 0, y: 5}}
+ transition={{duration: Accessibility.useReducedMotion ? 0 : 0.2}}
+ data-flx="auth.flow.auth-register-form-core.username-sign-in-hint"
+ >
+ {helperTextState.message}
+ </motion.span>
+ )}
+ {helperTextState?.type === 'suggestion' && (
+ <motion.span
+ key="suggestion"
+ className={styles.usernameHint}
+ initial={Accessibility.useReducedMotion ? {opacity: 1, y: 0} : {opacity: 0, y: -5}}
+ animate={{opacity: 1, y: 0}}
+ exit={Accessibility.useReducedMotion ? {opacity: 1, y: 0} : {opacity: 0, y: 5}}
+ transition={{duration: Accessibility.useReducedMotion ? 0 : 0.2}}
+ data-flx="auth.flow.auth-register-form-core.username-hint"
+ >
+ <Trans>How about:</Trans>{' '}
+ <button
+ type="button"
+ className={styles.suggestionLink}
+ onClick={() => setDraftedFormValue('username', helperTextState.username)}
+ data-flx="auth.flow.auth-register-form-core.suggestion-link.set-drafted-form-value.button"
+ >
+ {helperTextState.username}
+ </button>
+ </motion.span>
+ )}
+ </AnimatePresence>
+ </div>
+ )}
{showPassword && (
<FormField
id={passwordId}
@@ -519,7 +525,7 @@ export const AuthRegisterFormCore = observer(function AuthRegisterFormCore({
onDayChange={handleDayChange}
onYearChange={handleYearChange}
error={fieldErrors?.get('date_of_birth')}
- data-flx="auth.flow.auth-register-form-core.date-of-birth-field"
+ data-flx={`${flx}.date-of-birth-field`}
/>
) : null}
{extraContent}
@@ -527,20 +533,15 @@ export const AuthRegisterFormCore = observer(function AuthRegisterFormCore({
checked={consent}
config={legalConsentConfig}
onChange={handleConsentChange}
- data-flx="auth.flow.auth-register-form-core.registration-legal-consent.consent-change"
+ data-flx={`${flx}.registration-legal-consent.consent-change`}
/>
<SubmitTooltip
consent={effectiveConsent}
legalConsentRequirement={legalConsentConfig.requirement ?? undefined}
missingFields={missingFields}
- data-flx="auth.flow.auth-register-form-core.submit-tooltip"
+ data-flx={`${flx}.submit-tooltip`}
>
- <Button
- type="submit"
- fitContainer
- disabled={submitDisabled}
- data-flx="auth.flow.auth-register-form-core.button.submit"
- >
+ <Button type="submit" fitContainer disabled={submitDisabled} data-flx={`${flx}.button.submit`}>
{submitLabel}
</Button>
</SubmitTooltip>
diff --git a/fluxer_app/src/features/auth/flow/InviteHeader.tsx b/fluxer_app/src/features/auth/flow/InviteHeader.tsx
index f90fcbd51..fb4ef6ed4 100644
--- a/fluxer_app/src/features/auth/flow/InviteHeader.tsx
+++ b/fluxer_app/src/features/auth/flow/InviteHeader.tsx
@@ -3,6 +3,7 @@
import styles from '@app/features/auth/flow/AuthPageStyles.module.css';
import {GuildBadge} from '@app/features/guild/components/GuildBadge';
import {GuildIcon} from '@app/features/guild/components/popouts/GuildIcon';
+import {formatNumber} from '@app/features/i18n/utils/IntlCache';
import {isGroupDmInvite, isGuildInvite} from '@app/features/invite/types/InviteTypes';
import {BaseAvatar} from '@app/features/ui/components/BaseAvatar';
import * as AvatarUtils from '@app/features/user/utils/AvatarUtils';
@@ -10,7 +11,6 @@ import {getCurrentLocale} from '@app/features/user/utils/LocaleUtils';
import * as NicknameUtils from '@app/features/user/utils/NicknameUtils';
import type {GroupDmInvite, GuildInvite, Invite} from '@fluxer/schema/src/domains/invite/InviteSchemas';
import {Plural, Trans} from '@lingui/react/macro';
-import {formatNumber} from '@pkgs/number_utils/src/NumberFormatting';
import {observer} from 'mobx-react-lite';
import {useEffect, useState} from 'react';
diff --git a/fluxer_app/src/features/auth/flow/SubmitTooltip.tsx b/fluxer_app/src/features/auth/flow/SubmitTooltip.tsx
index cbe68955d..99aff5f89 100644
--- a/fluxer_app/src/features/auth/flow/SubmitTooltip.tsx
+++ b/fluxer_app/src/features/auth/flow/SubmitTooltip.tsx
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import styles from '@app/features/auth/flow/SubmitTooltip.module.css';
+import {formatList} from '@app/features/i18n/utils/IntlCache';
import {Tooltip} from '@app/features/ui/tooltip/Tooltip';
import type {MessageDescriptor} from '@lingui/core';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
-import {formatListWithConfig} from '@pkgs/list_utils/src/ListFormatting';
import type {ReactNode} from 'react';
const YOU_MUST_AGREE_TO_THE_TERMS_OF_SERVICE_DESCRIPTOR = msg({
@@ -60,7 +60,7 @@ function getTooltipContentDescriptor(
return getConsentRequiredDescriptor(legalConsentRequirement);
}
if (missingFields.length > 0) {
- const fieldList = formatListWithConfig(
+ const fieldList = formatList(
missingFields.map((f) => f.label),
{locale, style: 'long', type: 'conjunction'},
);
diff --git a/fluxer_app/src/features/auth/flow/auth_login_core/useDesktopHandoffFlow.ts b/fluxer_app/src/features/auth/flow/auth_login_core/useDesktopHandoffFlow.ts
index fbca7f098..6a83177f2 100644
--- a/fluxer_app/src/features/auth/flow/auth_login_core/useDesktopHandoffFlow.ts
+++ b/fluxer_app/src/features/auth/flow/auth_login_core/useDesktopHandoffFlow.ts
@@ -2,16 +2,15 @@
import {PRODUCT_NAME} from '@app/features/app/config/I18nDisplayConstants';
import type {RuntimeConfigSnapshot} from '@app/features/app/state/InstanceSnapshotStore';
-import type {
- DesktopHandoffInfoResponse,
- DesktopHandoffReturnMethod,
-} from '@app/features/auth/commands/AuthenticationCommands';
+import type {DesktopHandoffInfoResponse} from '@app/features/auth/commands/AuthenticationCommands';
import * as AuthenticationCommands from '@app/features/auth/commands/AuthenticationCommands';
import {DesktopHandoffMode} from '@app/features/auth/flow/auth_login_core/AuthLoginStepTypes';
+import {originOf} from '@app/features/auth/InstanceBranding';
import type {UserData} from '@app/features/auth/state/AccountStorage';
import {type InstanceHTTPTarget, instanceTargetFromSnapshot} from '@app/features/platform/transport/InstanceHTTP';
import {Logger} from '@app/features/platform/utils/AppLogger';
import * as FormUtils from '@app/lib/forms';
+import type {DesktopHandoffReturnMethod} from '@fluxer/schema/src/domains/auth/AuthSchemas';
import {formatDesktopHandoffCode, parseDesktopHandoffCode} from '@fluxer/schema/src/domains/auth/DesktopHandoffCode';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
@@ -61,23 +60,12 @@ export interface DesktopHandoffRequest {
readonly identifier: string | null;
}
-function readOrigin(value: string | null | undefined): string | null {
- if (value == null || value.length === 0) {
- return null;
- }
- try {
- return new URL(value).origin;
- } catch {
- return null;
- }
-}
-
export function readDesktopHandoffRequest(search: string): DesktopHandoffRequest {
const params = new URLSearchParams(search);
const code = parseDesktopHandoffCode(params.get('code') ?? '');
return {
code: code == null ? null : formatDesktopHandoffCode(code),
- apiOrigin: readOrigin(params.get('api')),
+ apiOrigin: originOf(params.get('api')),
identifier: params.get('email') ?? params.get('login'),
};
}
@@ -186,7 +174,7 @@ export function useDesktopHandoffFlow({enabled, hasStoredAccounts, initialMode}:
setClientInfo(null);
setReturnMethod(null);
setReturnUrl(null);
- const accountOrigin = readOrigin(runtimeSnapshot.apiEndpoint);
+ const accountOrigin = originOf(runtimeSnapshot.apiEndpoint);
if (request.apiOrigin != null && accountOrigin != null && request.apiOrigin !== accountOrigin) {
failWith(
i18n._(INSTANCE_MISMATCH_DESCRIPTOR, {
diff --git a/fluxer_app/src/features/channel/components/CallMessage.tsx b/fluxer_app/src/features/channel/components/CallMessage.tsx
index 17c749700..416af0eb5 100644
--- a/fluxer_app/src/features/channel/components/CallMessage.tsx
+++ b/fluxer_app/src/features/channel/components/CallMessage.tsx
@@ -11,6 +11,7 @@ import {
ONE_MONTH_DURATION_DESCRIPTOR,
ONE_WEEK_DURATION_DESCRIPTOR,
} from '@app/features/i18n/utils/CommonMessageDescriptors';
+import {formatList, formatNumber} from '@app/features/i18n/utils/IntlCache';
import {useSystemMessageData} from '@app/features/messaging/hooks/useSystemMessageData';
import type {Message} from '@app/features/messaging/models/MessagingMessage';
import FocusRing from '@app/features/ui/focus_ring/FocusRing';
@@ -21,8 +22,6 @@ import type {I18n} from '@lingui/core';
import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
import {PhoneIcon} from '@phosphor-icons/react';
-import {formatListWithConfig} from '@pkgs/list_utils/src/ListFormatting';
-import {formatNumber} from '@pkgs/number_utils/src/NumberFormatting';
import {clsx} from 'clsx';
import {observer} from 'mobx-react-lite';
import type React from 'react';
@@ -134,7 +133,7 @@ const formatCallDuration = (i18n: I18n, durationSeconds: number): string => {
return i18n._(A_MINUTE_DESCRIPTOR);
}
const locale = getCurrentLocale();
- return formatListWithConfig(parts, {locale, style: 'long', type: 'conjunction'});
+ return formatList(parts, {locale, style: 'long', type: 'conjunction'});
};
export const CallMessage = observer(({message}: {message: Message}) => {
const {i18n} = useLingui();
diff --git a/fluxer_app/src/features/channel/components/CrosspostCommunityCard.tsx b/fluxer_app/src/features/channel/components/CrosspostCommunityCard.tsx
index 5435f4a0b..37585ee72 100644
--- a/fluxer_app/src/features/channel/components/CrosspostCommunityCard.tsx
+++ b/fluxer_app/src/features/channel/components/CrosspostCommunityCard.tsx
@@ -11,6 +11,7 @@ import {GuildIcon} from '@app/features/guild/components/popouts/GuildIcon';
import GuildCount from '@app/features/guild/state/GuildCount';
import Guilds from '@app/features/guild/state/Guilds';
import {JOIN_COMMUNITY_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
+import {formatNumber} from '@app/features/i18n/utils/IntlCache';
import type {Message} from '@app/features/messaging/models/MessagingMessage';
import * as NavigationCommands from '@app/features/navigation/commands/NavigationCommands';
import {Button} from '@app/features/ui/button/Button';
@@ -19,7 +20,6 @@ import * as AvatarUtils from '@app/features/user/utils/AvatarUtils';
import {getCurrentLocale} from '@app/features/user/utils/LocaleUtils';
import {msg} from '@lingui/core/macro';
import {Plural, Trans, useLingui} from '@lingui/react/macro';
-import {formatNumber} from '@pkgs/number_utils/src/NumberFormatting';
import {clsx} from 'clsx';
import {observer} from 'mobx-react-lite';
import {useCallback, useEffect, useState} from 'react';
diff --git a/fluxer_app/src/features/channel/components/InviteEmbed.tsx b/fluxer_app/src/features/channel/components/InviteEmbed.tsx
index 82bd73c29..3e87bbc67 100644
--- a/fluxer_app/src/features/channel/components/InviteEmbed.tsx
+++ b/fluxer_app/src/features/channel/components/InviteEmbed.tsx
@@ -17,6 +17,7 @@ import {GuildIcon} from '@app/features/guild/components/popouts/GuildIcon';
import GuildCount from '@app/features/guild/state/GuildCount';
import Guilds from '@app/features/guild/state/Guilds';
import {JOIN_COMMUNITY_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
+import {formatNumber} from '@app/features/i18n/utils/IntlCache';
import {isKeyboardActivationKey} from '@app/features/input/utils/KeyboardUtils';
import * as InviteCommands from '@app/features/invite/commands/InviteCommands';
import Invites from '@app/features/invite/state/Invites';
@@ -56,7 +57,6 @@ import {getCurrentLocale} from '@app/features/user/utils/LocaleUtils';
import {msg} from '@lingui/core/macro';
import {Plural, Trans, useLingui} from '@lingui/react/macro';
import {QuestionIcon} from '@phosphor-icons/react';
-import {formatNumber} from '@pkgs/number_utils/src/NumberFormatting';
import {observer} from 'mobx-react-lite';
import type React from 'react';
import {useEffect, useMemo, useRef, useState} from 'react';
diff --git a/fluxer_app/src/features/channel/components/MobileMemesPicker.tsx b/fluxer_app/src/features/channel/components/MobileMemesPicker.tsx
index b00d76d3b..d178f95be 100644
--- a/fluxer_app/src/features/channel/components/MobileMemesPicker.tsx
+++ b/fluxer_app/src/features/channel/components/MobileMemesPicker.tsx
@@ -7,6 +7,11 @@ import {useSearchInputAutofocus} from '@app/features/app/hooks/useSearchInputAut
import {useShouldAnimate} from '@app/features/app/hooks/useShouldAnimate';
import styles from '@app/features/channel/components/GifPicker.module.css';
import memeStyles from '@app/features/channel/components/MemesPicker.module.css';
+import {
+ filterMemesByContentType,
+ formatDuration,
+ getFileExtension,
+} from '@app/features/channel/components/pickers/memes/MediaFormat';
import {PickerEmptyState} from '@app/features/channel/components/shared/PickerEmptyState';
import {PickerSearchInput} from '@app/features/channel/components/shared/PickerSearchInput';
import * as FavoriteMemeCommands from '@app/features/expressions/commands/FavoriteMemeCommands';
@@ -29,7 +34,6 @@ import {modal} from '@app/features/ui/commands/ModalCommands';
import {Scroller, type ScrollerHandle} from '@app/features/ui/components/Scroller';
import {MenuBottomSheet, type MenuItemType} from '@app/features/ui/menu_bottom_sheet/MenuBottomSheet';
import {Tooltip} from '@app/features/ui/tooltip/Tooltip';
-import {formatDuration as formatDurationBase} from '@fluxer/date_utils/src/DateDuration';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
import {GifIcon, ImageIcon, MusicNoteIcon, SmileySadIcon, VideoCameraIcon} from '@phosphor-icons/react';
@@ -106,18 +110,6 @@ interface FilterOption {
icon?: React.ReactNode;
}
-const formatDuration = (seconds: number | null | undefined, locale: string): string => {
- if (!seconds || seconds <= 0) return formatDurationBase(0, locale);
- return formatDurationBase(seconds, locale);
-};
-const getFileExtension = (filename: string, contentType: string): string => {
- const extension = filename.split('.').pop()?.toUpperCase();
- if (extension && extension.length <= 4) {
- return extension;
- }
- const typeMatch = contentType.match(/\/([^;]+)/);
- return typeMatch?.[1]?.toUpperCase() || 'FILE';
-};
const GifIndicator = observer(() => (
<div className={memeStyles.gifBadge} aria-hidden="true" data-flx="channel.mobile-memes-picker.gif-indicator.div">
GIF
@@ -191,24 +183,7 @@ export const MobileMemesPicker = observer(({onClose}: MobileMemesPickerProps = {
scrollerRef.current?.scrollTo({to: 0, animate: false});
}, []);
const filteredMemes = useMemo(() => {
- let memes = [...favoriteMemes];
- if (state.selectedFilter !== 'all') {
- memes = memes.filter((meme) => {
- const contentType = meme.contentType.toLowerCase();
- switch (state.selectedFilter) {
- case 'image':
- return contentType.startsWith('image/') && !contentType.includes('gif') && !meme.isGifv;
- case 'video':
- return contentType.startsWith('video/') && !meme.isGifv;
- case 'audio':
- return contentType.startsWith('audio/');
- case 'gif':
- return contentType.includes('gif') || meme.isGifv;
- default:
- return true;
- }
- });
- }
+ let memes = filterMemesByContentType(favoriteMemes, state.selectedFilter);
if (state.searchTerm) {
memes = matchSorter(memes, state.searchTerm, {
keys: ['name', 'altText', 'filename', 'tags'],
diff --git a/fluxer_app/src/features/channel/components/channel_view/DMChannelView.tsx b/fluxer_app/src/features/channel/components/channel_view/DMChannelView.tsx
index f84c549cd..cc052b8f2 100644
--- a/fluxer_app/src/features/channel/components/channel_view/DMChannelView.tsx
+++ b/fluxer_app/src/features/channel/components/channel_view/DMChannelView.tsx
@@ -34,8 +34,7 @@ import {useChannelSearchState} from '@app/features/channel/components/channel_vi
import {useVoiceCallChromePinState} from '@app/features/channel/components/channel_view/useVoiceCallChromePinState';
import dmStyles from '@app/features/channel/components/direct_message/DMChannelView.module.css';
import {useMessagesBottomBarVisibility} from '@app/features/channel/components/MessagesBottomBarVisibility';
-import {useChannelMemberListVisibility} from '@app/features/channel/hooks/useChannelMemberListVisibility';
-import {useChannelSearchVisibility} from '@app/features/channel/hooks/useChannelSearchVisibility';
+import {useChannelPanelVisibility} from '@app/features/channel/hooks/useChannelPanelVisibility';
import Channels from '@app/features/channel/state/Channels';
import * as ChannelUtils from '@app/features/channel/utils/ChannelUtils';
import {INCOMING_CALL_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
@@ -105,7 +104,7 @@ export const DMChannelView = observer(({channelId}: DMChannelViewProps) => {
const {onBottomBarVisibilityChange} = useMessagesBottomBarVisibility(channelId);
const {enabled: isMobileLayout} = MobileLayout;
const isSearchPanelVisible = isSearchActive && !isMobileLayout;
- useChannelSearchVisibility(channelId, isSearchPanelVisible);
+ useChannelPanelVisibility(channelId, isSearchPanelVisible);
const displayName = channel ? ChannelUtils.getDMDisplayName(channel) : null;
const title = isDM && displayName ? `@${displayName}` : displayName;
useFluxerDocumentTitle(title);
@@ -118,7 +117,7 @@ export const DMChannelView = observer(({channelId}: DMChannelViewProps) => {
channelId: currentChannelId,
defaultHiddenForChannel: memberListDefaultHiddenForChannel,
});
- useChannelMemberListVisibility(channelId, isMemberListVisible);
+ useChannelPanelVisibility(channelId, isMemberListVisible);
const callExistsAndOngoing = callHeaderState.callExistsAndOngoing;
const controlsVariant = callHeaderState.controlsVariant;
const showCallBackground = callExistsAndOngoing && controlsVariant !== 'hidden';
diff --git a/fluxer_app/src/features/channel/components/channel_view/GuildChannelView.tsx b/fluxer_app/src/features/channel/components/channel_view/GuildChannelView.tsx
index 76fb59d72..882906ec4 100644
--- a/fluxer_app/src/features/channel/components/channel_view/GuildChannelView.tsx
+++ b/fluxer_app/src/features/channel/components/channel_view/GuildChannelView.tsx
@@ -23,8 +23,7 @@ import {useVoiceCallChromePinState} from '@app/features/channel/components/chann
import {MatureContentChannelGate} from '@app/features/channel/components/MatureContentChannelGate';
import {useMessagesBottomBarVisibility} from '@app/features/channel/components/MessagesBottomBarVisibility';
import {VerificationBarrier} from '@app/features/channel/components/VerificationBarrier';
-import {useChannelMemberListVisibility} from '@app/features/channel/hooks/useChannelMemberListVisibility';
-import {useChannelSearchVisibility} from '@app/features/channel/hooks/useChannelSearchVisibility';
+import {useChannelPanelVisibility} from '@app/features/channel/hooks/useChannelPanelVisibility';
import type {Channel} from '@app/features/channel/models/Channel';
import Channels from '@app/features/channel/state/Channels';
import * as ChannelUtils from '@app/features/channel/utils/ChannelUtils';
@@ -303,8 +302,8 @@ export const GuildChannelView = observer(({channelId, guildId}: GuildChannelView
}
wasVoiceCallFullscreenViewOpenRef.current = showVoiceCallFullscreenView;
}, [handleOpenVoiceTextChat, showVoiceCallFullscreenView]);
- useChannelSearchVisibility(channelId, isSearchPanelVisible);
- useChannelMemberListVisibility(channelId, isMemberListVisible && !isMobileLayout);
+ useChannelPanelVisibility(channelId, isSearchPanelVisible);
+ useChannelPanelVisibility(channelId, isMemberListVisible && !isMobileLayout);
useEffect(() => {
const handleGlobalKeydown = (event: Event) => {
const keyboardEvent = event as KeyboardEvent;
diff --git a/fluxer_app/src/features/channel/components/emoji_picker/EmojiPickerSearchBar.tsx b/fluxer_app/src/features/channel/components/emoji_picker/EmojiPickerSearchBar.tsx
index 9dff095bb..5f55e7063 100644
--- a/fluxer_app/src/features/channel/components/emoji_picker/EmojiPickerSearchBar.tsx
+++ b/fluxer_app/src/features/channel/components/emoji_picker/EmojiPickerSearchBar.tsx
@@ -3,156 +3,32 @@
import styles from '@app/features/channel/components/emoji_picker/EmojiPickerSearchBar.module.css';
import {SkinToneSelector} from '@app/features/channel/components/emoji_picker/SkinToneSelector';
import {PickerSearchInput} from '@app/features/channel/components/shared/PickerSearchInput';
+import {
+ type PickerGridKeyboardOptions,
+ usePickerGridKeyboard,
+} from '@app/features/channel/components/shared/usePickerGridKeyboard';
import type {FlatEmoji} from '@app/features/emoji/types/EmojiTypes';
-import {isIMEComposing} from '@app/features/messaging/utils/IMECompositionUtils';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
import {observer} from 'mobx-react-lite';
import type React from 'react';
-import {useCallback, useEffect} from 'react';
const FIND_THE_EMOJI_OF_YOUR_DREAMS_DESCRIPTOR = msg({
message: 'Find the emoji of your dreams',
comment: 'Label in the channel and chat emoji picker search bar.',
});
-interface EmojiPickerSearchBarProps {
+interface EmojiPickerSearchBarProps extends PickerGridKeyboardOptions {
searchTerm: string;
setSearchTerm: (term: string) => void;
hoveredEmoji: FlatEmoji | null;
inputRef?: React.RefObject<HTMLInputElement | null> | React.RefObject<HTMLInputElement>;
- selectedRow?: number;
- selectedColumn?: number;
- sections?: Array<number>;
- onSelect?: (row: number | null, column: number | null, event?: React.KeyboardEvent) => void;
- onSelectionChange?: (row: number, column: number, shouldScroll?: boolean) => void;
}
export const EmojiPickerSearchBar = observer(
- ({
- searchTerm,
- setSearchTerm,
- hoveredEmoji,
- inputRef,
- selectedRow = -1,
- selectedColumn = -1,
- sections = [],
- onSelect,
- onSelectionChange,
- }: EmojiPickerSearchBarProps) => {
+ ({searchTerm, setSearchTerm, hoveredEmoji, inputRef, ...keyboard}: EmojiPickerSearchBarProps) => {
const {i18n} = useLingui();
- const handleKeyDown = useCallback(
- (event: React.KeyboardEvent<HTMLInputElement> | React.KeyboardEvent) => {
- if (isIMEComposing(event)) {
- return;
- }
- if (sections.length === 0) {
- return;
- }
- let newRow = selectedRow;
- let newColumn = selectedColumn;
- switch (event.key) {
- case 'ArrowDown':
- event.preventDefault();
- event.stopPropagation();
- if (newRow === -1) {
- newRow = 0;
- newColumn = 0;
- } else {
- newRow += 1;
- if (newRow >= sections.length) {
- newRow = sections.length - 1;
- }
- if (newColumn >= sections[newRow]) {
- newColumn = sections[newRow] - 1;
- }
- }
- break;
- case 'ArrowUp':
- event.preventDefault();
- event.stopPropagation();
- newRow -= 1;
- if (newRow < 0) {
- newRow = 0;
- newColumn = 0;
- } else if (newColumn >= sections[newRow]) {
- newColumn = sections[newRow] - 1;
- }
- break;
- case 'ArrowLeft':
- event.preventDefault();
- event.stopPropagation();
- if (newRow === -1) {
- newRow = 0;
- }
- newColumn -= 1;
- if (newColumn < 0) {
- newRow -= 1;
- if (newRow >= 0) {
- newColumn = sections[newRow] - 1;
- } else {
- newRow = 0;
- newColumn = 0;
- }
- }
- break;
- case 'ArrowRight':
- event.preventDefault();
- event.stopPropagation();
- if (newRow === -1) {
- newRow = 0;
- }
- newColumn += 1;
- if (newColumn >= sections[newRow]) {
- newRow += 1;
- newColumn = 0;
- if (newRow >= sections.length) {
- newRow = sections.length - 1;
- newColumn = sections[newRow] - 1;
- }
- }
- break;
- case 'Enter':
- event.preventDefault();
- event.stopPropagation();
- if (newRow === -1) {
- newRow = 0;
- }
- if (newColumn === -1) {
- newColumn = 0;
- }
- onSelect?.(newRow, newColumn, event);
- return;
- case 'Escape':
- onSelect?.(null, null);
- return;
- default:
- return;
- }
- onSelectionChange?.(newRow, newColumn, true);
- },
- [sections, selectedRow, selectedColumn, onSelect, onSelectionChange],
- );
- useEffect(() => {
- const handleGlobalKeyDown = (event: Event) => {
- if (sections.length === 0) {
- return;
- }
- const keyboardEvent = event as KeyboardEvent;
- if (!['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'].includes(keyboardEvent.key)) {
- return;
- }
- const syntheticEvent = {
- key: keyboardEvent.key,
- shiftKey: keyboardEvent.shiftKey,
- preventDefault: () => keyboardEvent.preventDefault(),
- stopPropagation: () => keyboardEvent.stopPropagation(),
- } as React.KeyboardEvent;
- handleKeyDown(syntheticEvent);
- };
- document.addEventListener('keydown', handleGlobalKeyDown);
- return () => document.removeEventListener('keydown', handleGlobalKeyDown);
- }, [sections, handleKeyDown]);
+ const handleKeyDown = usePickerGridKeyboard(keyboard);
const placeholder = hoveredEmoji
? hoveredEmoji.allNamesString.toString()
: i18n._(FIND_THE_EMOJI_OF_YOUR_DREAMS_DESCRIPTOR);
diff --git a/fluxer_app/src/features/channel/components/modals/EditGroupBottomSheet.tsx b/fluxer_app/src/features/channel/components/modals/EditGroupBottomSheet.tsx
index 598c33f6a..33ac34964 100644
--- a/fluxer_app/src/features/channel/components/modals/EditGroupBottomSheet.tsx
+++ b/fluxer_app/src/features/channel/components/modals/EditGroupBottomSheet.tsx
@@ -1,80 +1,30 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import {
- AVATAR_RECOMMENDED_SIZE_LABEL,
- IMAGE_MAX_SIZE_BYTES,
- STATIC_IMAGE_FORMATS,
-} from '@app/features/app/config/I18nDisplayConstants';
-import {useFormSubmit} from '@app/features/app/hooks/useFormSubmit';
-import Authentication from '@app/features/auth/state/Authentication';
-import * as ChannelCommands from '@app/features/channel/commands/ChannelCommands';
-import {showChannelErrorModal} from '@app/features/channel/components/alerts/ChannelErrorModalUtils';
import styles from '@app/features/channel/components/modals/EditGroupBottomSheet.module.css';
import {GroupMatureContentSwitch} from '@app/features/channel/components/modals/GroupMatureContentSwitch';
-import Channels from '@app/features/channel/state/Channels';
-import {AssetCropModal, AssetType} from '@app/features/expressions/components/modals/AssetCropModal';
-import {openAssetSourceModal} from '@app/features/expressions/components/modals/AssetSourceModal';
-import {isAnimatedFile} from '@app/features/expressions/utils/AnimatedImageUtils';
-import {getAcceptStringFiltered, getAssetFormatErrorMessage} from '@app/features/expressions/utils/AssetFormatCopy';
-import {formatImageUploadRecommendedHint} from '@app/features/expressions/utils/AssetUploadHintCopy';
-import {isSvgFile, readImageFileAsUploadDataUrl} from '@app/features/expressions/utils/ImageUploadFileUtils';
-import {
- EDIT_GROUP_DESCRIPTOR,
- FAILED_TO_PROCESS_CROPPED_IMAGE_DESCRIPTOR,
- GO_BACK_DESCRIPTOR,
- INVALID_IMAGE_TRY_ANOTHER_DESCRIPTOR,
-} from '@app/features/i18n/utils/CommonMessageDescriptors';
-import {openFilePicker} from '@app/features/messaging/utils/FilePickerUtils';
-import {formatFileSize} from '@app/features/messaging/utils/FileUtils';
+import {useEditGroupForm} from '@app/features/channel/components/modals/useEditGroupForm';
+import {EDIT_GROUP_DESCRIPTOR, GO_BACK_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
import {BottomSheet} from '@app/features/ui/bottom_sheet/BottomSheet';
import {Button} from '@app/features/ui/button/Button';
-import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
-import {modal} from '@app/features/ui/commands/ModalCommands';
-import * as ToastCommands from '@app/features/ui/commands/ToastCommands';
import {Form} from '@app/features/ui/components/form/Form';
import {Input} from '@app/features/ui/components/form/FormInput';
import {Scroller} from '@app/features/ui/components/Scroller';
-import * as AvatarUtils from '@app/features/user/utils/AvatarUtils';
-import {canCropFile} from '@app/features/voice/utils/MediaCapabilities';
-import {useRemoteFormReset} from '@app/lib/forms/RemoteFormReset';
-import {assignTransientUploadFieldMutation} from '@app/lib/forms/TransientUploadFields';
import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
import {ArrowLeftIcon, PlusIcon} from '@phosphor-icons/react';
import {observer} from 'mobx-react-lite';
import type React from 'react';
-import {useCallback, useMemo, useState} from 'react';
-import {Controller, useForm} from 'react-hook-form';
+import {Controller} from 'react-hook-form';
const ICON_FILE_IS_TOO_LARGE_PLEASE_CHOOSE_A_DESCRIPTOR = msg({
message: 'Icon file is too large. Choose a file smaller than {imageMaxSizeLabel}.',
comment:
'Error modal body in the mobile edit group sheet when the chosen icon file exceeds the size limit. imageMaxSizeLabel is a localized size.',
});
-const ICON_FILE_IS_TOO_LARGE_TITLE_DESCRIPTOR = msg({
- message: 'Icon file is too large',
- comment: 'Title of the error modal shown when the selected group icon exceeds the size limit.',
-});
-const UNSUPPORTED_ICON_FORMAT_DESCRIPTOR = msg({
- message: 'Unsupported icon format',
- comment: 'Title of the error modal shown when the selected group icon format is unsupported.',
-});
const ANIMATED_ICONS_ARE_NOT_SUPPORTED_PLEASE_USE_DESCRIPTOR = msg({
message: 'Animated icons are not supported. Use a static image.',
comment: 'Error modal body in the mobile edit group sheet when an animated icon is chosen.',
});
-const ANIMATED_ICONS_ARE_NOT_SUPPORTED_TITLE_DESCRIPTOR = msg({
- message: 'Animated icons are not supported',
- comment: 'Title of the error modal shown when an animated group icon is selected.',
-});
-const COULDN_T_PROCESS_IMAGE_DESCRIPTOR = msg({
- message: "Couldn't process image",
- comment: 'Title of the error modal shown when a cropped group icon cannot be processed.',
-});
-const INVALID_IMAGE_DESCRIPTOR = msg({
- message: 'Invalid image',
- comment: 'Title of the error modal shown when the selected group icon image cannot be used.',
-});
const EDIT_GROUP_FORM_DESCRIPTOR = msg({
message: 'Edit group form',
comment: 'Accessible label for the edit group form region in the mobile bottom sheet.',
@@ -93,11 +43,36 @@ const CHANGE_ICON_DESCRIPTOR = msg({
'Title of the modal where the user picks a group icon source in the mobile edit group sheet. Keep it concise. Keep the tone plain and specific.',
});
-interface FormInputs {
- icon?: string | null;
- name: string;
- nsfw: boolean;
-}
+const ICON_FILE_IS_TOO_LARGE_TITLE_DESCRIPTOR = msg({
+ message: 'Icon file is too large',
+ comment: 'Title of the error modal shown when the selected group icon exceeds the size limit.',
+});
+const UNSUPPORTED_ICON_FORMAT_DESCRIPTOR = msg({
+ message: 'Unsupported icon format',
+ comment: 'Title of the error modal shown when the selected group icon format is unsupported.',
+});
+const ANIMATED_ICONS_ARE_NOT_SUPPORTED_TITLE_DESCRIPTOR = msg({
+ message: 'Animated icons are not supported',
+ comment: 'Title of the error modal shown when an animated group icon is selected.',
+});
+const COULDN_T_PROCESS_IMAGE_DESCRIPTOR = msg({
+ message: "Couldn't process image",
+ comment: 'Title of the error modal shown when a cropped group icon cannot be processed.',
+});
+const INVALID_IMAGE_DESCRIPTOR = msg({
+ message: 'Invalid image',
+ comment: 'Title of the error modal shown when the selected group icon image cannot be used.',
+});
+const EDIT_GROUP_FORM_MESSAGES = {
+ iconFileTooLargeTitle: ICON_FILE_IS_TOO_LARGE_TITLE_DESCRIPTOR,
+ unsupportedIconFormatTitle: UNSUPPORTED_ICON_FORMAT_DESCRIPTOR,
+ animatedIconsNotSupportedTitle: ANIMATED_ICONS_ARE_NOT_SUPPORTED_TITLE_DESCRIPTOR,
+ couldNotProcessImageTitle: COULDN_T_PROCESS_IMAGE_DESCRIPTOR,
+ invalidImageTitle: INVALID_IMAGE_DESCRIPTOR,
+ iconFileTooLarge: ICON_FILE_IS_TOO_LARGE_PLEASE_CHOOSE_A_DESCRIPTOR,
+ animatedIconsNotSupported: ANIMATED_ICONS_ARE_NOT_SUPPORTED_PLEASE_USE_DESCRIPTOR,
+ changeIcon: CHANGE_ICON_DESCRIPTOR,
+};
interface EditGroupBottomSheetProps {
isOpen: boolean;
@@ -107,150 +82,25 @@ interface EditGroupBottomSheetProps {
export const EditGroupBottomSheet: React.FC<EditGroupBottomSheetProps> = observer(({isOpen, onClose, channelId}) => {
const {i18n} = useLingui();
- const channel = Channels.getChannel(channelId);
- const isOwner = channel?.ownerId === Authentication.currentUserId;
- const [hasClearedIcon, setHasClearedIcon] = useState(false);
- const [previewIconUrl, setPreviewIconUrl] = useState<string | null>(null);
- const form = useForm<FormInputs>({
- defaultValues: useMemo(() => ({name: channel?.name || '', nsfw: channel?.nsfw ?? false}), [channel]),
- });
- const remoteValues: FormInputs | null = channel ? {name: channel.name || '', nsfw: channel.nsfw} : null;
- const {commitRemoteValues} = useRemoteFormReset<FormInputs>({
- form,
- identityKey: channelId,
- remoteValues,
- isDirty: form.formState.isDirty || Boolean(previewIconUrl) || hasClearedIcon,
- onApply: () => {
- setPreviewIconUrl(null);
- setHasClearedIcon(false);
- },
- });
- const handleIconUpload = useCallback(
- async (file: File | null) => {
- try {
- if (!file) return;
- if (file.size > 10 * 1024 * 1024) {
- showChannelErrorModal({
- title: i18n._(ICON_FILE_IS_TOO_LARGE_TITLE_DESCRIPTOR),
- message: i18n._(ICON_FILE_IS_TOO_LARGE_PLEASE_CHOOSE_A_DESCRIPTOR, {
- imageMaxSizeLabel: formatFileSize(i18n.locale, IMAGE_MAX_SIZE_BYTES),
- }),
- dataFlx: 'channel.edit-group-bottom-sheet.icon-file-too-large.generic-error-modal',
- });
- return;
- }
- const svg = isSvgFile(file);
- if (!svg && !(await canCropFile(file))) {
- showChannelErrorModal({
- title: i18n._(UNSUPPORTED_ICON_FORMAT_DESCRIPTOR),
- message: getAssetFormatErrorMessage(i18n, 'guild_icon', 'unsupported_mime'),
- dataFlx: 'channel.edit-group-bottom-sheet.unsupported-icon-format.generic-error-modal',
- });
- return;
- }
- const animated = svg ? false : await isAnimatedFile(file);
- if (animated) {
- showChannelErrorModal({
- title: i18n._(ANIMATED_ICONS_ARE_NOT_SUPPORTED_TITLE_DESCRIPTOR),
- message: i18n._(ANIMATED_ICONS_ARE_NOT_SUPPORTED_PLEASE_USE_DESCRIPTOR),
- dataFlx: 'channel.edit-group-bottom-sheet.animated-icon.generic-error-modal',
- });
- return;
- }
- const base64 = svg ? await readImageFileAsUploadDataUrl(file) : await AvatarUtils.fileToBase64(file);
- ModalCommands.push(
- modal(() => (
- <AssetCropModal
- assetType={AssetType.CHANNEL_ICON}
- imageUrl={base64}
- onCropComplete={(croppedBlob) => {
- const reader = new FileReader();
- reader.onload = () => {
- const croppedBase64 = reader.result as string;
- form.setValue('icon', croppedBase64);
- setPreviewIconUrl(croppedBase64);
- setHasClearedIcon(false);
- form.clearErrors('icon');
- };
- reader.onerror = () => {
- showChannelErrorModal({
- title: i18n._(COULDN_T_PROCESS_IMAGE_DESCRIPTOR),
- message: i18n._(FAILED_TO_PROCESS_CROPPED_IMAGE_DESCRIPTOR),
- dataFlx: 'channel.edit-group-bottom-sheet.process-cropped-image-failed.generic-error-modal',
- });
- };
- reader.readAsDataURL(croppedBlob);
- }}
- onSkip={() => {
- form.setValue('icon', base64);
- setPreviewIconUrl(base64);
- setHasClearedIcon(false);
- form.clearErrors('icon');
- }}
- data-flx="channel.edit-group-bottom-sheet.handle-icon-upload.asset-crop-modal"
- />
- )),
- );
- } catch {
- showChannelErrorModal({
- title: i18n._(INVALID_IMAGE_DESCRIPTOR),
- message: i18n._(INVALID_IMAGE_TRY_ANOTHER_DESCRIPTOR),
- dataFlx: 'channel.edit-group-bottom-sheet.invalid-image.generic-error-modal',
- });
- }
- },
- [form, i18n],
- );
- const handleIconUploadClick = useCallback(async () => {
- const [file] = await openFilePicker({accept: getAcceptStringFiltered('guild_icon', false)});
- await handleIconUpload(file ?? null);
- }, [handleIconUpload]);
- const handleOpenIconUpload = useCallback(() => {
- openAssetSourceModal({
- title: i18n._(CHANGE_ICON_DESCRIPTOR),
- uploadHint: formatImageUploadRecommendedHint(i18n, {
- formats: STATIC_IMAGE_FORMATS,
- maxSize: formatFileSize(i18n.locale, IMAGE_MAX_SIZE_BYTES),
- recommendedSize: AVATAR_RECOMMENDED_SIZE_LABEL,
- }),
- onPickUpload: handleIconUploadClick,
- showGifOption: false,
- });
- }, [handleIconUploadClick, i18n]);
- const handleClearIcon = useCallback(() => {
- form.setValue('icon', null);
- setPreviewIconUrl(null);
- setHasClearedIcon(true);
- }, [form]);
- const onSubmit = useCallback(
- async (data: FormInputs) => {
- const updateData: {icon?: string | null; name: string; nsfw?: boolean} = {name: data.name};
- if (isOwner && data.nsfw !== channel?.nsfw) {
- updateData.nsfw = data.nsfw;
- }
- assignTransientUploadFieldMutation(updateData, 'icon', {
- value: data.icon,
- previewUrl: previewIconUrl,
- hasCleared: hasClearedIcon,
- });
- const newChannel = await ChannelCommands.update(channelId, updateData);
- commitRemoteValues({name: newChannel.name || data.name, nsfw: newChannel.nsfw ?? data.nsfw});
- ToastCommands.createToast({type: 'success', children: <Trans>Group updated</Trans>});
- onClose();
- },
- [channel, channelId, commitRemoteValues, isOwner, onClose, previewIconUrl, hasClearedIcon],
- );
- const {handleSubmit, isSubmitting} = useFormSubmit({
+ const {
+ channel,
form,
- onSubmit,
- defaultErrorField: 'name',
+ isOwner,
+ previewIconUrl,
+ iconPresentable,
+ handleOpenIconUpload,
+ handleClearIcon,
+ handleSubmit,
+ isSubmitting,
+ } = useEditGroupForm({
+ channelId,
+ onDone: onClose,
+ dataFlx: 'channel.edit-group-bottom-sheet',
+ messages: EDIT_GROUP_FORM_MESSAGES,
});
if (!channel) {
return null;
}
- const iconPresentable = hasClearedIcon
- ? null
- : (previewIconUrl ?? AvatarUtils.getChannelIconURL({id: channel.id, icon: channel.icon}));
return (
<BottomSheet
isOpen={isOpen}
diff --git a/fluxer_app/src/features/channel/components/modals/EditGroupModal.tsx b/fluxer_app/src/features/channel/components/modals/EditGroupModal.tsx
index c0d9cb164..4eda63cf8 100644
--- a/fluxer_app/src/features/channel/components/modals/EditGroupModal.tsx
+++ b/fluxer_app/src/features/channel/components/modals/EditGroupModal.tsx
@@ -1,77 +1,29 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import * as Modal from '@app/features/app/components/dialogs/Modal';
-import {
- AVATAR_RECOMMENDED_SIZE_LABEL,
- IMAGE_MAX_SIZE_BYTES,
- STATIC_IMAGE_FORMATS,
-} from '@app/features/app/config/I18nDisplayConstants';
-import {useFormSubmit} from '@app/features/app/hooks/useFormSubmit';
-import Authentication from '@app/features/auth/state/Authentication';
-import * as ChannelCommands from '@app/features/channel/commands/ChannelCommands';
-import {showChannelErrorModal} from '@app/features/channel/components/alerts/ChannelErrorModalUtils';
import styles from '@app/features/channel/components/modals/EditGroupModal.module.css';
import {GroupMatureContentSwitch} from '@app/features/channel/components/modals/GroupMatureContentSwitch';
-import Channels from '@app/features/channel/state/Channels';
+import {useEditGroupForm} from '@app/features/channel/components/modals/useEditGroupForm';
import * as ChannelUtils from '@app/features/channel/utils/ChannelUtils';
-import {AssetCropModal, AssetType} from '@app/features/expressions/components/modals/AssetCropModal';
-import {openAssetSourceModal} from '@app/features/expressions/components/modals/AssetSourceModal';
-import {isAnimatedFile} from '@app/features/expressions/utils/AnimatedImageUtils';
-import {getAcceptStringFiltered, getAssetFormatErrorMessage} from '@app/features/expressions/utils/AssetFormatCopy';
-import {formatImageUploadRecommendedHint} from '@app/features/expressions/utils/AssetUploadHintCopy';
-import {isSvgFile, readImageFileAsUploadDataUrl} from '@app/features/expressions/utils/ImageUploadFileUtils';
-import {
- EDIT_GROUP_DESCRIPTOR,
- FAILED_TO_PROCESS_CROPPED_IMAGE_DESCRIPTOR,
- INVALID_IMAGE_TRY_ANOTHER_DESCRIPTOR,
-} from '@app/features/i18n/utils/CommonMessageDescriptors';
-import {openFilePicker} from '@app/features/messaging/utils/FilePickerUtils';
-import {formatFileSize} from '@app/features/messaging/utils/FileUtils';
+import {EDIT_GROUP_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
import {Button} from '@app/features/ui/button/Button';
import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
-import {modal} from '@app/features/ui/commands/ModalCommands';
-import * as ToastCommands from '@app/features/ui/commands/ToastCommands';
import {Form} from '@app/features/ui/components/form/Form';
import {Input} from '@app/features/ui/components/form/FormInput';
-import * as AvatarUtils from '@app/features/user/utils/AvatarUtils';
-import {canCropFile} from '@app/features/voice/utils/MediaCapabilities';
-import {useRemoteFormReset} from '@app/lib/forms/RemoteFormReset';
-import {assignTransientUploadFieldMutation} from '@app/lib/forms/TransientUploadFields';
import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
import {PlusIcon} from '@phosphor-icons/react';
import {observer} from 'mobx-react-lite';
-import {useCallback, useMemo, useState} from 'react';
-import {Controller, useForm} from 'react-hook-form';
+import {Controller} from 'react-hook-form';
const ICON_FILE_IS_TOO_LARGE_PLEASE_CHOOSE_A_DESCRIPTOR = msg({
message: 'Icon file is too large. Choose a file smaller than {imageMaxSizeLabel}.',
comment: 'Error message in the edit group modal. Preserve {imageMaxSizeLabel}; it is inserted by code.',
});
-const ICON_FILE_IS_TOO_LARGE_TITLE_DESCRIPTOR = msg({
- message: 'Icon file is too large',
- comment: 'Title of the error modal shown when the selected group icon exceeds the size limit.',
-});
-const UNSUPPORTED_ICON_FORMAT_DESCRIPTOR = msg({
- message: 'Unsupported icon format',
- comment: 'Title of the error modal shown when the selected group icon format is unsupported.',
-});
const ANIMATED_ICONS_ARE_NOT_SUPPORTED_PLEASE_USE_DESCRIPTOR = msg({
message: 'Animated icons are not supported. Use a static image.',
comment: 'Description text in the edit group modal.',
});
-const ANIMATED_ICONS_ARE_NOT_SUPPORTED_TITLE_DESCRIPTOR = msg({
- message: 'Animated icons are not supported',
- comment: 'Title of the error modal shown when an animated group icon is selected.',
-});
-const COULDN_T_PROCESS_IMAGE_DESCRIPTOR = msg({
- message: "Couldn't process image",
- comment: 'Title of the error modal shown when a cropped group icon cannot be processed.',
-});
-const INVALID_IMAGE_DESCRIPTOR = msg({
- message: 'Invalid image',
- comment: 'Title of the error modal shown when the selected group icon image cannot be used.',
-});
const GROUP_NAME_MUST_NOT_EXCEED_100_CHARACTERS_DESCRIPTOR = msg({
message: 'Group name must not exceed 100 characters',
comment: 'Label in the edit group modal.',
@@ -90,158 +42,58 @@ const CHANGE_ICON_DESCRIPTOR = msg({
'Title of the modal where the user picks a group icon source. Keep it concise. Keep the tone plain and specific.',
});
-interface FormInputs {
- icon?: string | null;
- name: string;
- nsfw: boolean;
-}
+const ICON_FILE_IS_TOO_LARGE_TITLE_DESCRIPTOR = msg({
+ message: 'Icon file is too large',
+ comment: 'Title of the error modal shown when the selected group icon exceeds the size limit.',
+});
+const UNSUPPORTED_ICON_FORMAT_DESCRIPTOR = msg({
+ message: 'Unsupported icon format',
+ comment: 'Title of the error modal shown when the selected group icon format is unsupported.',
+});
+const ANIMATED_ICONS_ARE_NOT_SUPPORTED_TITLE_DESCRIPTOR = msg({
+ message: 'Animated icons are not supported',
+ comment: 'Title of the error modal shown when an animated group icon is selected.',
+});
+const COULDN_T_PROCESS_IMAGE_DESCRIPTOR = msg({
+ message: "Couldn't process image",
+ comment: 'Title of the error modal shown when a cropped group icon cannot be processed.',
+});
+const INVALID_IMAGE_DESCRIPTOR = msg({
+ message: 'Invalid image',
+ comment: 'Title of the error modal shown when the selected group icon image cannot be used.',
+});
+const EDIT_GROUP_FORM_MESSAGES = {
+ iconFileTooLargeTitle: ICON_FILE_IS_TOO_LARGE_TITLE_DESCRIPTOR,
+ unsupportedIconFormatTitle: UNSUPPORTED_ICON_FORMAT_DESCRIPTOR,
+ animatedIconsNotSupportedTitle: ANIMATED_ICONS_ARE_NOT_SUPPORTED_TITLE_DESCRIPTOR,
+ couldNotProcessImageTitle: COULDN_T_PROCESS_IMAGE_DESCRIPTOR,
+ invalidImageTitle: INVALID_IMAGE_DESCRIPTOR,
+ iconFileTooLarge: ICON_FILE_IS_TOO_LARGE_PLEASE_CHOOSE_A_DESCRIPTOR,
+ animatedIconsNotSupported: ANIMATED_ICONS_ARE_NOT_SUPPORTED_PLEASE_USE_DESCRIPTOR,
+ changeIcon: CHANGE_ICON_DESCRIPTOR,
+};
export const EditGroupModal = observer(({channelId}: {channelId: string}) => {
const {i18n} = useLingui();
- const channel = Channels.getChannel(channelId);
- const isOwner = channel?.ownerId === Authentication.currentUserId;
- const [hasClearedIcon, setHasClearedIcon] = useState(false);
- const [previewIconUrl, setPreviewIconUrl] = useState<string | null>(null);
- const form = useForm<FormInputs>({
- defaultValues: useMemo(() => ({name: channel?.name || '', nsfw: channel?.nsfw ?? false}), [channel]),
- });
- const remoteValues: FormInputs | null = channel ? {name: channel.name || '', nsfw: channel.nsfw} : null;
- const {commitRemoteValues} = useRemoteFormReset<FormInputs>({
- form,
- identityKey: channelId,
- remoteValues,
- isDirty: form.formState.isDirty || Boolean(previewIconUrl) || hasClearedIcon,
- onApply: () => {
- setPreviewIconUrl(null);
- setHasClearedIcon(false);
- },
- });
- const handleIconUpload = useCallback(
- async (file: File | null) => {
- try {
- if (!file) return;
- if (file.size > 10 * 1024 * 1024) {
- showChannelErrorModal({
- title: i18n._(ICON_FILE_IS_TOO_LARGE_TITLE_DESCRIPTOR),
- message: i18n._(ICON_FILE_IS_TOO_LARGE_PLEASE_CHOOSE_A_DESCRIPTOR, {
- imageMaxSizeLabel: formatFileSize(i18n.locale, IMAGE_MAX_SIZE_BYTES),
- }),
- dataFlx: 'channel.edit-group-modal.icon-file-too-large.generic-error-modal',
- });
- return;
- }
- const svg = isSvgFile(file);
- if (!svg && !(await canCropFile(file))) {
- showChannelErrorModal({
- title: i18n._(UNSUPPORTED_ICON_FORMAT_DESCRIPTOR),
- message: getAssetFormatErrorMessage(i18n, 'guild_icon', 'unsupported_mime'),
- dataFlx: 'channel.edit-group-modal.unsupported-icon-format.generic-error-modal',
- });
- return;
- }
- const animated = svg ? false : await isAnimatedFile(file);
- if (animated) {
- showChannelErrorModal({
- title: i18n._(ANIMATED_ICONS_ARE_NOT_SUPPORTED_TITLE_DESCRIPTOR),
- message: i18n._(ANIMATED_ICONS_ARE_NOT_SUPPORTED_PLEASE_USE_DESCRIPTOR),
- dataFlx: 'channel.edit-group-modal.animated-icon.generic-error-modal',
- });
- return;
- }
- const base64 = svg ? await readImageFileAsUploadDataUrl(file) : await AvatarUtils.fileToBase64(file);
- ModalCommands.push(
- modal(() => (
- <AssetCropModal
- assetType={AssetType.CHANNEL_ICON}
- imageUrl={base64}
- onCropComplete={(croppedBlob) => {
- const reader = new FileReader();
- reader.onload = () => {
- const croppedBase64 = reader.result as string;
- form.setValue('icon', croppedBase64);
- setPreviewIconUrl(croppedBase64);
- setHasClearedIcon(false);
- form.clearErrors('icon');
- };
- reader.onerror = () => {
- showChannelErrorModal({
- title: i18n._(COULDN_T_PROCESS_IMAGE_DESCRIPTOR),
- message: i18n._(FAILED_TO_PROCESS_CROPPED_IMAGE_DESCRIPTOR),
- dataFlx: 'channel.edit-group-modal.process-cropped-image-failed.generic-error-modal',
- });
- };
- reader.readAsDataURL(croppedBlob);
- }}
- onSkip={() => {
- form.setValue('icon', base64);
- setPreviewIconUrl(base64);
- setHasClearedIcon(false);
- form.clearErrors('icon');
- }}
- data-flx="channel.edit-group-modal.handle-icon-upload.asset-crop-modal"
- />
- )),
- );
- } catch {
- showChannelErrorModal({
- title: i18n._(INVALID_IMAGE_DESCRIPTOR),
- message: i18n._(INVALID_IMAGE_TRY_ANOTHER_DESCRIPTOR),
- dataFlx: 'channel.edit-group-modal.invalid-image.generic-error-modal',
- });
- }
- },
- [form, i18n],
- );
- const handleIconUploadClick = useCallback(async () => {
- const [file] = await openFilePicker({accept: getAcceptStringFiltered('guild_icon', false)});
- await handleIconUpload(file ?? null);
- }, [handleIconUpload]);
- const handleOpenIconUpload = useCallback(() => {
- openAssetSourceModal({
- title: i18n._(CHANGE_ICON_DESCRIPTOR),
- uploadHint: formatImageUploadRecommendedHint(i18n, {
- formats: STATIC_IMAGE_FORMATS,
- maxSize: formatFileSize(i18n.locale, IMAGE_MAX_SIZE_BYTES),
- recommendedSize: AVATAR_RECOMMENDED_SIZE_LABEL,
- }),
- onPickUpload: handleIconUploadClick,
- showGifOption: false,
- });
- }, [handleIconUploadClick, i18n]);
- const handleClearIcon = useCallback(() => {
- form.setValue('icon', null);
- setPreviewIconUrl(null);
- setHasClearedIcon(true);
- }, [form]);
- const onSubmit = useCallback(
- async (data: FormInputs) => {
- const updateData: {icon?: string | null; name: string; nsfw?: boolean} = {name: data.name};
- if (isOwner && data.nsfw !== channel?.nsfw) {
- updateData.nsfw = data.nsfw;
- }
- assignTransientUploadFieldMutation(updateData, 'icon', {
- value: data.icon,
- previewUrl: previewIconUrl,
- hasCleared: hasClearedIcon,
- });
- const newChannel = await ChannelCommands.update(channelId, updateData);
- commitRemoteValues({name: newChannel.name || data.name, nsfw: newChannel.nsfw ?? data.nsfw});
- ToastCommands.createToast({type: 'success', children: <Trans>Group updated</Trans>});
- ModalCommands.pop();
- },
- [channel, channelId, commitRemoteValues, isOwner, previewIconUrl, hasClearedIcon],
- );
- const {handleSubmit, isSubmitting} = useFormSubmit({
+ const {
+ channel,
form,
- onSubmit,
- defaultErrorField: 'name',
+ isOwner,
+ previewIconUrl,
+ iconPresentable,
+ handleOpenIconUpload,
+ handleClearIcon,
+ handleSubmit,
+ isSubmitting,
+ } = useEditGroupForm({
+ channelId,
+ onDone: ModalCommands.pop,
+ dataFlx: 'channel.edit-group-modal',
+ messages: EDIT_GROUP_FORM_MESSAGES,
});
if (!channel) {
return null;
}
- const iconPresentable = hasClearedIcon
- ? null
- : (previewIconUrl ?? AvatarUtils.getChannelIconURL({id: channel.id, icon: channel.icon}));
const placeholderName = channel ? ChannelUtils.getDMDisplayName(channel) : '';
return (
<Modal.Root size="small" centered data-flx="channel.edit-group-modal.modal-root">
diff --git a/fluxer_app/src/features/channel/components/modals/channel_tabs/channel_overview_tab/SlowmodeControl.tsx b/fluxer_app/src/features/channel/components/modals/channel_tabs/channel_overview_tab/SlowmodeControl.tsx
index 7a787c8ca..94c2bac61 100644
--- a/fluxer_app/src/features/channel/components/modals/channel_tabs/channel_overview_tab/SlowmodeControl.tsx
+++ b/fluxer_app/src/features/channel/components/modals/channel_tabs/channel_overview_tab/SlowmodeControl.tsx
@@ -3,7 +3,7 @@
import styles from '@app/features/channel/components/modals/channel_tabs/ChannelOverviewTab.module.css';
import {SettingsControlRow} from '@app/features/channel/components/modals/channel_tabs/channel_overview_tab/SettingsControlRow';
import type {FormInputs} from '@app/features/channel/components/modals/channel_tabs/channel_overview_tab/shared';
-import {getCachedNumberFormat} from '@app/features/i18n/utils/IntlCache';
+import {formatList, getCachedNumberFormat} from '@app/features/i18n/utils/IntlCache';
import {formatPermissionLabel} from '@app/features/permissions/utils/PermissionUtils';
import {Slider} from '@app/features/ui/components/Slider';
import {Permissions} from '@fluxer/constants/src/ChannelConstants';
@@ -12,7 +12,6 @@ import {SECONDS_PER_HOUR, SECONDS_PER_MINUTE} from '@fluxer/date_utils/src/DateC
import type {I18n} from '@lingui/core';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
-import {formatListWithConfig} from '@pkgs/list_utils/src/ListFormatting';
import type React from 'react';
import {Controller, type UseFormReturn} from 'react-hook-form';
@@ -60,7 +59,7 @@ function formatSlowmodeDuration(i18n: I18n, seconds: number): string {
if (remainingSeconds > 0) {
parts.push(formatSlowmodeDurationPart(remainingSeconds, 'second', i18n.locale));
}
- return formatListWithConfig(parts, {locale: i18n.locale, style: 'long', type: 'unit'});
+ return formatList(parts, {locale: i18n.locale, style: 'long', type: 'unit'});
}
interface SlowmodeControlProps {
diff --git a/fluxer_app/src/features/channel/components/modals/useEditGroupForm.tsx b/fluxer_app/src/features/channel/components/modals/useEditGroupForm.tsx
new file mode 100644
index 000000000..7065e63ee
--- /dev/null
+++ b/fluxer_app/src/features/channel/components/modals/useEditGroupForm.tsx
@@ -0,0 +1,219 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {
+ AVATAR_RECOMMENDED_SIZE_LABEL,
+ IMAGE_MAX_SIZE_BYTES,
+ STATIC_IMAGE_FORMATS,
+} from '@app/features/app/config/I18nDisplayConstants';
+import {useFormSubmit} from '@app/features/app/hooks/useFormSubmit';
+import Authentication from '@app/features/auth/state/Authentication';
+import * as ChannelCommands from '@app/features/channel/commands/ChannelCommands';
+import {showChannelErrorModal} from '@app/features/channel/components/alerts/ChannelErrorModalUtils';
+import Channels from '@app/features/channel/state/Channels';
+import {AssetCropModal, AssetType} from '@app/features/expressions/components/modals/AssetCropModal';
+import {openAssetSourceModal} from '@app/features/expressions/components/modals/AssetSourceModal';
+import {isAnimatedFile} from '@app/features/expressions/utils/AnimatedImageUtils';
+import {getAcceptStringFiltered, getAssetFormatErrorMessage} from '@app/features/expressions/utils/AssetFormatCopy';
+import {formatImageUploadRecommendedHint} from '@app/features/expressions/utils/AssetUploadHintCopy';
+import {isSvgFile, readImageFileAsUploadDataUrl} from '@app/features/expressions/utils/ImageUploadFileUtils';
+import {
+ FAILED_TO_PROCESS_CROPPED_IMAGE_DESCRIPTOR,
+ INVALID_IMAGE_TRY_ANOTHER_DESCRIPTOR,
+} from '@app/features/i18n/utils/CommonMessageDescriptors';
+import {openFilePicker} from '@app/features/messaging/utils/FilePickerUtils';
+import {formatFileSize} from '@app/features/messaging/utils/FileUtils';
+import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
+import {modal} from '@app/features/ui/commands/ModalCommands';
+import * as ToastCommands from '@app/features/ui/commands/ToastCommands';
+import * as AvatarUtils from '@app/features/user/utils/AvatarUtils';
+import {canCropFile} from '@app/features/voice/utils/MediaCapabilities';
+import {useRemoteFormReset} from '@app/lib/forms/RemoteFormReset';
+import {assignTransientUploadFieldMutation} from '@app/lib/forms/TransientUploadFields';
+import type {MessageDescriptor} from '@lingui/core';
+import {Trans, useLingui} from '@lingui/react/macro';
+import {useCallback, useMemo, useState} from 'react';
+import {useForm} from 'react-hook-form';
+
+interface FormInputs {
+ icon?: string | null;
+ name: string;
+ nsfw: boolean;
+}
+
+interface EditGroupFormMessages {
+ iconFileTooLargeTitle: MessageDescriptor;
+ unsupportedIconFormatTitle: MessageDescriptor;
+ animatedIconsNotSupportedTitle: MessageDescriptor;
+ couldNotProcessImageTitle: MessageDescriptor;
+ invalidImageTitle: MessageDescriptor;
+ iconFileTooLarge: MessageDescriptor;
+ animatedIconsNotSupported: MessageDescriptor;
+ changeIcon: MessageDescriptor;
+}
+
+export function useEditGroupForm({
+ channelId,
+ onDone,
+ dataFlx,
+ messages,
+}: {
+ channelId: string;
+ onDone: () => void;
+ dataFlx: string;
+ messages: EditGroupFormMessages;
+}) {
+ const {i18n} = useLingui();
+ const channel = Channels.getChannel(channelId);
+ const isOwner = channel?.ownerId === Authentication.currentUserId;
+ const [hasClearedIcon, setHasClearedIcon] = useState(false);
+ const [previewIconUrl, setPreviewIconUrl] = useState<string | null>(null);
+ const form = useForm<FormInputs>({
+ defaultValues: useMemo(() => ({name: channel?.name || '', nsfw: channel?.nsfw ?? false}), [channel]),
+ });
+ const remoteValues: FormInputs | null = channel ? {name: channel.name || '', nsfw: channel.nsfw} : null;
+ const {commitRemoteValues} = useRemoteFormReset<FormInputs>({
+ form,
+ identityKey: channelId,
+ remoteValues,
+ isDirty: form.formState.isDirty || Boolean(previewIconUrl) || hasClearedIcon,
+ onApply: () => {
+ setPreviewIconUrl(null);
+ setHasClearedIcon(false);
+ },
+ });
+ const handleIconUpload = useCallback(
+ async (file: File | null) => {
+ try {
+ if (!file) return;
+ if (file.size > 10 * 1024 * 1024) {
+ showChannelErrorModal({
+ title: i18n._(messages.iconFileTooLargeTitle),
+ message: i18n._(messages.iconFileTooLarge, {
+ imageMaxSizeLabel: formatFileSize(i18n.locale, IMAGE_MAX_SIZE_BYTES),
+ }),
+ dataFlx: `${dataFlx}.icon-file-too-large.generic-error-modal`,
+ });
+ return;
+ }
+ const svg = isSvgFile(file);
+ if (!svg && !(await canCropFile(file))) {
+ showChannelErrorModal({
+ title: i18n._(messages.unsupportedIconFormatTitle),
+ message: getAssetFormatErrorMessage(i18n, 'guild_icon', 'unsupported_mime'),
+ dataFlx: `${dataFlx}.unsupported-icon-format.generic-error-modal`,
+ });
+ return;
+ }
+ const animated = svg ? false : await isAnimatedFile(file);
+ if (animated) {
+ showChannelErrorModal({
+ title: i18n._(messages.animatedIconsNotSupportedTitle),
+ message: i18n._(messages.animatedIconsNotSupported),
+ dataFlx: `${dataFlx}.animated-icon.generic-error-modal`,
+ });
+ return;
+ }
+ const base64 = svg ? await readImageFileAsUploadDataUrl(file) : await AvatarUtils.fileToBase64(file);
+ ModalCommands.push(
+ modal(() => (
+ <AssetCropModal
+ assetType={AssetType.CHANNEL_ICON}
+ imageUrl={base64}
+ onCropComplete={(croppedBlob) => {
+ const reader = new FileReader();
+ reader.onload = () => {
+ const croppedBase64 = reader.result as string;
+ form.setValue('icon', croppedBase64);
+ setPreviewIconUrl(croppedBase64);
+ setHasClearedIcon(false);
+ form.clearErrors('icon');
+ };
+ reader.onerror = () => {
+ showChannelErrorModal({
+ title: i18n._(messages.couldNotProcessImageTitle),
+ message: i18n._(FAILED_TO_PROCESS_CROPPED_IMAGE_DESCRIPTOR),
+ dataFlx: `${dataFlx}.process-cropped-image-failed.generic-error-modal`,
+ });
+ };
+ reader.readAsDataURL(croppedBlob);
+ }}
+ onSkip={() => {
+ form.setValue('icon', base64);
+ setPreviewIconUrl(base64);
+ setHasClearedIcon(false);
+ form.clearErrors('icon');
+ }}
+ data-flx={`${dataFlx}.handle-icon-upload.asset-crop-modal`}
+ />
+ )),
+ );
+ } catch {
+ showChannelErrorModal({
+ title: i18n._(messages.invalidImageTitle),
+ message: i18n._(INVALID_IMAGE_TRY_ANOTHER_DESCRIPTOR),
+ dataFlx: `${dataFlx}.invalid-image.generic-error-modal`,
+ });
+ }
+ },
+ [dataFlx, form, i18n, messages],
+ );
+ const handleIconUploadClick = useCallback(async () => {
+ const [file] = await openFilePicker({accept: getAcceptStringFiltered('guild_icon', false)});
+ await handleIconUpload(file ?? null);
+ }, [handleIconUpload]);
+ const handleOpenIconUpload = useCallback(() => {
+ openAssetSourceModal({
+ title: i18n._(messages.changeIcon),
+ uploadHint: formatImageUploadRecommendedHint(i18n, {
+ formats: STATIC_IMAGE_FORMATS,
+ maxSize: formatFileSize(i18n.locale, IMAGE_MAX_SIZE_BYTES),
+ recommendedSize: AVATAR_RECOMMENDED_SIZE_LABEL,
+ }),
+ onPickUpload: handleIconUploadClick,
+ showGifOption: false,
+ });
+ }, [handleIconUploadClick, i18n, messages]);
+ const handleClearIcon = useCallback(() => {
+ form.setValue('icon', null);
+ setPreviewIconUrl(null);
+ setHasClearedIcon(true);
+ }, [form]);
+ const onSubmit = useCallback(
+ async (data: FormInputs) => {
+ const updateData: {icon?: string | null; name: string; nsfw?: boolean} = {name: data.name};
+ if (isOwner && data.nsfw !== channel?.nsfw) {
+ updateData.nsfw = data.nsfw;
+ }
+ assignTransientUploadFieldMutation(updateData, 'icon', {
+ value: data.icon,
+ previewUrl: previewIconUrl,
+ hasCleared: hasClearedIcon,
+ });
+ const newChannel = await ChannelCommands.update(channelId, updateData);
+ commitRemoteValues({name: newChannel.name || data.name, nsfw: newChannel.nsfw ?? data.nsfw});
+ ToastCommands.createToast({type: 'success', children: <Trans>Group updated</Trans>});
+ onDone();
+ },
+ [channel, channelId, commitRemoteValues, isOwner, onDone, previewIconUrl, hasClearedIcon],
+ );
+ const {handleSubmit, isSubmitting} = useFormSubmit({
+ form,
+ onSubmit,
+ defaultErrorField: 'name',
+ });
+ const iconPresentable =
+ hasClearedIcon || !channel
+ ? null
+ : (previewIconUrl ?? AvatarUtils.getChannelIconURL({id: channel.id, icon: channel.icon}));
+ return {
+ channel,
+ form,
+ isOwner,
+ previewIconUrl,
+ iconPresentable,
+ handleOpenIconUpload,
+ handleClearIcon,
+ handleSubmit,
+ isSubmitting,
+ };
+}
diff --git a/fluxer_app/src/features/channel/components/pickers/memes/MediaFormat.ts b/fluxer_app/src/features/channel/components/pickers/memes/MediaFormat.ts
index e87e4c84b..c75b81f19 100644
--- a/fluxer_app/src/features/channel/components/pickers/memes/MediaFormat.ts
+++ b/fluxer_app/src/features/channel/components/pickers/memes/MediaFormat.ts
@@ -12,3 +12,25 @@ export const getFileExtension = (filename: string, contentType: string): string
const typeMatch = contentType.match(/\/([^;]+)/);
return typeMatch?.[1]?.toUpperCase() || 'FILE';
};
+
+export function filterMemesByContentType<T extends {contentType: string; isGifv: boolean}>(
+ memes: ReadonlyArray<T>,
+ filter: 'all' | 'image' | 'video' | 'audio' | 'gif',
+): Array<T> {
+ if (filter === 'all') return [...memes];
+ return memes.filter((meme) => {
+ const contentType = meme.contentType.toLowerCase();
+ switch (filter) {
+ case 'image':
+ return contentType.startsWith('image/') && !contentType.includes('gif') && !meme.isGifv;
+ case 'video':
+ return contentType.startsWith('video/') && !meme.isGifv;
+ case 'audio':
+ return contentType.startsWith('audio/');
+ case 'gif':
+ return contentType.includes('gif') || meme.isGifv;
+ default:
+ return true;
+ }
+ });
+}
diff --git a/fluxer_app/src/features/channel/components/pickers/memes/MemesPickerView.tsx b/fluxer_app/src/features/channel/components/pickers/memes/MemesPickerView.tsx
index 135a6faa7..940067ccd 100644
--- a/fluxer_app/src/features/channel/components/pickers/memes/MemesPickerView.tsx
+++ b/fluxer_app/src/features/channel/components/pickers/memes/MemesPickerView.tsx
@@ -3,6 +3,7 @@
import {useSearchInputAutofocus} from '@app/features/app/hooks/useSearchInputAutofocus';
import gifStyles from '@app/features/channel/components/GifPicker.module.css';
import {useGifVideoPool} from '@app/features/channel/components/GifVideoPool';
+import {filterMemesByContentType} from '@app/features/channel/components/pickers/memes/MediaFormat';
import {MemesGrid} from '@app/features/channel/components/pickers/memes/MemesGrid';
import type {MemesPickerProps} from '@app/features/channel/components/pickers/memes/MemesPicker';
import {type ContentType, MemesPickerHeader} from '@app/features/channel/components/pickers/memes/MemesPickerHeader';
@@ -64,24 +65,7 @@ export const MemesPickerView = observer(({onClose}: MemesPickerProps = {}) => {
jumpToStartEdge();
}, [state.selectedFilter, state.searchTerm, jumpToStartEdge]);
const filteredMemes = useMemo(() => {
- let memes = [...favoriteMemes];
- if (state.selectedFilter !== 'all') {
- memes = memes.filter((meme) => {
- const contentType = meme.contentType.toLowerCase();
- switch (state.selectedFilter) {
- case 'image':
- return contentType.startsWith('image/') && !contentType.includes('gif') && !meme.isGifv;
- case 'video':
- return contentType.startsWith('video/') && !meme.isGifv;
- case 'audio':
- return contentType.startsWith('audio/');
- case 'gif':
- return contentType.includes('gif') || meme.isGifv;
- default:
- return true;
- }
- });
- }
+ let memes = filterMemesByContentType(favoriteMemes, state.selectedFilter);
if (state.searchTerm) {
const sortedByMatch = matchSorter(memes, state.searchTerm, {
keys: ['name', 'altText', 'filename', 'tags'],
diff --git a/fluxer_app/src/features/channel/components/shared/usePickerGridKeyboard.ts b/fluxer_app/src/features/channel/components/shared/usePickerGridKeyboard.ts
new file mode 100644
index 000000000..e98612971
--- /dev/null
+++ b/fluxer_app/src/features/channel/components/shared/usePickerGridKeyboard.ts
@@ -0,0 +1,135 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {isIMEComposing} from '@app/features/messaging/utils/IMECompositionUtils';
+import type React from 'react';
+import {useCallback, useEffect} from 'react';
+
+export interface PickerGridKeyboardOptions {
+ selectedRow?: number;
+ selectedColumn?: number;
+ sections?: Array<number>;
+ onSelect?: (row: number | null, column: number | null, event?: React.KeyboardEvent) => void;
+ onSelectionChange?: (row: number, column: number, shouldScroll?: boolean) => void;
+}
+
+export function usePickerGridKeyboard({
+ selectedRow = -1,
+ selectedColumn = -1,
+ sections = [],
+ onSelect,
+ onSelectionChange,
+}: PickerGridKeyboardOptions): (event: React.KeyboardEvent<HTMLInputElement> | React.KeyboardEvent) => void {
+ const handleKeyDown = useCallback(
+ (event: React.KeyboardEvent<HTMLInputElement> | React.KeyboardEvent) => {
+ if (isIMEComposing(event)) {
+ return;
+ }
+ if (sections.length === 0) {
+ return;
+ }
+ let newRow = selectedRow;
+ let newColumn = selectedColumn;
+ switch (event.key) {
+ case 'ArrowDown':
+ event.preventDefault();
+ event.stopPropagation();
+ if (newRow === -1) {
+ newRow = 0;
+ newColumn = 0;
+ } else {
+ newRow += 1;
+ if (newRow >= sections.length) {
+ newRow = sections.length - 1;
+ }
+ if (newColumn >= sections[newRow]) {
+ newColumn = sections[newRow] - 1;
+ }
+ }
+ break;
+ case 'ArrowUp':
+ event.preventDefault();
+ event.stopPropagation();
+ newRow -= 1;
+ if (newRow < 0) {
+ newRow = 0;
+ newColumn = 0;
+ } else if (newColumn >= sections[newRow]) {
+ newColumn = sections[newRow] - 1;
+ }
+ break;
+ case 'ArrowLeft':
+ event.preventDefault();
+ event.stopPropagation();
+ if (newRow === -1) {
+ newRow = 0;
+ }
+ newColumn -= 1;
+ if (newColumn < 0) {
+ newRow -= 1;
+ if (newRow >= 0) {
+ newColumn = sections[newRow] - 1;
+ } else {
+ newRow = 0;
+ newColumn = 0;
+ }
+ }
+ break;
+ case 'ArrowRight':
+ event.preventDefault();
+ event.stopPropagation();
+ if (newRow === -1) {
+ newRow = 0;
+ }
+ newColumn += 1;
+ if (newColumn >= sections[newRow]) {
+ newRow += 1;
+ newColumn = 0;
+ if (newRow >= sections.length) {
+ newRow = sections.length - 1;
+ newColumn = sections[newRow] - 1;
+ }
+ }
+ break;
+ case 'Enter':
+ event.preventDefault();
+ event.stopPropagation();
+ if (newRow === -1) {
+ newRow = 0;
+ }
+ if (newColumn === -1) {
+ newColumn = 0;
+ }
+ onSelect?.(newRow, newColumn, event);
+ return;
+ case 'Escape':
+ onSelect?.(null, null);
+ return;
+ default:
+ return;
+ }
+ onSelectionChange?.(newRow, newColumn, true);
+ },
+ [sections, selectedRow, selectedColumn, onSelect, onSelectionChange],
+ );
+ useEffect(() => {
+ const handleGlobalKeyDown = (event: Event) => {
+ if (sections.length === 0) {
+ return;
+ }
+ const keyboardEvent = event as KeyboardEvent;
+ if (!['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'].includes(keyboardEvent.key)) {
+ return;
+ }
+ const syntheticEvent = {
+ key: keyboardEvent.key,
+ shiftKey: keyboardEvent.shiftKey,
+ preventDefault: () => keyboardEvent.preventDefault(),
+ stopPropagation: () => keyboardEvent.stopPropagation(),
+ } as React.KeyboardEvent;
+ handleKeyDown(syntheticEvent);
+ };
+ document.addEventListener('keydown', handleGlobalKeyDown);
+ return () => document.removeEventListener('keydown', handleGlobalKeyDown);
+ }, [sections, handleKeyDown]);
+ return handleKeyDown;
+}
diff --git a/fluxer_app/src/features/channel/components/sticker_picker/StickerPickerSearchBar.tsx b/fluxer_app/src/features/channel/components/sticker_picker/StickerPickerSearchBar.tsx
index ae800c95c..f02751a43 100644
--- a/fluxer_app/src/features/channel/components/sticker_picker/StickerPickerSearchBar.tsx
+++ b/fluxer_app/src/features/channel/components/sticker_picker/StickerPickerSearchBar.tsx
@@ -1,156 +1,32 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {PickerSearchInput} from '@app/features/channel/components/shared/PickerSearchInput';
+import {
+ type PickerGridKeyboardOptions,
+ usePickerGridKeyboard,
+} from '@app/features/channel/components/shared/usePickerGridKeyboard';
import type {GuildSticker} from '@app/features/expressions/models/GuildSticker';
-import {isIMEComposing} from '@app/features/messaging/utils/IMECompositionUtils';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
import {observer} from 'mobx-react-lite';
import type React from 'react';
-import {useCallback, useEffect} from 'react';
const FIND_THE_PERFECT_STICKER_DESCRIPTOR = msg({
message: 'Find the perfect sticker',
comment: 'Label in the channel and chat sticker picker search bar.',
});
-interface StickerPickerSearchBarProps {
+interface StickerPickerSearchBarProps extends PickerGridKeyboardOptions {
searchTerm: string;
setSearchTerm: (term: string) => void;
hoveredSticker: GuildSticker | null;
inputRef?: React.RefObject<HTMLInputElement | null> | React.RefObject<HTMLInputElement>;
- selectedRow?: number;
- selectedColumn?: number;
- sections?: Array<number>;
- onSelect?: (row: number | null, column: number | null, event?: React.KeyboardEvent) => void;
- onSelectionChange?: (row: number, column: number, shouldScroll?: boolean) => void;
}
export const StickerPickerSearchBar = observer(
- ({
- searchTerm,
- setSearchTerm,
- hoveredSticker,
- inputRef,
- selectedRow = -1,
- selectedColumn = -1,
- sections = [],
- onSelect,
- onSelectionChange,
- }: StickerPickerSearchBarProps) => {
+ ({searchTerm, setSearchTerm, hoveredSticker, inputRef, ...keyboard}: StickerPickerSearchBarProps) => {
const {i18n} = useLingui();
- const handleKeyDown = useCallback(
- (event: React.KeyboardEvent<HTMLInputElement> | React.KeyboardEvent) => {
- if (isIMEComposing(event)) {
- return;
- }
- if (sections.length === 0) {
- return;
- }
- let newRow = selectedRow;
- let newColumn = selectedColumn;
- switch (event.key) {
- case 'ArrowDown':
- event.preventDefault();
- event.stopPropagation();
- if (newRow === -1) {
- newRow = 0;
- newColumn = 0;
- } else {
- newRow += 1;
- if (newRow >= sections.length) {
- newRow = sections.length - 1;
- }
- if (newColumn >= sections[newRow]) {
- newColumn = sections[newRow] - 1;
- }
- }
- break;
- case 'ArrowUp':
- event.preventDefault();
- event.stopPropagation();
- newRow -= 1;
- if (newRow < 0) {
- newRow = 0;
- newColumn = 0;
- } else if (newColumn >= sections[newRow]) {
- newColumn = sections[newRow] - 1;
- }
- break;
- case 'ArrowLeft':
- event.preventDefault();
- event.stopPropagation();
- if (newRow === -1) {
- newRow = 0;
- }
- newColumn -= 1;
- if (newColumn < 0) {
- newRow -= 1;
- if (newRow >= 0) {
- newColumn = sections[newRow] - 1;
- } else {
- newRow = 0;
- newColumn = 0;
- }
- }
- break;
- case 'ArrowRight':
- event.preventDefault();
- event.stopPropagation();
- if (newRow === -1) {
- newRow = 0;
- }
- newColumn += 1;
- if (newColumn >= sections[newRow]) {
- newRow += 1;
- newColumn = 0;
- if (newRow >= sections.length) {
- newRow = sections.length - 1;
- newColumn = sections[newRow] - 1;
- }
- }
- break;
- case 'Enter':
- event.preventDefault();
- event.stopPropagation();
- if (newRow === -1) {
- newRow = 0;
- }
- if (newColumn === -1) {
- newColumn = 0;
- }
- onSelect?.(newRow, newColumn, event);
- return;
- case 'Escape':
- onSelect?.(null, null);
- return;
- default:
- return;
- }
- onSelectionChange?.(newRow, newColumn, true);
- },
- [sections, selectedRow, selectedColumn, onSelect, onSelectionChange],
- );
- useEffect(() => {
- const handleGlobalKeyDown = (event: Event) => {
- if (sections.length === 0) {
- return;
- }
- const keyboardEvent = event as KeyboardEvent;
- if (!['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'].includes(keyboardEvent.key)) {
- return;
- }
- const syntheticEvent = {
- key: keyboardEvent.key,
- shiftKey: keyboardEvent.shiftKey,
- preventDefault: () => keyboardEvent.preventDefault(),
- stopPropagation: () => keyboardEvent.stopPropagation(),
- } as React.KeyboardEvent;
- handleKeyDown(syntheticEvent);
- };
- document.addEventListener('keydown', handleGlobalKeyDown);
- return () => document.removeEventListener('keydown', handleGlobalKeyDown);
- }, [sections, handleKeyDown]);
+ const handleKeyDown = usePickerGridKeyboard(keyboard);
const placeholder = hoveredSticker ? hoveredSticker.name : i18n._(FIND_THE_PERFECT_STICKER_DESCRIPTOR);
return (
<PickerSearchInput
diff --git a/fluxer_app/src/features/channel/components/textarea/TextareaContextMenu.tsx b/fluxer_app/src/features/channel/components/textarea/TextareaContextMenu.tsx
index f55a57b30..872683b93 100644
--- a/fluxer_app/src/features/channel/components/textarea/TextareaContextMenu.tsx
+++ b/fluxer_app/src/features/channel/components/textarea/TextareaContextMenu.tsx
@@ -6,7 +6,6 @@ import {UserSettingsModal} from '@app/features/app/components/dialogs/LoadableSe
import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
import Spellcheck from '@app/features/messaging/state/Spellcheck';
import {isEditableTextInput, replaceSelectedText} from '@app/features/messaging/utils/TextInputEditUtils';
-import type {SpellcheckEngine} from '@app/features/platform/types/Electron';
import {CheckboxItem, MenuSeparator} from '@app/features/ui/action_menu/ContextMenu';
import {MenuGroup} from '@app/features/ui/action_menu/MenuGroup';
import {MenuItem} from '@app/features/ui/action_menu/MenuItem';
@@ -14,6 +13,7 @@ import {MenuItemRadio} from '@app/features/ui/action_menu/MenuItemRadio';
import {MenuItemSubmenu} from '@app/features/ui/action_menu/MenuItemSubmenu';
import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
import {getElectronAPI, isElectron} from '@app/features/ui/utils/NativeUtils';
+import type {SpellcheckEngine} from '@app/types/electron.d';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
import {
diff --git a/fluxer_app/src/features/channel/hooks/useChannelMemberListVisibility.ts b/fluxer_app/src/features/channel/hooks/useChannelMemberListVisibility.ts
deleted file mode 100644
index e42e40d9b..000000000
--- a/fluxer_app/src/features/channel/hooks/useChannelMemberListVisibility.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-import {ComponentBus} from '@app/features/platform/utils/ComponentBus';
-import {useEffect, useRef} from 'react';
-
-export function useChannelMemberListVisibility(channelId: string | null, visible: boolean): void {
- const previousVisibilityRef = useRef({channelId, visible});
- useEffect(() => {
- const previousVisibility = previousVisibilityRef.current;
- previousVisibilityRef.current = {channelId, visible};
- if (!channelId) return;
- if (previousVisibility.channelId === channelId && previousVisibility.visible === visible) return;
- ComponentBus.dispatch('LAYOUT_RESIZED', {channelId});
- }, [channelId, visible]);
-}
diff --git a/fluxer_app/src/features/channel/hooks/useChannelSearchVisibility.ts b/fluxer_app/src/features/channel/hooks/useChannelPanelVisibility.ts
similarity index 85%
rename from fluxer_app/src/features/channel/hooks/useChannelSearchVisibility.ts
rename to fluxer_app/src/features/channel/hooks/useChannelPanelVisibility.ts
index b4b13e1ec..965796b09 100644
--- a/fluxer_app/src/features/channel/hooks/useChannelSearchVisibility.ts
+++ b/fluxer_app/src/features/channel/hooks/useChannelPanelVisibility.ts
@@ -3,7 +3,7 @@
import {ComponentBus} from '@app/features/platform/utils/ComponentBus';
import {useEffect, useRef} from 'react';
-export function useChannelSearchVisibility(channelId: string | null, visible: boolean): void {
+export function useChannelPanelVisibility(channelId: string | null, visible: boolean): void {
const previousVisibilityRef = useRef({channelId, visible});
useEffect(() => {
const previousVisibility = previousVisibilityRef.current;
diff --git a/fluxer_app/src/features/channel/hooks/useChannelSearch.ts b/fluxer_app/src/features/channel/hooks/useChannelSearch.ts
index c21832fe8..65693ba9e 100644
--- a/fluxer_app/src/features/channel/hooks/useChannelSearch.ts
+++ b/fluxer_app/src/features/channel/hooks/useChannelSearch.ts
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
+import {applySortModeToParams} from '@app/features/channel/components/channel_search_results/ChannelSearchResultsShared';
import {
DEFAULT_SCOPE_VALUE,
getScopeOptionsForChannel,
@@ -88,22 +89,6 @@ interface ChannelSearchExecutionOverrides {
sortMode?: ChannelSearchSortMode;
}
-const applySortModeToParams = (params: MessageSearchParams, mode: ChannelSearchSortMode): void => {
- switch (mode) {
- case 'newest':
- params.sortBy = 'timestamp';
- params.sortOrder = 'desc';
- break;
- case 'oldest':
- params.sortBy = 'timestamp';
- params.sortOrder = 'asc';
- break;
- case 'relevant':
- params.sortBy = 'relevance';
- params.sortOrder = 'desc';
- break;
- }
-};
const filtersToParams = (filters: ChannelSearchFilters): MessageSearchParams => {
const params: MessageSearchParams = {};
if (filters.content?.trim()) {
diff --git a/fluxer_app/src/features/code_highlighting/utils/ArboriumHighlightWorkerClient.ts b/fluxer_app/src/features/code_highlighting/utils/ArboriumHighlightWorkerClient.ts
index 4f0e294b1..018ba72d6 100644
--- a/fluxer_app/src/features/code_highlighting/utils/ArboriumHighlightWorkerClient.ts
+++ b/fluxer_app/src/features/code_highlighting/utils/ArboriumHighlightWorkerClient.ts
@@ -52,7 +52,7 @@ function clearIdleTimeout(): void {
idleTimeout = null;
}
-function isSignalAborted(signal: AbortSignal | undefined): boolean {
+export function isSignalAborted(signal: AbortSignal | undefined): boolean {
if (signal === undefined) {
return false;
}
diff --git a/fluxer_app/src/features/code_highlighting/utils/ArboriumHighlighting.ts b/fluxer_app/src/features/code_highlighting/utils/ArboriumHighlighting.ts
index f770f2fcc..0741b52cb 100644
--- a/fluxer_app/src/features/code_highlighting/utils/ArboriumHighlighting.ts
+++ b/fluxer_app/src/features/code_highlighting/utils/ArboriumHighlighting.ts
@@ -1,6 +1,9 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import {highlightCodeInWorker} from '@app/features/code_highlighting/utils/ArboriumHighlightWorkerClient';
+import {
+ highlightCodeInWorker,
+ isSignalAborted,
+} from '@app/features/code_highlighting/utils/ArboriumHighlightWorkerClient';
import {Logger} from '@app/features/platform/utils/AppLogger';
import {MAX_CODE_HIGHLIGHT_SOURCE_LENGTH} from '@fluxer/constants/src/LimitConstants';
import {useEffect, useMemo, useState} from 'react';
@@ -314,13 +317,6 @@ function subscribeToHighlightCacheEntry(cacheKey: string, entry: HighlightCacheE
void entry.promise.then(release, release);
}
-function isSignalAborted(signal: AbortSignal | undefined): boolean {
- if (signal === undefined) {
- return false;
- }
- return signal.aborted;
-}
-
function loadHighlightedHtml(language: string, source: string, signal?: AbortSignal): Promise<string | null> {
if (isSignalAborted(signal)) {
return Promise.resolve(null);
diff --git a/fluxer_app/src/features/connection/commands/ConnectionCommands.ts b/fluxer_app/src/features/connection/commands/ConnectionCommands.ts
index a231fc429..dbf02db4b 100644
--- a/fluxer_app/src/features/connection/commands/ConnectionCommands.ts
+++ b/fluxer_app/src/features/connection/commands/ConnectionCommands.ts
@@ -12,6 +12,7 @@ import * as ToastCommands from '@app/features/ui/commands/ToastCommands';
import * as UserProfileCommands from '@app/features/user/commands/UserProfileCommands';
import {handleAccountLimitedError} from '@app/features/user/utils/AccountLimitUtils';
import type {ConnectionType} from '@fluxer/constants/src/ConnectionConstants';
+import type {BlueskyAuthorizeResponse} from '@fluxer/schema/src/domains/connection/BlueskyOAuthSchemas';
import type {
ConnectionListResponse,
ConnectionResponse,
@@ -55,10 +56,6 @@ const CONNECTIONS_REORDERED_DESCRIPTOR = msg({
});
const logger = new Logger('Connections');
-interface BlueskyAuthorizeResponse {
- authorize_url: string;
-}
-
function connectionCreateRequest(type: ConnectionType, identifier: string): CreateConnectionRequest {
return {
type,
diff --git a/fluxer_app/src/features/discovery/discovery/DiscoveryGuildCard.tsx b/fluxer_app/src/features/discovery/discovery/DiscoveryGuildCard.tsx
index b58cc08d2..3e226dda0 100644
--- a/fluxer_app/src/features/discovery/discovery/DiscoveryGuildCard.tsx
+++ b/fluxer_app/src/features/discovery/discovery/DiscoveryGuildCard.tsx
@@ -6,6 +6,7 @@ import styles from '@app/features/discovery/discovery/DiscoveryGuildCard.module.
import {resolveBannerTintClassName} from '@app/features/discovery/utils/DiscoveryBannerTint';
import {GuildBadge} from '@app/features/guild/components/GuildBadge';
import {GuildIcon} from '@app/features/guild/components/popouts/GuildIcon';
+import {formatNumber} from '@app/features/i18n/utils/IntlCache';
import {DiscoveryGuildContextMenu} from '@app/features/ui/action_menu/DiscoveryGuildContextMenu';
import * as ContextMenuCommands from '@app/features/ui/commands/ContextMenuCommands';
import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
@@ -16,7 +17,6 @@ import {getCurrentLocale} from '@app/features/user/utils/LocaleUtils';
import {GuildFeatures} from '@fluxer/constants/src/GuildConstants';
import {msg} from '@lingui/core/macro';
import {Plural, Trans, useLingui} from '@lingui/react/macro';
-import {formatNumber} from '@pkgs/number_utils/src/NumberFormatting';
import {observer} from 'mobx-react-lite';
import type React from 'react';
import {useCallback, useId, useMemo} from 'react';
diff --git a/fluxer_app/src/features/discovery/discovery/DiscoverySearchFilters.tsx b/fluxer_app/src/features/discovery/discovery/DiscoverySearchFilters.tsx
index da77e9170..351dac99a 100644
--- a/fluxer_app/src/features/discovery/discovery/DiscoverySearchFilters.tsx
+++ b/fluxer_app/src/features/discovery/discovery/DiscoverySearchFilters.tsx
@@ -3,12 +3,12 @@
import Accessibility from '@app/features/accessibility/state/Accessibility';
import styles from '@app/features/discovery/discovery/DiscoverySearchFilters.module.css';
import Discovery from '@app/features/discovery/state/Discovery';
+import {formatNumber} from '@app/features/i18n/utils/IntlCache';
import {Combobox, type ComboboxOption} from '@app/features/ui/components/form/FormCombobox';
import FocusRing from '@app/features/ui/focus_ring/FocusRing';
import {getCurrentLocale, getSortedDiscoveryLanguages} from '@app/features/user/utils/LocaleUtils';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
-import {formatNumber} from '@pkgs/number_utils/src/NumberFormatting';
import {animate} from 'animejs';
import {clsx} from 'clsx';
import {observer} from 'mobx-react-lite';
diff --git a/fluxer_app/src/features/expressions/components/pages/GiftRegisterPage.tsx b/fluxer_app/src/features/expressions/components/pages/GiftRegisterPage.tsx
index 5d4f797b4..b05460c1b 100644
--- a/fluxer_app/src/features/expressions/components/pages/GiftRegisterPage.tsx
+++ b/fluxer_app/src/features/expressions/components/pages/GiftRegisterPage.tsx
@@ -6,8 +6,8 @@ import * as AuthenticationCommands from '@app/features/auth/commands/Authenticat
import {AuthBottomLink} from '@app/features/auth/flow/AuthBottomLink';
import {AuthErrorState} from '@app/features/auth/flow/AuthErrorState';
import {AuthLoadingState} from '@app/features/auth/flow/AuthLoadingState';
-import {AuthMinimalRegisterFormCore} from '@app/features/auth/flow/AuthMinimalRegisterFormCore';
import sharedStyles from '@app/features/auth/flow/AuthPageStyles.module.css';
+import {AuthRegisterFormCore} from '@app/features/auth/flow/AuthRegisterFormCore';
import {AuthRuntimeTargetGate} from '@app/features/auth/flow/AuthRuntimeTargetGate';
import {AuthRuntimeTargetResetAction} from '@app/features/auth/flow/AuthRuntimeTargetResetAction';
import {AuthSsoPanel, resolveAuthPanelSso} from '@app/features/auth/flow/AuthSsoPanel';
@@ -144,7 +144,8 @@ const GiftRegisterPageContent = observer(function GiftRegisterPageContent({
/>
<GiftHeader gift={gift} variant="register" data-flx="expressions.gift-register-page.gift-header" />
<div className={sharedStyles.container} data-flx="expressions.gift-register-page.div">
- <AuthMinimalRegisterFormCore
+ <AuthRegisterFormCore
+ fields={{showUsername: false}}
submitLabel={<Trans>Create account to claim gift</Trans>}
redirectPath="/"
onRegister={handleRegisterComplete}
diff --git a/fluxer_app/src/features/guild/components/modals/GuildFolderSettingsModal.tsx b/fluxer_app/src/features/guild/components/modals/GuildFolderSettingsModal.tsx
index 7639f094b..052f8d9dd 100644
--- a/fluxer_app/src/features/guild/components/modals/GuildFolderSettingsModal.tsx
+++ b/fluxer_app/src/features/guild/components/modals/GuildFolderSettingsModal.tsx
@@ -4,6 +4,7 @@ import * as Modal from '@app/features/app/components/dialogs/Modal';
import {useCursorAtEnd} from '@app/features/app/hooks/useCursorAtEnd';
import Guilds from '@app/features/guild/state/Guilds';
import {CANCEL_DESCRIPTOR, FOLDER_SETTINGS_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
+import {formatList} from '@app/features/i18n/utils/IntlCache';
import {remFromPx} from '@app/features/theme/layout/RemFromPx';
import {Button} from '@app/features/ui/button/Button';
import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
@@ -32,7 +33,6 @@ import {
ShieldIcon,
StarIcon,
} from '@phosphor-icons/react';
-import {formatListWithConfig} from '@pkgs/list_utils/src/ListFormatting';
import {observer} from 'mobx-react-lite';
import type {ReactNode} from 'react';
import {useCallback, useMemo, useState} from 'react';
@@ -139,7 +139,7 @@ const GuildFolderSettingsModal = observer(({folderId}: GuildFolderSettingsModalP
.slice(0, 3)
.map((guildId) => Guilds.getGuild(guildId)?.name)
.filter((name): name is string => name != null);
- return formatListWithConfig(guildNames, {locale: i18n.locale, style: 'narrow', type: 'conjunction'});
+ return formatList(guildNames, {locale: i18n.locale, style: 'narrow', type: 'conjunction'});
}, [folder, i18n.locale]);
const [name, setName] = useState(folder?.name ?? '');
const nameRef = useCursorAtEnd<HTMLInputElement>();
diff --git a/fluxer_app/src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx b/fluxer_app/src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
index e62ada78d..3dcc3b142 100644
--- a/fluxer_app/src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+++ b/fluxer_app/src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
@@ -1,63 +1,27 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-import {Routes} from '@app/app/Routes';
-import {UserSettingsModal} from '@app/features/app/components/dialogs/LoadableSettingsModals';
import * as Modal from '@app/features/app/components/dialogs/Modal';
-import {ExternalLink} from '@app/features/app/components/shared/ExternalLink';
-import {
- AVATAR_RECOMMENDED_SIZE_LABEL,
- IMAGE_MAX_SIZE_BYTES,
- STATIC_IMAGE_FORMATS,
-} from '@app/features/app/config/I18nDisplayConstants';
import {useFormSubmit} from '@app/features/app/hooks/useFormSubmit';
-import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
-import {openClaimAccountModal} from '@app/features/auth/components/modals/ClaimAccountModal';
-import {AssetCropModal, AssetType} from '@app/features/expressions/components/modals/AssetCropModal';
-import {openAssetSourceModal} from '@app/features/expressions/components/modals/AssetSourceModal';
-import {isAnimatedFile} from '@app/features/expressions/utils/AnimatedImageUtils';
-import {getAcceptStringFiltered} from '@app/features/expressions/utils/AssetFormatCopy';
-import {formatImageUploadRecommendedHint} from '@app/features/expressions/utils/AssetUploadHintCopy';
-import {isSvgFile, readImageFileAsUploadDataUrl} from '@app/features/expressions/utils/ImageUploadFileUtils';
import * as GuildCommands from '@app/features/guild/commands/GuildCommands';
-import {showGuildErrorModal} from '@app/features/guild/components/alerts/GuildErrorModalUtils';
import styles from '@app/features/guild/components/modals/AddGuildModal.module.css';
import {
- ANIMATED_ICONS_ARE_NOT_SUPPORTED_WHEN_CREATING_A_DESCRIPTOR,
- COMMUNITY_NAME_DESCRIPTOR,
+ renderGuildCreateAccountGate,
+ renderGuildCreateFields,
+ useGuildCreateIconField,
+} from '@app/features/guild/components/modals/add_guild_modal/GuildCreateShared';
+import {
CREATE_COMMUNITY_FORM_DESCRIPTOR,
type GuildCreateFormInputs,
handleGuildCreationError,
- ICON_FILE_IS_TOO_LARGE_PLEASE_CHOOSE_A_DESCRIPTOR,
ModalFooterContext,
} from '@app/features/guild/components/modals/add_guild_modal/shared';
-import {
- getGuildIconDisplayInitials,
- getGuildInitialsFitStyle,
- getInitialsLength,
-} from '@app/features/guild/utils/GuildInitialsUtils';
-import {
- CREATE_COMMUNITY_DESCRIPTOR,
- FAILED_TO_PROCESS_CROPPED_IMAGE_DESCRIPTOR,
- INVALID_IMAGE_TRY_ANOTHER_DESCRIPTOR,
- VERIFY_EMAIL_DESCRIPTOR,
-} from '@app/features/i18n/utils/CommonMessageDescriptors';
-import {openFilePicker} from '@app/features/messaging/utils/FilePickerUtils';
-import {formatFileSize} from '@app/features/messaging/utils/FileUtils';
+import {CREATE_COMMUNITY_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
import * as NavigationCommands from '@app/features/navigation/commands/NavigationCommands';
-import {remFromPx} from '@app/features/theme/layout/RemFromPx';
import {Button} from '@app/features/ui/button/Button';
import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
-import {modal} from '@app/features/ui/commands/ModalCommands';
import {Form} from '@app/features/ui/components/form/Form';
-import {Input} from '@app/features/ui/components/form/FormInput';
-import Users from '@app/features/user/state/Users';
-import * as AvatarUtils from '@app/features/user/utils/AvatarUtils';
-import * as StringUtils from '@app/lib/strings';
-import {msg, ph} from '@lingui/core/macro';
+import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
-import {EnvelopeSimpleIcon} from '@phosphor-icons/react';
import {observer} from 'mobx-react-lite';
-import {useCallback, useContext, useEffect, useId, useMemo, useState} from 'react';
+import {useCallback, useContext, useEffect, useId} from 'react';
import {useForm} from 'react-hook-form';
const IMAGE_COULDN_T_BE_USED_DESCRIPTOR = msg({
@@ -70,82 +34,25 @@ const CHANGE_ICON_DESCRIPTOR = msg({
'Title of the modal where the user picks a create-community icon source. Keep it concise. Keep the tone plain and specific.',
});
+const ICON_FIELD_MESSAGES = {
+ imageCouldNotBeUsed: IMAGE_COULDN_T_BE_USED_DESCRIPTOR,
+ changeIcon: CHANGE_ICON_DESCRIPTOR,
+};
+
export const GuildCreateForm = observer(() => {
const {i18n} = useLingui();
- const guidelinesUrl = Routes.guidelines();
- const [previewIconUrl, setPreviewIconUrl] = useState<string | null>(null);
const form = useForm<GuildCreateFormInputs>({defaultValues: {name: ''}});
const modalFooterContext = useContext(ModalFooterContext);
const formId = useId();
- const currentUser = Users.currentUser;
- const shouldRequireClaimedAccount = currentUser != null && !currentUser.isClaimed();
const nameValue = form.watch('name');
- const initials = useMemo(() => {
- const raw = (nameValue || '').trim();
- if (!raw) return '';
- return getGuildIconDisplayInitials(StringUtils.getInitialsFromName(raw));
- }, [nameValue]);
- const initialsLength = initials ? getInitialsLength(initials) : null;
- const showIconUploadErrorModal = useCallback(
- (message: string) => {
- showGuildErrorModal({
- title: i18n._(IMAGE_COULDN_T_BE_USED_DESCRIPTOR),
- message,
- dataFlx: 'guild.add-guild-modal.guild-create-form.icon-upload-error-modal',
- });
- },
- [i18n],
- );
- const handleIconUpload = useCallback(async () => {
- try {
- const [file] = await openFilePicker({accept: getAcceptStringFiltered('guild_icon', false)});
- if (!file) return;
- if (file.size > 10 * 1024 * 1024) {
- showIconUploadErrorModal(
- i18n._(ICON_FILE_IS_TOO_LARGE_PLEASE_CHOOSE_A_DESCRIPTOR, {
- imageMaxSizeLabel: formatFileSize(i18n.locale, IMAGE_MAX_SIZE_BYTES),
- }),
- );
- return;
- }
- const svg = isSvgFile(file);
- const animated = svg ? false : await isAnimatedFile(file);
- if (animated) {
- showIconUploadErrorModal(i18n._(ANIMATED_ICONS_ARE_NOT_SUPPORTED_WHEN_CREATING_A_DESCRIPTOR));
- return;
- }
- const base64 = svg ? await readImageFileAsUploadDataUrl(file) : await AvatarUtils.fileToBase64(file);
- ModalCommands.push(
- modal(() => (
- <AssetCropModal
- assetType={AssetType.GUILD_ICON}
- imageUrl={base64}
- onCropComplete={(croppedBlob) => {
- const reader = new FileReader();
- reader.onload = () => {
- const croppedBase64 = reader.result as string;
- form.setValue('icon', croppedBase64);
- setPreviewIconUrl(croppedBase64);
- form.clearErrors('icon');
- };
- reader.onerror = () => {
- showIconUploadErrorModal(i18n._(FAILED_TO_PROCESS_CROPPED_IMAGE_DESCRIPTOR));
- };
- reader.readAsDataURL(croppedBlob);
- }}
- onSkip={() => {
- form.setValue('icon', base64);
- setPreviewIconUrl(base64);
- form.clearErrors('icon');
- }}
- data-flx="guild.add-guild-modal.handle-icon-upload.asset-crop-modal"
- />
- )),
- );
- } catch {
- showIconUploadErrorModal(i18n._(INVALID_IMAGE_TRY_ANOTHER_DESCRIPTOR));
- }
- }, [form, i18n, showIconUploadErrorModal]);
+ const iconField = useGuildCreateIconField({
+ form: form,
+ nameValue,
+ dataFlx: 'guild.add-guild-modal.guild-create-form',
+ cropModalDataFlx: 'guild.add-guild-modal.handle-icon-upload.asset-crop-modal',
+ clearIconErrors: true,
+ messages: ICON_FIELD_MESSAGES,
+ });
const onSubmit = useCallback(async (data: GuildCreateFormInputs) => {
try {
const guild = await GuildCommands.create({icon: data.icon, name: data.name});
@@ -179,83 +86,9 @@ export const GuildCreateForm = observer(() => {
);
return () => modalFooterContext?.setFooterContent(null);
}, [handleSubmit, isSubmitting, modalFooterContext, nameValue]);
- const handleClearIcon = useCallback(() => {
- form.setValue('icon', null);
- setPreviewIconUrl(null);
- }, [form]);
- const handleOpenIconUpload = useCallback(() => {
- openAssetSourceModal({
- title: i18n._(CHANGE_ICON_DESCRIPTOR),
- uploadHint: formatImageUploadRecommendedHint(i18n, {
- formats: STATIC_IMAGE_FORMATS,
- maxSize: formatFileSize(i18n.locale, IMAGE_MAX_SIZE_BYTES),
- recommendedSize: AVATAR_RECOMMENDED_SIZE_LABEL,
- }),
- onPickUpload: handleIconUpload,
- showGifOption: false,
- });
- }, [handleIconUpload, i18n]);
- if (shouldRequireClaimedAccount) {
- return (
- <div className={styles.formContainer} data-flx="guild.add-guild-modal.guild-create-form.form-container">
- <div
- className={styles.verificationNotice}
- data-flx="guild.add-guild-modal.guild-create-form.verification-notice"
- >
- <EnvelopeSimpleIcon
- size={remFromPx(32)}
- weight="fill"
- data-flx="guild.add-guild-modal.guild-create-form.envelope-simple-icon"
- />
- <p data-flx="guild.add-guild-modal.guild-create-form.p">
- <Trans>You need to claim your account before you can create a community.</Trans>
- </p>
- <Button
- onClick={() => openClaimAccountModal({force: true})}
- data-flx="guild.add-guild-modal.guild-create-form.button.open-claim-account-modal"
- >
- <Trans>Claim your account</Trans>
- </Button>
- </div>
- </div>
- );
- }
- if (currentUser?.verified === false) {
- return (
- <div className={styles.formContainer} data-flx="guild.add-guild-modal.guild-create-form.form-container--2">
- <div
- className={styles.verificationNotice}
- data-flx="guild.add-guild-modal.guild-create-form.verification-notice--2"
- >
- <EnvelopeSimpleIcon
- size={remFromPx(32)}
- weight="fill"
- data-flx="guild.add-guild-modal.guild-create-form.envelope-simple-icon--2"
- />
- <p data-flx="guild.add-guild-modal.guild-create-form.p--2">
- <Trans>You need to verify your email address before you can create a community.</Trans>
- </p>
- <Button
- onClick={() =>
- ModalCommands.push(
- modal(
- () => (
- <UserSettingsModal
- initialTab="account_security"
- data-flx="guild.add-guild-modal.guild-create-form.user-settings-modal"
- />
- ),
- 'user-settings',
- ),
- )
- }
- data-flx="guild.add-guild-modal.guild-create-form.button.push"
- >
- {i18n._(VERIFY_EMAIL_DESCRIPTOR)}
- </Button>
- </div>
- </div>
- );
+ const accountGate = renderGuildCreateAccountGate(i18n, 'guild.add-guild-modal.guild-create-form');
+ if (accountGate) {
+ return accountGate;
}
return (
<div className={styles.formContainer} data-flx="guild.add-guild-modal.guild-create-form.form-container--3">
@@ -269,95 +102,15 @@ export const GuildCreateForm = observer(() => {
aria-label={i18n._(CREATE_COMMUNITY_FORM_DESCRIPTOR)}
data-flx="guild.add-guild-modal.guild-create-form.form.submit"
>
- <div className={styles.iconSection} data-flx="guild.add-guild-modal.guild-create-form.icon-section">
- <div
- className={styles.iconSectionInner}
- data-flx="guild.add-guild-modal.guild-create-form.icon-section-inner"
- >
- <div className={styles.iconLabel} data-flx="guild.add-guild-modal.guild-create-form.icon-label">
- <Trans>Community icon</Trans>
- </div>
- <div className={styles.iconPreview} data-flx="guild.add-guild-modal.guild-create-form.icon-preview">
- {previewIconUrl ? (
- <div
- className={styles.iconImage}
- style={{backgroundImage: `url(${previewIconUrl})`}}
- data-flx="guild.add-guild-modal.guild-create-form.icon-image"
- />
- ) : (
- <div
- className={styles.iconPlaceholder}
- data-initials-length={initialsLength}
- data-flx="guild.add-guild-modal.guild-create-form.icon-placeholder"
- >
- {initials ? (
- <span
- className={styles.iconInitials}
- style={getGuildInitialsFitStyle(initials)}
- data-flx="guild.add-guild-modal.guild-create-form.icon-initials"
- >
- {initials}
- </span>
- ) : null}
- </div>
- )}
- <div className={styles.iconActions} data-flx="guild.add-guild-modal.guild-create-form.icon-actions">
- <div className={styles.iconButtons} data-flx="guild.add-guild-modal.guild-create-form.icon-buttons">
- <Button
- variant="secondary"
- small={true}
- onClick={handleOpenIconUpload}
- data-flx="guild.add-guild-modal.guild-create-form.button.icon-upload"
- >
- {previewIconUrl ? <Trans>Change icon</Trans> : <Trans>Upload icon</Trans>}
- </Button>
- {previewIconUrl && (
- <Button
- variant="secondary"
- small={true}
- onClick={handleClearIcon}
- data-flx="guild.add-guild-modal.guild-create-form.button.clear-icon"
- >
- <Trans>Remove icon</Trans>
- </Button>
- )}
- </div>
- </div>
- </div>
- {form.formState.errors.icon?.message && (
- <p className={styles.iconError} data-flx="guild.add-guild-modal.guild-create-form.icon-error">
- {form.formState.errors.icon.message}
- </p>
- )}
- </div>
- <Input
- data-flx="guild.add-guild-modal.guild-create-form.input.text"
- {...form.register('name')}
- autoFocus={true}
- error={form.formState.errors.name?.message}
- label={i18n._(COMMUNITY_NAME_DESCRIPTOR)}
- minLength={1}
- maxLength={100}
- name="name"
- required={true}
- type="text"
- />
- {guidelinesUrl && (
- <p className={styles.guidelines} data-flx="guild.add-guild-modal.guild-create-form.guidelines">
- <Trans>
- By creating a community, you agree to follow and uphold the{' '}
- <ExternalLink
- href={guidelinesUrl}
- className={styles.guidelinesLink}
- data-flx="guild.add-guild-modal.guild-create-form.guidelines-link"
- >
- {ph({PRODUCT_NAME: RuntimeConfig.productName})} community guidelines
- </ExternalLink>
- .
- </Trans>
- </p>
- )}
- </div>
+ {renderGuildCreateFields({
+ ...iconField,
+ i18n,
+ form: form,
+ dataFlx: 'guild.add-guild-modal.guild-create-form',
+ iconSectionDataFlx: 'guild.add-guild-modal.guild-create-form.icon-section',
+ nameInputDataFlx: 'guild.add-guild-modal.guild-create-form.input.text',
+ showIconError: true,
+ })}
</Form>
</div>
);
diff --git a/fluxer_app/src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx b/fluxer_app/src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
new file mode 100644
index 000000000..cfe37ba86
--- /dev/null
+++ b/fluxer_app/src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
@@ -0,0 +1,322 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {Routes} from '@app/app/Routes';
+import {UserSettingsModal} from '@app/features/app/components/dialogs/LoadableSettingsModals';
+import {ExternalLink} from '@app/features/app/components/shared/ExternalLink';
+import {
+ AVATAR_RECOMMENDED_SIZE_LABEL,
+ IMAGE_MAX_SIZE_BYTES,
+ STATIC_IMAGE_FORMATS,
+} from '@app/features/app/config/I18nDisplayConstants';
+import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
+import {openClaimAccountModal} from '@app/features/auth/components/modals/ClaimAccountModal';
+import {AssetCropModal, AssetType} from '@app/features/expressions/components/modals/AssetCropModal';
+import {openAssetSourceModal} from '@app/features/expressions/components/modals/AssetSourceModal';
+import {isAnimatedFile} from '@app/features/expressions/utils/AnimatedImageUtils';
+import {getAcceptStringFiltered} from '@app/features/expressions/utils/AssetFormatCopy';
+import {formatImageUploadRecommendedHint} from '@app/features/expressions/utils/AssetUploadHintCopy';
+import {isSvgFile, readImageFileAsUploadDataUrl} from '@app/features/expressions/utils/ImageUploadFileUtils';
+import {showGuildErrorModal} from '@app/features/guild/components/alerts/GuildErrorModalUtils';
+import styles from '@app/features/guild/components/modals/AddGuildModal.module.css';
+import {
+ ANIMATED_ICONS_ARE_NOT_SUPPORTED_WHEN_CREATING_A_DESCRIPTOR,
+ COMMUNITY_NAME_DESCRIPTOR,
+ ICON_FILE_IS_TOO_LARGE_PLEASE_CHOOSE_A_DESCRIPTOR,
+} from '@app/features/guild/components/modals/add_guild_modal/shared';
+import {
+ getGuildIconDisplayInitials,
+ getGuildInitialsFitStyle,
+ getInitialsLength,
+} from '@app/features/guild/utils/GuildInitialsUtils';
+import {
+ FAILED_TO_PROCESS_CROPPED_IMAGE_DESCRIPTOR,
+ INVALID_IMAGE_TRY_ANOTHER_DESCRIPTOR,
+ VERIFY_EMAIL_DESCRIPTOR,
+} from '@app/features/i18n/utils/CommonMessageDescriptors';
+import {openFilePicker} from '@app/features/messaging/utils/FilePickerUtils';
+import {formatFileSize} from '@app/features/messaging/utils/FileUtils';
+import {remFromPx} from '@app/features/theme/layout/RemFromPx';
+import {Button} from '@app/features/ui/button/Button';
+import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
+import {modal} from '@app/features/ui/commands/ModalCommands';
+import {Input} from '@app/features/ui/components/form/FormInput';
+import Users from '@app/features/user/state/Users';
+import * as AvatarUtils from '@app/features/user/utils/AvatarUtils';
+import * as StringUtils from '@app/lib/strings';
+import type {I18n, MessageDescriptor} from '@lingui/core';
+import {ph} from '@lingui/core/macro';
+import {Trans, useLingui} from '@lingui/react/macro';
+import {EnvelopeSimpleIcon} from '@phosphor-icons/react';
+import type React from 'react';
+import {useCallback, useMemo, useState} from 'react';
+import type {UseFormReturn} from 'react-hook-form';
+
+interface GuildCreateFormValues {
+ icon?: string | null;
+ name: string;
+}
+
+interface GuildCreateIconFieldOptions {
+ form: UseFormReturn<GuildCreateFormValues>;
+ nameValue: string;
+ dataFlx: string;
+ cropModalDataFlx: string;
+ clearIconErrors: boolean;
+ messages: {imageCouldNotBeUsed: MessageDescriptor; changeIcon: MessageDescriptor};
+}
+
+export function useGuildCreateIconField({
+ form,
+ nameValue,
+ dataFlx,
+ cropModalDataFlx,
+ clearIconErrors,
+ messages,
+}: GuildCreateIconFieldOptions) {
+ const {i18n} = useLingui();
+ const [previewIconUrl, setPreviewIconUrl] = useState<string | null>(null);
+ const initials = useMemo(() => {
+ const raw = (nameValue || '').trim();
+ if (!raw) return '';
+ return getGuildIconDisplayInitials(StringUtils.getInitialsFromName(raw));
+ }, [nameValue]);
+ const initialsLength = initials ? getInitialsLength(initials) : null;
+ const showIconUploadErrorModal = useCallback(
+ (message: string) => {
+ showGuildErrorModal({
+ title: i18n._(messages.imageCouldNotBeUsed),
+ message,
+ dataFlx: `${dataFlx}.icon-upload-error-modal`,
+ });
+ },
+ [dataFlx, i18n, messages],
+ );
+ const handleIconUpload = useCallback(async () => {
+ try {
+ const [file] = await openFilePicker({accept: getAcceptStringFiltered('guild_icon', false)});
+ if (!file) return;
+ if (file.size > 10 * 1024 * 1024) {
+ showIconUploadErrorModal(
+ i18n._(ICON_FILE_IS_TOO_LARGE_PLEASE_CHOOSE_A_DESCRIPTOR, {
+ imageMaxSizeLabel: formatFileSize(i18n.locale, IMAGE_MAX_SIZE_BYTES),
+ }),
+ );
+ return;
+ }
+ const svg = isSvgFile(file);
+ const animated = svg ? false : await isAnimatedFile(file);
+ if (animated) {
+ showIconUploadErrorModal(i18n._(ANIMATED_ICONS_ARE_NOT_SUPPORTED_WHEN_CREATING_A_DESCRIPTOR));
+ return;
+ }
+ const base64 = svg ? await readImageFileAsUploadDataUrl(file) : await AvatarUtils.fileToBase64(file);
+ ModalCommands.push(
+ modal(() => (
+ <AssetCropModal
+ assetType={AssetType.GUILD_ICON}
+ imageUrl={base64}
+ onCropComplete={(croppedBlob) => {
+ const reader = new FileReader();
+ reader.onload = () => {
+ const croppedBase64 = reader.result as string;
+ form.setValue('icon', croppedBase64);
+ setPreviewIconUrl(croppedBase64);
+ if (clearIconErrors) form.clearErrors('icon');
+ };
+ reader.onerror = () => {
+ showIconUploadErrorModal(i18n._(FAILED_TO_PROCESS_CROPPED_IMAGE_DESCRIPTOR));
+ };
+ reader.readAsDataURL(croppedBlob);
+ }}
+ onSkip={() => {
+ form.setValue('icon', base64);
+ setPreviewIconUrl(base64);
+ if (clearIconErrors) form.clearErrors('icon');
+ }}
+ data-flx={cropModalDataFlx}
+ />
+ )),
+ );
+ } catch {
+ showIconUploadErrorModal(i18n._(INVALID_IMAGE_TRY_ANOTHER_DESCRIPTOR));
+ }
+ }, [clearIconErrors, cropModalDataFlx, form, i18n, showIconUploadErrorModal]);
+ const handleClearIcon = useCallback(() => {
+ form.setValue('icon', null);
+ setPreviewIconUrl(null);
+ }, [form]);
+ const handleOpenIconUpload = useCallback(() => {
+ openAssetSourceModal({
+ title: i18n._(messages.changeIcon),
+ uploadHint: formatImageUploadRecommendedHint(i18n, {
+ formats: STATIC_IMAGE_FORMATS,
+ maxSize: formatFileSize(i18n.locale, IMAGE_MAX_SIZE_BYTES),
+ recommendedSize: AVATAR_RECOMMENDED_SIZE_LABEL,
+ }),
+ onPickUpload: handleIconUpload,
+ showGifOption: false,
+ });
+ }, [handleIconUpload, i18n, messages]);
+ return {previewIconUrl, initials, initialsLength, handleOpenIconUpload, handleClearIcon};
+}
+
+export function renderGuildCreateAccountGate(i18n: I18n, dataFlx: string): React.ReactNode {
+ const currentUser = Users.currentUser;
+ if (currentUser != null && !currentUser.isClaimed()) {
+ return (
+ <div className={styles.formContainer} data-flx={`${dataFlx}.form-container`}>
+ <div className={styles.verificationNotice} data-flx={`${dataFlx}.verification-notice`}>
+ <EnvelopeSimpleIcon size={remFromPx(32)} weight="fill" data-flx={`${dataFlx}.envelope-simple-icon`} />
+ <p data-flx={`${dataFlx}.p`}>
+ <Trans>You need to claim your account before you can create a community.</Trans>
+ </p>
+ <Button
+ onClick={() => openClaimAccountModal({force: true})}
+ data-flx={`${dataFlx}.button.open-claim-account-modal`}
+ >
+ <Trans>Claim your account</Trans>
+ </Button>
+ </div>
+ </div>
+ );
+ }
+ if (currentUser?.verified === false) {
+ return (
+ <div className={styles.formContainer} data-flx={`${dataFlx}.form-container--2`}>
+ <div className={styles.verificationNotice} data-flx={`${dataFlx}.verification-notice--2`}>
+ <EnvelopeSimpleIcon size={remFromPx(32)} weight="fill" data-flx={`${dataFlx}.envelope-simple-icon--2`} />
+ <p data-flx={`${dataFlx}.p--2`}>
+ <Trans>You need to verify your email address before you can create a community.</Trans>
+ </p>
+ <Button
+ onClick={() =>
+ ModalCommands.push(
+ modal(
+ () => <UserSettingsModal initialTab="account_security" data-flx={`${dataFlx}.user-settings-modal`} />,
+ 'user-settings',
+ ),
+ )
+ }
+ data-flx={`${dataFlx}.button.push`}
+ >
+ {i18n._(VERIFY_EMAIL_DESCRIPTOR)}
+ </Button>
+ </div>
+ </div>
+ );
+ }
+ return null;
+}
+
+interface GuildCreateFieldsOptions extends ReturnType<typeof useGuildCreateIconField> {
+ i18n: I18n;
+ form: UseFormReturn<GuildCreateFormValues>;
+ dataFlx: string;
+ iconSectionDataFlx: string;
+ nameInputDataFlx: string;
+ showIconError: boolean;
+}
+
+export function renderGuildCreateFields({
+ i18n,
+ form,
+ dataFlx,
+ iconSectionDataFlx,
+ nameInputDataFlx,
+ showIconError,
+ previewIconUrl,
+ initials,
+ initialsLength,
+ handleOpenIconUpload,
+ handleClearIcon,
+}: GuildCreateFieldsOptions): React.ReactNode {
+ const guidelinesUrl = Routes.guidelines();
+ return (
+ <div className={styles.iconSection} data-flx={iconSectionDataFlx}>
+ <div className={styles.iconSectionInner} data-flx={`${dataFlx}.icon-section-inner`}>
+ <div className={styles.iconLabel} data-flx={`${dataFlx}.icon-label`}>
+ <Trans>Community icon</Trans>
+ </div>
+ <div className={styles.iconPreview} data-flx={`${dataFlx}.icon-preview`}>
+ {previewIconUrl ? (
+ <div
+ className={styles.iconImage}
+ style={{backgroundImage: `url(${previewIconUrl})`}}
+ data-flx={`${dataFlx}.icon-image`}
+ />
+ ) : (
+ <div
+ className={styles.iconPlaceholder}
+ data-initials-length={initialsLength}
+ data-flx={`${dataFlx}.icon-placeholder`}
+ >
+ {initials ? (
+ <span
+ className={styles.iconInitials}
+ style={getGuildInitialsFitStyle(initials)}
+ data-flx={`${dataFlx}.icon-initials`}
+ >
+ {initials}
+ </span>
+ ) : null}
+ </div>
+ )}
+ <div className={styles.iconActions} data-flx={`${dataFlx}.icon-actions`}>
+ <div className={styles.iconButtons} data-flx={`${dataFlx}.icon-buttons`}>
+ <Button
+ variant="secondary"
+ small={true}
+ onClick={handleOpenIconUpload}
+ data-flx={`${dataFlx}.button.icon-upload`}
+ >
+ {previewIconUrl ? <Trans>Change icon</Trans> : <Trans>Upload icon</Trans>}
+ </Button>
+ {previewIconUrl && (
+ <Button
+ variant="secondary"
+ small={true}
+ onClick={handleClearIcon}
+ data-flx={`${dataFlx}.button.clear-icon`}
+ >
+ <Trans>Remove icon</Trans>
+ </Button>
+ )}
+ </div>
+ </div>
+ </div>
+ {showIconError && form.formState.errors.icon?.message && (
+ <p className={styles.iconError} data-flx={`${dataFlx}.icon-error`}>
+ {form.formState.errors.icon.message}
+ </p>
+ )}
+ </div>
+ <Input
+ data-flx={nameInputDataFlx}
+ {...form.register('name')}
+ autoFocus={true}
+ error={form.formState.errors.name?.message}
+ label={i18n._(COMMUNITY_NAME_DESCRIPTOR)}
+ minLength={1}
+ maxLength={100}
+ name="name"
+ required={true}
+ type="text"
+ />
+ {guidelinesUrl && (
+ <p className={styles.guidelines} data-flx={`${dataFlx}.guidelines`}>
+ <Trans>
+ By creating a community, you agree to follow and uphold the{' '}
+ <ExternalLink
+ href={guidelinesUrl}
+ className={styles.guidelinesLink}
+ data-flx={`${dataFlx}.guidelines-link`}
+ >
+ {ph({PRODUCT_NAME: RuntimeConfig.productName})} community guidelines
+ </ExternalLink>
+ .
+ </Trans>
+ </p>
+ )}
+ </div>
+ );
+}
diff --git a/fluxer_app/src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx b/fluxer_app/src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
index f454d38c7..0efb4437d 100644
--- a/fluxer_app/src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+++ b/fluxer_app/src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
@@ -1,33 +1,18 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import {Routes} from '@app/app/Routes';
-import {UserSettingsModal} from '@app/features/app/components/dialogs/LoadableSettingsModals';
import * as Modal from '@app/features/app/components/dialogs/Modal';
-import {ExternalLink} from '@app/features/app/components/shared/ExternalLink';
-import {
- AVATAR_RECOMMENDED_SIZE_LABEL,
- IMAGE_MAX_SIZE_BYTES,
- STATIC_IMAGE_FORMATS,
- THE_OTHER_PLATFORM_TEMPLATE_EXAMPLE_URL,
-} from '@app/features/app/config/I18nDisplayConstants';
+import {THE_OTHER_PLATFORM_TEMPLATE_EXAMPLE_URL} from '@app/features/app/config/I18nDisplayConstants';
import {useFormSubmit} from '@app/features/app/hooks/useFormSubmit';
-import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
-import {openClaimAccountModal} from '@app/features/auth/components/modals/ClaimAccountModal';
-import {AssetCropModal, AssetType} from '@app/features/expressions/components/modals/AssetCropModal';
-import {openAssetSourceModal} from '@app/features/expressions/components/modals/AssetSourceModal';
-import {isAnimatedFile} from '@app/features/expressions/utils/AnimatedImageUtils';
-import {getAcceptStringFiltered} from '@app/features/expressions/utils/AssetFormatCopy';
-import {formatImageUploadRecommendedHint} from '@app/features/expressions/utils/AssetUploadHintCopy';
-import {isSvgFile, readImageFileAsUploadDataUrl} from '@app/features/expressions/utils/ImageUploadFileUtils';
import * as GuildCommands from '@app/features/guild/commands/GuildCommands';
-import {showGuildErrorModal} from '@app/features/guild/components/alerts/GuildErrorModalUtils';
import styles from '@app/features/guild/components/modals/AddGuildModal.module.css';
import {
- ANIMATED_ICONS_ARE_NOT_SUPPORTED_WHEN_CREATING_A_DESCRIPTOR,
- COMMUNITY_NAME_DESCRIPTOR,
+ renderGuildCreateAccountGate,
+ renderGuildCreateFields,
+ useGuildCreateIconField,
+} from '@app/features/guild/components/modals/add_guild_modal/GuildCreateShared';
+import {
CREATE_FROM_TEMPLATE_FORM_DESCRIPTOR,
handleGuildCreationError,
- ICON_FILE_IS_TOO_LARGE_PLEASE_CHOOSE_A_DESCRIPTOR,
IMPORT_TEMPLATE_FORM_DESCRIPTOR,
INVALID_JSON_PLEASE_PASTE_THE_FULL_RESPONSE_FROM_DESCRIPTOR,
isTemplateEveryoneRole,
@@ -44,38 +29,21 @@ import {
type TemplateJsonFormInputs,
THIS_DOESN_T_LOOK_LIKE_A_VALID_TEMPLATE_DESCRIPTOR,
} from '@app/features/guild/components/modals/add_guild_modal/shared';
-import {
- getGuildIconDisplayInitials,
- getGuildInitialsFitStyle,
- getInitialsLength,
-} from '@app/features/guild/utils/GuildInitialsUtils';
-import {
- CREATE_COMMUNITY_DESCRIPTOR,
- FAILED_TO_PROCESS_CROPPED_IMAGE_DESCRIPTOR,
- INVALID_IMAGE_TRY_ANOTHER_DESCRIPTOR,
- NEXT_DESCRIPTOR,
- VERIFY_EMAIL_DESCRIPTOR,
-} from '@app/features/i18n/utils/CommonMessageDescriptors';
+import {CREATE_COMMUNITY_DESCRIPTOR, NEXT_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
import {openExternalUrlWithWarning} from '@app/features/messaging/utils/ExternalLinkUtils';
-import {openFilePicker} from '@app/features/messaging/utils/FilePickerUtils';
-import {formatFileSize} from '@app/features/messaging/utils/FileUtils';
import * as NavigationCommands from '@app/features/navigation/commands/NavigationCommands';
import {remFromPx} from '@app/features/theme/layout/RemFromPx';
import {Button} from '@app/features/ui/button/Button';
import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
-import {modal} from '@app/features/ui/commands/ModalCommands';
import {Form} from '@app/features/ui/components/form/Form';
import {Input, Textarea} from '@app/features/ui/components/form/FormInput';
import {SteppedCarousel} from '@app/features/ui/stepped_carousel/SteppedCarousel';
-import Users from '@app/features/user/state/Users';
-import * as AvatarUtils from '@app/features/user/utils/AvatarUtils';
-import * as StringUtils from '@app/lib/strings';
import {ChannelTypes} from '@fluxer/constants/src/ChannelConstants';
import {THE_OTHER_PLATFORM} from '@fluxer/constants/src/ExternalPlatformConstants';
import type {TemplateSerializedGuild} from '@fluxer/schema/src/domains/guild/GuildTemplateSchemas';
-import {msg, ph} from '@lingui/core/macro';
+import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
-import {ArrowSquareOutIcon, EnvelopeSimpleIcon} from '@phosphor-icons/react';
+import {ArrowSquareOutIcon} from '@phosphor-icons/react';
import {observer} from 'mobx-react-lite';
import type React from 'react';
import {useCallback, useContext, useEffect, useId, useMemo, useState} from 'react';
@@ -160,9 +128,12 @@ const IMAGE_COULDN_T_BE_USED_DESCRIPTOR = msg({
message: "Image couldn't be used",
comment: 'Error modal title shown when a template-import community icon upload cannot be accepted or processed.',
});
+const ICON_FIELD_MESSAGES = {
+ imageCouldNotBeUsed: IMAGE_COULDN_T_BE_USED_DESCRIPTOR,
+ changeIcon: CHANGE_ICON_DESCRIPTOR,
+};
export const TemplateImportForm = observer(() => {
const {i18n} = useLingui();
- const guidelinesUrl = Routes.guidelines();
const theOtherPlatform = THE_OTHER_PLATFORM;
const [step, setStep] = useState<TemplateImportStep>('url');
const [apiUrl, setApiUrl] = useState<string | null>(null);
@@ -171,13 +142,10 @@ export const TemplateImportForm = observer(() => {
const urlForm = useForm<TemplateImportFormInputs>({defaultValues: {url: ''}});
const jsonForm = useForm<TemplateJsonFormInputs>({defaultValues: {json: ''}});
const createForm = useForm<TemplateCreateFormInputs>({defaultValues: {name: ''}});
- const [previewIconUrl, setPreviewIconUrl] = useState<string | null>(null);
const modalFooterContext = useContext(ModalFooterContext);
const urlFormId = useId();
const jsonFormId = useId();
const createFormId = useId();
- const currentUser = Users.currentUser;
- const shouldRequireClaimedAccount = currentUser != null && !currentUser.isClaimed();
const handleResolveUrl = useCallback(
(data: TemplateImportFormInputs) => {
const code = parseTemplateCode(data.url);
@@ -250,22 +218,14 @@ export const TemplateImportForm = observer(() => {
const nameValue = createForm.watch('name');
const urlValue = urlForm.watch('url');
const jsonValue = jsonForm.watch('json');
- const initials = useMemo(() => {
- const raw = (nameValue || '').trim();
- if (!raw) return '';
- return getGuildIconDisplayInitials(StringUtils.getInitialsFromName(raw));
- }, [nameValue]);
- const initialsLength = initials ? getInitialsLength(initials) : null;
- const showIconUploadErrorModal = useCallback(
- (message: string) => {
- showGuildErrorModal({
- title: i18n._(IMAGE_COULDN_T_BE_USED_DESCRIPTOR),
- message,
- dataFlx: 'guild.add-guild-modal.template-import-form.icon-upload-error-modal',
- });
- },
- [i18n],
- );
+ const iconField = useGuildCreateIconField({
+ form: createForm,
+ nameValue,
+ dataFlx: 'guild.add-guild-modal.template-import-form',
+ cropModalDataFlx: 'guild.add-guild-modal.handle-icon-upload.asset-crop-modal--2',
+ clearIconErrors: false,
+ messages: ICON_FIELD_MESSAGES,
+ });
const templateStats = useMemo(() => {
if (!templateData) return null;
const channelTypes = templateData.channels
@@ -279,70 +239,6 @@ export const TemplateImportForm = observer(() => {
const roles = templateData.roles.filter((role) => !isTemplateEveryoneRole(role)).length;
return {textChannels, voiceChannels, categories, roles};
}, [templateData]);
- const handleIconUpload = useCallback(async () => {
- try {
- const [file] = await openFilePicker({accept: getAcceptStringFiltered('guild_icon', false)});
- if (!file) return;
- if (file.size > 10 * 1024 * 1024) {
- showIconUploadErrorModal(
- i18n._(ICON_FILE_IS_TOO_LARGE_PLEASE_CHOOSE_A_DESCRIPTOR, {
- imageMaxSizeLabel: formatFileSize(i18n.locale, IMAGE_MAX_SIZE_BYTES),
- }),
- );
- return;
- }
- const svg = isSvgFile(file);
- const animated = svg ? false : await isAnimatedFile(file);
- if (animated) {
- showIconUploadErrorModal(i18n._(ANIMATED_ICONS_ARE_NOT_SUPPORTED_WHEN_CREATING_A_DESCRIPTOR));
- return;
- }
- const base64 = svg ? await readImageFileAsUploadDataUrl(file) : await AvatarUtils.fileToBase64(file);
- ModalCommands.push(
- modal(() => (
- <AssetCropModal
- assetType={AssetType.GUILD_ICON}
- imageUrl={base64}
- onCropComplete={(croppedBlob) => {
- const reader = new FileReader();
- reader.onload = () => {
- const croppedBase64 = reader.result as string;
- createForm.setValue('icon', croppedBase64);
- setPreviewIconUrl(croppedBase64);
- };
- reader.onerror = () => {
- showIconUploadErrorModal(i18n._(FAILED_TO_PROCESS_CROPPED_IMAGE_DESCRIPTOR));
- };
- reader.readAsDataURL(croppedBlob);
- }}
- onSkip={() => {
- createForm.setValue('icon', base64);
- setPreviewIconUrl(base64);
- }}
- data-flx="guild.add-guild-modal.handle-icon-upload.asset-crop-modal--2"
- />
- )),
- );
- } catch {
- showIconUploadErrorModal(i18n._(INVALID_IMAGE_TRY_ANOTHER_DESCRIPTOR));
- }
- }, [createForm, i18n, showIconUploadErrorModal]);
- const handleClearIcon = useCallback(() => {
- createForm.setValue('icon', null);
- setPreviewIconUrl(null);
- }, [createForm]);
- const handleOpenIconUpload = useCallback(() => {
- openAssetSourceModal({
- title: i18n._(CHANGE_ICON_DESCRIPTOR),
- uploadHint: formatImageUploadRecommendedHint(i18n, {
- formats: STATIC_IMAGE_FORMATS,
- maxSize: formatFileSize(i18n.locale, IMAGE_MAX_SIZE_BYTES),
- recommendedSize: AVATAR_RECOMMENDED_SIZE_LABEL,
- }),
- onPickUpload: handleIconUpload,
- showGifOption: false,
- });
- }, [handleIconUpload, i18n]);
const handleOpenApiUrl = useCallback(() => {
if (apiUrl) {
openExternalUrlWithWarning(apiUrl);
@@ -423,67 +319,9 @@ export const TemplateImportForm = observer(() => {
urlValue,
jsonValue,
]);
- if (shouldRequireClaimedAccount) {
- return (
- <div className={styles.formContainer} data-flx="guild.add-guild-modal.template-import-form.form-container">
- <div
- className={styles.verificationNotice}
- data-flx="guild.add-guild-modal.template-import-form.verification-notice"
- >
- <EnvelopeSimpleIcon
- size={remFromPx(32)}
- weight="fill"
- data-flx="guild.add-guild-modal.template-import-form.envelope-simple-icon"
- />
- <p data-flx="guild.add-guild-modal.template-import-form.p">
- <Trans>You need to claim your account before you can create a community.</Trans>
- </p>
- <Button
- onClick={() => openClaimAccountModal({force: true})}
- data-flx="guild.add-guild-modal.template-import-form.button.open-claim-account-modal"
- >
- <Trans>Claim your account</Trans>
- </Button>
- </div>
- </div>
- );
- }
- if (currentUser?.verified === false) {
- return (
- <div className={styles.formContainer} data-flx="guild.add-guild-modal.template-import-form.form-container--2">
- <div
- className={styles.verificationNotice}
- data-flx="guild.add-guild-modal.template-import-form.verification-notice--2"
- >
- <EnvelopeSimpleIcon
- size={remFromPx(32)}
- weight="fill"
- data-flx="guild.add-guild-modal.template-import-form.envelope-simple-icon--2"
- />
- <p data-flx="guild.add-guild-modal.template-import-form.p--2">
- <Trans>You need to verify your email address before you can create a community.</Trans>
- </p>
- <Button
- onClick={() =>
- ModalCommands.push(
- modal(
- () => (
- <UserSettingsModal
- initialTab="account_security"
- data-flx="guild.add-guild-modal.template-import-form.user-settings-modal"
- />
- ),
- 'user-settings',
- ),
- )
- }
- data-flx="guild.add-guild-modal.template-import-form.button.push"
- >
- {i18n._(VERIFY_EMAIL_DESCRIPTOR)}
- </Button>
- </div>
- </div>
- );
+ const accountGate = renderGuildCreateAccountGate(i18n, 'guild.add-guild-modal.template-import-form');
+ if (accountGate) {
+ return accountGate;
}
const renderUrlStep = (): React.ReactNode => (
<div className={styles.formContainer} data-flx="guild.add-guild-modal.template-import-form.form-container--3">
@@ -592,90 +430,15 @@ export const TemplateImportForm = observer(() => {
aria-label={i18n._(CREATE_FROM_TEMPLATE_FORM_DESCRIPTOR)}
data-flx="guild.add-guild-modal.template-import-form.form.create-submit"
>
- <div className={styles.iconSection} data-flx="guild.add-guild-modal.template-import-form.icon-section--3">
- <div
- className={styles.iconSectionInner}
- data-flx="guild.add-guild-modal.template-import-form.icon-section-inner"
- >
- <div className={styles.iconLabel} data-flx="guild.add-guild-modal.template-import-form.icon-label">
- <Trans>Community icon</Trans>
- </div>
- <div className={styles.iconPreview} data-flx="guild.add-guild-modal.template-import-form.icon-preview">
- {previewIconUrl ? (
- <div
- className={styles.iconImage}
- style={{backgroundImage: `url(${previewIconUrl})`}}
- data-flx="guild.add-guild-modal.template-import-form.icon-image"
- />
- ) : (
- <div
- className={styles.iconPlaceholder}
- data-initials-length={initialsLength}
- data-flx="guild.add-guild-modal.template-import-form.icon-placeholder"
- >
- {initials ? (
- <span
- className={styles.iconInitials}
- style={getGuildInitialsFitStyle(initials)}
- data-flx="guild.add-guild-modal.template-import-form.icon-initials"
- >
- {initials}
- </span>
- ) : null}
- </div>
- )}
- <div className={styles.iconActions} data-flx="guild.add-guild-modal.template-import-form.icon-actions">
- <div className={styles.iconButtons} data-flx="guild.add-guild-modal.template-import-form.icon-buttons">
- <Button
- variant="secondary"
- small={true}
- onClick={handleOpenIconUpload}
- data-flx="guild.add-guild-modal.template-import-form.button.icon-upload"
- >
- {previewIconUrl ? <Trans>Change icon</Trans> : <Trans>Upload icon</Trans>}
- </Button>
- {previewIconUrl && (
- <Button
- variant="secondary"
- small={true}
- onClick={handleClearIcon}
- data-flx="guild.add-guild-modal.template-import-form.button.clear-icon"
- >
- <Trans>Remove icon</Trans>
- </Button>
- )}
- </div>
- </div>
- </div>
- </div>
- <Input
- data-flx="guild.add-guild-modal.template-import-form.input.text--2"
- {...createForm.register('name')}
- autoFocus={true}
- error={createForm.formState.errors.name?.message}
- label={i18n._(COMMUNITY_NAME_DESCRIPTOR)}
- minLength={1}
- maxLength={100}
- name="name"
- required={true}
- type="text"
- />
- {guidelinesUrl && (
- <p className={styles.guidelines} data-flx="guild.add-guild-modal.template-import-form.guidelines">
- <Trans>
- By creating a community, you agree to follow and uphold the{' '}
- <ExternalLink
- href={guidelinesUrl}
- className={styles.guidelinesLink}
- data-flx="guild.add-guild-modal.template-import-form.guidelines-link"
- >
- {ph({PRODUCT_NAME: RuntimeConfig.productName})} community guidelines
- </ExternalLink>
- .
- </Trans>
- </p>
- )}
- </div>
+ {renderGuildCreateFields({
+ ...iconField,
+ i18n,
+ form: createForm,
+ dataFlx: 'guild.add-guild-modal.template-import-form',
+ iconSectionDataFlx: 'guild.add-guild-modal.template-import-form.icon-section--3',
+ nameInputDataFlx: 'guild.add-guild-modal.template-import-form.input.text--2',
+ showIconError: false,
+ })}
</Form>
</div>
);
diff --git a/fluxer_app/src/features/guild/components/modals/guild_tabs/GuildAuditLogSentence.tsx b/fluxer_app/src/features/guild/components/modals/guild_tabs/GuildAuditLogSentence.tsx
index 2bd931a9a..59375719a 100644
--- a/fluxer_app/src/features/guild/components/modals/guild_tabs/GuildAuditLogSentence.tsx
+++ b/fluxer_app/src/features/guild/components/modals/guild_tabs/GuildAuditLogSentence.tsx
@@ -29,7 +29,7 @@ import {
MINUTES_DURATION_PLURAL_DESCRIPTOR,
SECONDS_DURATION_PLURAL_DESCRIPTOR,
} from '@app/features/i18n/utils/CommonMessageDescriptors';
-import {getCachedNumberFormat} from '@app/features/i18n/utils/IntlCache';
+import {formatList, getCachedNumberFormat} from '@app/features/i18n/utils/IntlCache';
import {formatPermissionLabel} from '@app/features/permissions/utils/PermissionUtils';
import Users from '@app/features/user/state/Users';
import {getEmojiURL} from '@app/features/user/utils/AvatarUtils';
@@ -38,7 +38,6 @@ import {ChannelTypes} from '@fluxer/constants/src/ChannelConstants';
import type {I18n} from '@lingui/core';
import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react';
-import {formatListWithConfig} from '@pkgs/list_utils/src/ListFormatting';
import {observer} from 'mobx-react-lite';
import type React from 'react';
@@ -83,7 +82,7 @@ function formatPermissions(i18n: I18n, flags: ReadonlyArray<bigint>): string {
if (shownFlags.length < flags.length) {
items.push(i18n._(MORE_PERMISSIONS_DESCRIPTOR, {count: flags.length - shownFlags.length}));
}
- return formatListWithConfig(items, {locale: i18n.locale, style: 'long', type: 'conjunction'});
+ return formatList(items, {locale: i18n.locale, style: 'long', type: 'conjunction'});
}
function formatColor(value: number): string {
diff --git a/fluxer_app/src/features/i18n/locales/ar/messages.po b/fluxer_app/src/features/i18n/locales/ar/messages.po
index 6d89afdf8..587984c06 100644
--- a/fluxer_app/src/features/i18n/locales/ar/messages.po
+++ b/fluxer_app/src/features/i18n/locales/ar/messages.po
@@ -6511,8 +6511,7 @@ msgstr "اشترِ هدية {premiumProductName} من علامة تبويب {pre
msgid "Buy gift"
msgstr "شراء هدية"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "بإنشائك مجتمعًا، فإنك توافق على اتباع <0>إرشادات مجتمع {PRODUCT_NAME}</0> والالتزام بها."
@@ -7088,6 +7087,7 @@ msgstr "تغيير الاسم المستعار في المجموعة"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "استلام الهدية"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "المطالبة بحسابك"
@@ -9067,8 +9066,7 @@ msgstr "رسائل المجتمع المباشرة"
msgid "Community filter"
msgstr "تصفية المجتمعات"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "أيقونة المجتمع"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "التحكم في التمرير السلس الأصلي بالعجلة ولوحة المفاتيح في تطبيق سطح المكتب"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "التحكم في أوامر تحويل النص إلى كلام وقراءة المحتوى الوارد بصوت عالٍ."
@@ -11735,7 +11733,6 @@ msgstr "التاريخ والوقت"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "إعدادات المجموعة"
msgid "Group typing states"
msgstr "حالات الكتابة في المجموعة"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "تم تحديث المجموعة"
@@ -21548,7 +21544,6 @@ msgstr "الإشارة إلى الجميع أو أي دور في هذه القن
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "تسجيل حساب"
msgid "Registration"
msgstr "التسجيل"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "التسجيل مغلق حاليًا. استخدم رابط تسجيل من أحد المسؤولين لإنشاء حساب."
@@ -28007,8 +28001,7 @@ msgstr "إزالة من صور GIF المفضلة (بالرابط فقط)"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "إزالة الأيقونة"
@@ -34467,7 +34460,6 @@ msgstr "تحويل النص إلى كلام غير مدعوم"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "إشعارات تحويل النص إلى كلام"
@@ -37943,8 +37935,7 @@ msgstr "تحميل الملفات والوسائط في هذه القناة."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "تحميل أيقونة"
@@ -41063,8 +41054,7 @@ msgstr "أنت بحاجة إلى إذن \"{permissionLabel}\" لاستخدام
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "أنت بحاجة إلى إذن \"{permissionLabel}\" لاستخدام الملصقات من المجتمعات الأخرى هنا."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "يجب عليك المطالبة بحسابك قبل أن تتمكن من إنشاء مجتمع."
@@ -41081,8 +41071,7 @@ msgstr "يجب المطالبة بحسابك لإرسال رسائل مباشر
msgid "You need to claim your account to send messages in this community."
msgstr "يجب المطالبة بحسابك لإرسال الرسائل في هذا المجتمع."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "يجب عليك التحقق من عنوان بريدك الإلكتروني قبل أن تتمكن من إنشاء مجتمع."
@@ -41483,7 +41472,6 @@ msgstr "لم تتم المطالبة بحسابك بعد. بدون بريد إل
msgid "Your account is too new to send messages in this community."
msgstr "حسابك جديد جدًا ولا يمكنه إرسال رسائل في هذا المجتمع."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "طلب حسابك بانتظار الموافقة. يمكنك تسجيل الدخول بعد أن يوافق عليه أحد المسؤولين."
diff --git a/fluxer_app/src/features/i18n/locales/bg/messages.po b/fluxer_app/src/features/i18n/locales/bg/messages.po
index a45751641..df1127221 100644
--- a/fluxer_app/src/features/i18n/locales/bg/messages.po
+++ b/fluxer_app/src/features/i18n/locales/bg/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Купи подарък {premiumProductName} от раздела {premiu
msgid "Buy gift"
msgstr "Купи подарък"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Със създаването на общност се съгласяваш да спазваш и поддържаш <0>насоките на общността на {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Промяна на прякор в групата"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Вземи подарък"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Заяви акаунта си"
@@ -9067,8 +9066,7 @@ msgstr "DM от общност"
msgid "Community filter"
msgstr "Филтър за общности"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Икона на общността"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Управлявай вграденото плавно превъртане с колелце и клавиатура в настолното приложение"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Управлявай гласовите команди и четенето на глас за входящото съдържание."
@@ -11735,7 +11733,6 @@ msgstr "Дата и час"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Настройки на групата"
msgid "Group typing states"
msgstr "Състояния на писане в група"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Групата е актуализирана"
@@ -21548,7 +21544,6 @@ msgstr "Споменаване на всички или на която и да
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Регистриране на профил"
msgid "Registration"
msgstr "Регистрация"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Регистрацията в момента е затворена. Използвай линк за регистрация от администратор, за да създадеш акаунт."
@@ -28007,8 +28001,7 @@ msgstr "Премахване от любимите GIF файлове, запа
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Премахване на икона"
@@ -34467,7 +34460,6 @@ msgstr "Преобразуването на текст в говор не се
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Известия с текст към говор"
@@ -37943,8 +37935,7 @@ msgstr "Качване на файлове и медии в този канал.
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Качване на икона"
@@ -41063,8 +41054,7 @@ msgstr "Нужно е разрешението „{permissionLabel}“, за д
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Нужно е разрешението „{permissionLabel}“, за да използваш стикери от други общности тук."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Трябва да заявиш акаунта си, преди да можеш да създадеш общност."
@@ -41081,8 +41071,7 @@ msgstr "Трябва да заявиш акаунта си, за да изпра
msgid "You need to claim your account to send messages in this community."
msgstr "Трябва да заявиш акаунта си, за да изпращаш съобщения в тази общност."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Трябва да потвърдиш имейл адреса си, преди да можеш да създадеш общност."
@@ -41483,7 +41472,6 @@ msgstr "Акаунтът ти още не е заявен. Без имейл и
msgid "Your account is too new to send messages in this community."
msgstr "Акаунтът ти е твърде нов, за да изпращаш съобщения в тази общност."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Заявката ти за акаунт чака одобрение. Можеш да влезеш, след като администратор я одобри."
diff --git a/fluxer_app/src/features/i18n/locales/cs/messages.po b/fluxer_app/src/features/i18n/locales/cs/messages.po
index 03798cad6..c88133159 100644
--- a/fluxer_app/src/features/i18n/locales/cs/messages.po
+++ b/fluxer_app/src/features/i18n/locales/cs/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Kupte dárkové předplatné {premiumProductName} na kartě {premiumProd
msgid "Buy gift"
msgstr "Koupit dárek"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Vytvořením komunity souhlasíte s dodržováním a prosazováním <0>pravidel komunity {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Změnit přezdívku skupiny"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Převzít dárek"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Dokončit registraci účtu"
@@ -9067,8 +9066,7 @@ msgstr "Přímé zprávy od členů komunity"
msgid "Community filter"
msgstr "Filtr komunit"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Ikona komunity"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Ovládejte plynulé posouvání kolečkem myši a klávesnicí v desktopové aplikaci"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Nastavte příkazy pro převod textu na řeč a předčítání příchozího obsahu."
@@ -11735,7 +11733,6 @@ msgstr "Datum a čas"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Nastavení skupiny"
msgid "Group typing states"
msgstr "Stavy psaní ve skupině"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Skupina aktualizována"
@@ -21548,7 +21544,6 @@ msgstr "Zmiňovat všechny nebo jakoukoli roli v tomto kanálu, i když u ní ne
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Zaregistrovat účet"
msgid "Registration"
msgstr "Registrace"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Registrace je momentálně uzavřena. K vytvoření účtu použijte registrační odkaz od administrátora."
@@ -28007,8 +28001,7 @@ msgstr "Odebrat z oblíbených GIFů uložených pouze jako URL"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Odebrat ikonu"
@@ -34467,7 +34460,6 @@ msgstr "Převod textu na řeč není podporován"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Oznámení pomocí převodu textu na řeč"
@@ -37943,8 +37935,7 @@ msgstr "Nahrávat soubory a média v tomto kanálu."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Nahrát ikonu"
@@ -41063,8 +41054,7 @@ msgstr "K používání emoji z jiných komunit zde potřebujete oprávnění \"
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "K používání samolepek z jiných komunit zde potřebujete oprávnění „{permissionLabel}“."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Než budete moci vytvořit komunitu, musíte dokončit registraci svého účtu."
@@ -41081,8 +41071,7 @@ msgstr "Abyste mohli posílat soukromé zprávy, musíte dokončit registraci sv
msgid "You need to claim your account to send messages in this community."
msgstr "Abyste mohli v této komunitě posílat zprávy, musíte dokončit registraci svého účtu."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Než budete moct vytvořit komunitu, musíte si ověřit e-mailovou adresu."
@@ -41483,7 +41472,6 @@ msgstr "Registrace vašeho účtu zatím není dokončená. Bez e-mailu a hesla
msgid "Your account is too new to send messages in this community."
msgstr "Váš účet je příliš nový na odesílání zpráv v této komunitě."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Žádost o váš účet čeká na schválení. Přihlásit se můžete, až ji administrátor schválí."
diff --git a/fluxer_app/src/features/i18n/locales/da/messages.po b/fluxer_app/src/features/i18n/locales/da/messages.po
index 3c4839690..4a1379e8f 100644
--- a/fluxer_app/src/features/i18n/locales/da/messages.po
+++ b/fluxer_app/src/features/i18n/locales/da/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Køb en {premiumProductName}-gave fra fanen {premiumProductName} for at
msgid "Buy gift"
msgstr "Køb gave"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Ved at oprette et fællesskab accepterer du at følge og håndhæve <0>retningslinjerne for fællesskabet hos {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Skift kaldenavn i gruppen"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Indløs gave"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Fuldfør oprettelsen af din konto"
@@ -9067,8 +9066,7 @@ msgstr "Fællesskabs-DM"
msgid "Community filter"
msgstr "Fællesskabsfilter"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Fællesskabsikon"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Styr den indbyggede jævne rulning med musehjul og tastatur i computerappen"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Styr oplæsningskommandoer og oplæsning af indgående indhold."
@@ -11735,7 +11733,6 @@ msgstr "Dato og tid"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Gruppeindstillinger"
msgid "Group typing states"
msgstr "Gruppens skriveindikatorer"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Gruppe opdateret"
@@ -21548,7 +21544,6 @@ msgstr "Omtal alle eller en hvilken som helst rolle i denne kanal (også selvom
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Opret en konto"
msgid "Registration"
msgstr "Registrering"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Registrering er i øjeblikket lukket. Brug et registreringslink fra en administrator for at oprette en konto."
@@ -28007,8 +28001,7 @@ msgstr "Fjern fra URL-baserede GIF-favoritter"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Fjern ikon"
@@ -34467,7 +34460,6 @@ msgstr "Tekst til tale understøttes ikke"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Tekst-til-tale-notifikationer"
@@ -37943,8 +37935,7 @@ msgstr "Upload filer og medier i denne kanal."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Upload ikon"
@@ -41063,8 +41054,7 @@ msgstr "Du skal have tilladelsen \"{permissionLabel}\" for at bruge emojis fra a
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Du skal have tilladelsen \"{permissionLabel}\" for at bruge klistermærker fra andre fællesskaber her."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Du skal fuldføre oprettelsen af din konto, før du kan oprette et fællesskab."
@@ -41081,8 +41071,7 @@ msgstr "Du skal fuldføre oprettelsen af din konto for at sende direkte beskeder
msgid "You need to claim your account to send messages in this community."
msgstr "Du skal fuldføre oprettelsen af din konto for at sende beskeder i dette fællesskab."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Du skal bekræfte din e-mailadresse, før du kan oprette et fællesskab."
@@ -41483,7 +41472,6 @@ msgstr "Du har endnu ikke fuldført oprettelsen af din konto. Uden en e-mail og
msgid "Your account is too new to send messages in this community."
msgstr "Din konto er for ny til at sende beskeder i dette fællesskab."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Din kontoanmodning afventer godkendelse. Du kan logge ind, når en administrator har godkendt den."
diff --git a/fluxer_app/src/features/i18n/locales/de/messages.po b/fluxer_app/src/features/i18n/locales/de/messages.po
index cab0ff20d..3536e8e9e 100644
--- a/fluxer_app/src/features/i18n/locales/de/messages.po
+++ b/fluxer_app/src/features/i18n/locales/de/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Kaufe ein {premiumProductName}-Geschenk im Tab „{premiumProductName}
msgid "Buy gift"
msgstr "Geschenk kaufen"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Durch das Erstellen einer Community stimmst du zu, die <0>Community-Richtlinien von {PRODUCT_NAME}</0> zu befolgen und einzuhalten."
@@ -7088,6 +7087,7 @@ msgstr "Spitznamen in der Gruppe ändern"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Geschenk einlösen"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Deinen Account beanspruchen"
@@ -9067,8 +9066,7 @@ msgstr "Community-DM"
msgid "Community filter"
msgstr "Community-Filter"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Community-Icon"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Steuert natives sanftes Scrollen mit Mausrad und Tastatur in der Desktop-App"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Vorlesebefehle und Sprachausgabe für eingehende Inhalte steuern."
@@ -11735,7 +11733,6 @@ msgstr "Datum und Uhrzeit"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Gruppeneinstellungen"
msgid "Group typing states"
msgstr "Gruppen-Tippstatus"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Gruppe aktualisiert"
@@ -21548,7 +21544,6 @@ msgstr "Alle oder jede Rolle in diesem Kanal erwähnen (auch wenn die Rolle nich
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Ein Konto registrieren"
msgid "Registration"
msgstr "Registrierung"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Die Registrierung ist derzeit geschlossen. Verwende einen Registrierungslink von einem Admin, um einen Account zu erstellen."
@@ -28007,8 +28001,7 @@ msgstr "Aus der Liste der per URL gespeicherten GIFs entfernen"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Symbol entfernen"
@@ -34467,7 +34460,6 @@ msgstr "Text-to-Speech wird nicht unterstützt"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Text-to-Speech-Benachrichtigungen"
@@ -37943,8 +37935,7 @@ msgstr "Dateien und Medien in diesem Kanal hochladen."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Symbol hochladen"
@@ -41063,8 +41054,7 @@ msgstr "Du benötigst die Berechtigung \"{permissionLabel}\", um hier Emojis aus
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Du benötigst die Berechtigung \"{permissionLabel}\", um hier Sticker aus anderen Communitys zu verwenden."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Du musst zuerst deinen Account beanspruchen, bevor du eine Community erstellen kannst."
@@ -41081,8 +41071,7 @@ msgstr "Du musst deinen Account beanspruchen, um Direktnachrichten senden zu kö
msgid "You need to claim your account to send messages in this community."
msgstr "Du musst deinen Account beanspruchen, um Nachrichten in dieser Community senden zu können."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Du musst deine E-Mail-Adresse bestätigen, bevor du eine Community erstellen kannst."
@@ -41483,7 +41472,6 @@ msgstr "Dein Account ist noch nicht beansprucht. Ohne E-Mail-Adresse und Passwor
msgid "Your account is too new to send messages in this community."
msgstr "Dein Account ist zu neu, um Nachrichten in dieser Community zu senden."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Deine Accountanfrage wartet auf Genehmigung. Du kannst dich anmelden, nachdem ein Admin sie genehmigt hat."
diff --git a/fluxer_app/src/features/i18n/locales/el/messages.po b/fluxer_app/src/features/i18n/locales/el/messages.po
index 8de9421ab..48e156785 100644
--- a/fluxer_app/src/features/i18n/locales/el/messages.po
+++ b/fluxer_app/src/features/i18n/locales/el/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Αγοράστε ένα δώρο {premiumProductName} από την κα
msgid "Buy gift"
msgstr "Αγορά δώρου"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Δημιουργώντας μια κοινότητα, συμφωνείτε να ακολουθείτε και να τηρείτε τις <0>οδηγίες κοινότητας του {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Αλλαγή ψευδώνυμου στην ομάδα"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Παραλαβή δώρου"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Διεκδικήστε τον λογαριασμό σας"
@@ -9067,8 +9066,7 @@ msgstr "DM κοινότητας"
msgid "Community filter"
msgstr "Φίλτρο κοινότητας"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Εικονίδιο κοινότητας"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Ελέγξτε την εγγενή ομαλή κύλιση με τον τροχό και το πληκτρολόγιο στην εφαρμογή υπολογιστή"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Ελέγξτε τις φωνητικές εντολές και την αφήγηση για το εισερχόμενο περιεχόμενο."
@@ -11735,7 +11733,6 @@ msgstr "Ημερομηνία και ώρα"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Ρυθμίσεις ομάδας"
msgid "Group typing states"
msgstr "Καταστάσεις πληκτρολόγησης ομάδας"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Η ομάδα ενημερώθηκε"
@@ -21548,7 +21544,6 @@ msgstr "Αναφορά σε όλους ή σε οποιονδήποτε ρόλο
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Δημιουργία λογαριασμού"
msgid "Registration"
msgstr "Εγγραφή"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Οι εγγραφές είναι προς το παρόν κλειστές. Χρησιμοποιήστε έναν σύνδεσμο εγγραφής από διαχειριστή για να δημιουργήσετε λογαριασμό."
@@ -28007,8 +28001,7 @@ msgstr "Αφαίρεση από τα αγαπημένα GIF που αποθηκ
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Αφαίρεση εικονιδίου"
@@ -34467,7 +34460,6 @@ msgstr "Η μετατροπή κειμένου σε ομιλία δεν υποσ
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Ειδοποιήσεις μετατροπής κειμένου σε ομιλία"
@@ -37943,8 +37935,7 @@ msgstr "Ανέβασμα αρχείων και πολυμέσων σε αυτό
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Ανέβασμα εικονιδίου"
@@ -41063,8 +41054,7 @@ msgstr "Χρειάζεστε το δικαίωμα «{permissionLabel}» για
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Χρειάζεστε το δικαίωμα «{permissionLabel}» για να χρησιμοποιήσετε αυτοκόλλητα από άλλες κοινότητες εδώ."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Πρέπει να διεκδικήσετε τον λογαριασμό σας πριν δημιουργήσετε μια κοινότητα."
@@ -41081,8 +41071,7 @@ msgstr "Πρέπει να διεκδικήσετε τον λογαριασμό
msgid "You need to claim your account to send messages in this community."
msgstr "Πρέπει να διεκδικήσετε τον λογαριασμό σας για να στείλετε μηνύματα σε αυτήν την κοινότητα."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Πρέπει να επαληθεύσετε τη διεύθυνση email σας πριν δημιουργήσετε μια κοινότητα."
@@ -41483,7 +41472,6 @@ msgstr "Ο λογαριασμός σας δεν έχει διεκδικηθεί
msgid "Your account is too new to send messages in this community."
msgstr "Ο λογαριασμός σας είναι πολύ καινούριος για να στέλνετε μηνύματα σε αυτήν την κοινότητα."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Το αίτημα λογαριασμού σας εκκρεμεί για έγκριση. Μπορείτε να συνδεθείτε αφού το εγκρίνει ένας διαχειριστής."
diff --git a/fluxer_app/src/features/i18n/locales/en-GB/messages.po b/fluxer_app/src/features/i18n/locales/en-GB/messages.po
index 443d4301d..893449128 100644
--- a/fluxer_app/src/features/i18n/locales/en-GB/messages.po
+++ b/fluxer_app/src/features/i18n/locales/en-GB/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Buy a {premiumProductName} gift from the {premiumProductName} tab to sha
msgid "Buy gift"
msgstr "Buy gift"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
@@ -7088,6 +7087,7 @@ msgstr "Change group nickname"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Claim gift"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Claim your account"
@@ -9067,8 +9066,7 @@ msgstr "Community DM"
msgid "Community filter"
msgstr "Community filter"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Community icon"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Control native smooth wheel and keyboard scrolling in the desktop app"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Control speech commands and narration for incoming content."
@@ -11735,7 +11733,6 @@ msgstr "Date and time"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Group settings"
msgid "Group typing states"
msgstr "Group typing states"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Group updated"
@@ -21548,7 +21544,6 @@ msgstr "Mention everyone or any role in this channel (even if the role isn't set
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Register an account"
msgid "Registration"
msgstr "Registration"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Registration is currently closed. Use a registration link from an admin to create an account."
@@ -28007,8 +28001,7 @@ msgstr "Remove from URL-only GIF favourites"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Remove icon"
@@ -34467,7 +34460,6 @@ msgstr "Text-to-speech not supported"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Text-to-speech notifications"
@@ -37943,8 +37935,7 @@ msgstr "Upload files and media in this channel."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Upload icon"
@@ -41063,8 +41054,7 @@ msgstr "You need the \"{permissionLabel}\" permission to use emoji from other co
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "You need to claim your account before you can create a community."
@@ -41081,8 +41071,7 @@ msgstr "You need to claim your account to send direct messages."
msgid "You need to claim your account to send messages in this community."
msgstr "You need to claim your account to send messages in this community."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "You need to verify your email address before you can create a community."
@@ -41483,7 +41472,6 @@ msgstr "Your account is not yet claimed. Without an email and password, you won'
msgid "Your account is too new to send messages in this community."
msgstr "Your account is too new to send messages in this community."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Your account request is pending approval. You can sign in after an admin approves it."
diff --git a/fluxer_app/src/features/i18n/locales/en-US/messages.po b/fluxer_app/src/features/i18n/locales/en-US/messages.po
index 40363c915..bbd3b349a 100644
--- a/fluxer_app/src/features/i18n/locales/en-US/messages.po
+++ b/fluxer_app/src/features/i18n/locales/en-US/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Buy a {premiumProductName} gift from the {premiumProductName} tab to sha
msgid "Buy gift"
msgstr "Buy gift"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
@@ -7088,6 +7087,7 @@ msgstr "Change group nickname"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Claim gift"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Claim your account"
@@ -9067,8 +9066,7 @@ msgstr "Community DM"
msgid "Community filter"
msgstr "Community filter"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Community icon"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Control native smooth wheel and keyboard scrolling in the desktop app"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Control speech commands and narration for incoming content."
@@ -11735,7 +11733,6 @@ msgstr "Date and time"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Group settings"
msgid "Group typing states"
msgstr "Group typing states"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Group updated"
@@ -21548,7 +21544,6 @@ msgstr "Mention everyone or any role in this channel (even if the role isn't set
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Register an account"
msgid "Registration"
msgstr "Registration"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Registration is currently closed. Use a registration link from an admin to create an account."
@@ -28007,8 +28001,7 @@ msgstr "Remove from URL-only GIF favorites"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Remove icon"
@@ -34467,7 +34460,6 @@ msgstr "Text-to-speech not supported"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Text-to-speech notifications"
@@ -37943,8 +37935,7 @@ msgstr "Upload files and media in this channel."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Upload icon"
@@ -41063,8 +41054,7 @@ msgstr "You need the \"{permissionLabel}\" permission to use emoji from other co
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "You need to claim your account before you can create a community."
@@ -41081,8 +41071,7 @@ msgstr "You need to claim your account to send direct messages."
msgid "You need to claim your account to send messages in this community."
msgstr "You need to claim your account to send messages in this community."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "You need to verify your email address before you can create a community."
@@ -41483,7 +41472,6 @@ msgstr "Your account is not yet claimed. Without an email and password, you won'
msgid "Your account is too new to send messages in this community."
msgstr "Your account is too new to send messages in this community."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Your account request is pending approval. You can sign in after an admin approves it."
diff --git a/fluxer_app/src/features/i18n/locales/es-419/messages.po b/fluxer_app/src/features/i18n/locales/es-419/messages.po
index ca57cd950..a01740e4c 100644
--- a/fluxer_app/src/features/i18n/locales/es-419/messages.po
+++ b/fluxer_app/src/features/i18n/locales/es-419/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Compra un regalo de {premiumProductName} desde la pestaña {premiumProdu
msgid "Buy gift"
msgstr "Comprar regalo"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Al crear una comunidad, aceptas seguir y respetar las <0>normas de la comunidad de {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Cambiar apodo en el grupo"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Reclamar regalo"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Completa el registro de tu cuenta"
@@ -9067,8 +9066,7 @@ msgstr "MD de la comunidad"
msgid "Community filter"
msgstr "Filtro de comunidad"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Ícono de la comunidad"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Controla el desplazamiento suave nativo con la rueda y el teclado en la aplicación de escritorio"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Controla los comandos de síntesis de voz y la narración del contenido entrante."
@@ -11735,7 +11733,6 @@ msgstr "Fecha y hora"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Configuración del grupo"
msgid "Group typing states"
msgstr "Estados de escritura del grupo"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Grupo actualizado"
@@ -21548,7 +21544,6 @@ msgstr "Menciona a todos o a cualquier rol en este canal (incluso si el rol no e
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Registrar una cuenta"
msgid "Registration"
msgstr "Registro"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "El registro está cerrado actualmente. Usa un enlace de registro de un administrador para crear una cuenta."
@@ -28007,8 +28001,7 @@ msgstr "Quitar de los GIF favoritos guardados por URL"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Quitar ícono"
@@ -34467,7 +34460,6 @@ msgstr "Síntesis de voz no compatible"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Notificaciones con síntesis de voz"
@@ -37943,8 +37935,7 @@ msgstr "Sube archivos y contenido multimedia en este canal."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Subir ícono"
@@ -41063,8 +41054,7 @@ msgstr "Necesitas el permiso \"{permissionLabel}\" para usar emojis de otras com
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Necesitas el permiso \"{permissionLabel}\" para usar stickers de otras comunidades aquí."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Debes completar el registro de tu cuenta antes de poder crear una comunidad."
@@ -41081,8 +41071,7 @@ msgstr "Debes completar el registro de tu cuenta para enviar mensajes directos."
msgid "You need to claim your account to send messages in this community."
msgstr "Debes completar el registro de tu cuenta para enviar mensajes en esta comunidad."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Necesitas verificar tu dirección de correo electrónico antes de poder crear una comunidad."
@@ -41483,7 +41472,6 @@ msgstr "Aún no has completado el registro de tu cuenta. Sin un correo electrón
msgid "Your account is too new to send messages in this community."
msgstr "Tu cuenta es demasiado nueva para enviar mensajes en esta comunidad."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Tu solicitud de cuenta está pendiente de aprobación. Podrás iniciar sesión cuando un administrador la apruebe."
diff --git a/fluxer_app/src/features/i18n/locales/es-ES/messages.po b/fluxer_app/src/features/i18n/locales/es-ES/messages.po
index 588c5b0a8..10ee21cfd 100644
--- a/fluxer_app/src/features/i18n/locales/es-ES/messages.po
+++ b/fluxer_app/src/features/i18n/locales/es-ES/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Compra un regalo de {premiumProductName} en la pestaña {premiumProductN
msgid "Buy gift"
msgstr "Comprar regalo"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Al crear una comunidad, aceptas seguir y respetar las <0>normas de la comunidad de {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Cambiar apodo en el grupo"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Reclamar regalo"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Completa el registro de tu cuenta"
@@ -9067,8 +9066,7 @@ msgstr "MD de la comunidad"
msgid "Community filter"
msgstr "Filtro de comunidades"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Icono de la comunidad"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Controla el desplazamiento nativo suave con la rueda y el teclado en la aplicación de escritorio"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Controla los comandos de síntesis de voz y la narración del contenido entrante."
@@ -11735,7 +11733,6 @@ msgstr "Fecha y hora"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Ajustes del grupo"
msgid "Group typing states"
msgstr "Estados de escritura del grupo"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Grupo actualizado"
@@ -21548,7 +21544,6 @@ msgstr "Mencionar a todos o a cualquier rol en este canal (incluso si el rol no
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Registrar una cuenta"
msgid "Registration"
msgstr "Registro"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "El registro está cerrado actualmente. Usa un enlace de registro de un administrador para crear una cuenta."
@@ -28007,8 +28001,7 @@ msgstr "Eliminar de los GIF favoritos guardados por URL"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Eliminar icono"
@@ -34467,7 +34460,6 @@ msgstr "Síntesis de voz no compatible"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Notificaciones con síntesis de voz"
@@ -37943,8 +37935,7 @@ msgstr "Sube archivos y contenido multimedia a este canal."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Subir icono"
@@ -41063,8 +41054,7 @@ msgstr "Necesitas el permiso \"{permissionLabel}\" para usar aquí los emojis de
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Necesitas el permiso \"{permissionLabel}\" para usar pegatinas de otras comunidades aquí."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Debes completar el registro de tu cuenta antes de poder crear una comunidad."
@@ -41081,8 +41071,7 @@ msgstr "Debes completar el registro de tu cuenta para enviar mensajes directos."
msgid "You need to claim your account to send messages in this community."
msgstr "Debes completar el registro de tu cuenta para enviar mensajes en esta comunidad."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Tienes que verificar tu dirección de correo electrónico antes de poder crear una comunidad."
@@ -41483,7 +41472,6 @@ msgstr "Aún no has completado el registro de tu cuenta. Sin un correo electrón
msgid "Your account is too new to send messages in this community."
msgstr "Tu cuenta es demasiado nueva para enviar mensajes en esta comunidad."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Tu solicitud de cuenta está pendiente de aprobación. Podrás iniciar sesión cuando un administrador la apruebe."
diff --git a/fluxer_app/src/features/i18n/locales/fi/messages.po b/fluxer_app/src/features/i18n/locales/fi/messages.po
index c454a42eb..bf3cc7ba6 100644
--- a/fluxer_app/src/features/i18n/locales/fi/messages.po
+++ b/fluxer_app/src/features/i18n/locales/fi/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Osta {premiumProductName}-lahja {premiumProductName}-välilehdeltä ja j
msgid "Buy gift"
msgstr "Osta lahjaksi"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Luomalla yhteisön sitoudut noudattamaan ja ylläpitämään <0>{PRODUCT_NAME}-yhteisön sääntöjä</0>."
@@ -7088,6 +7087,7 @@ msgstr "Vaihda ryhmän lempinimi"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Lunasta lahja"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Viimeistele tilisi rekisteröinti"
@@ -9067,8 +9066,7 @@ msgstr "Yhteisön yksityisviesti"
msgid "Community filter"
msgstr "Yhteisösuodatin"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Yhteisön kuvake"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Hallitse työpöytäsovelluksen natiivia tasaista vieritystä hiiren rullalla ja näppäimistöllä"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Hallitse saapuvan sisällön puhekomentoja ja selostusta."
@@ -11735,7 +11733,6 @@ msgstr "Päivämäärä ja aika"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Ryhmän asetukset"
msgid "Group typing states"
msgstr "Ryhmän kirjoitustilat"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Ryhmä päivitetty"
@@ -21548,7 +21544,6 @@ msgstr "Mainitse kaikki tai mikä tahansa rooli tässä kanavassa (vaikka roolia
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Rekisteröi tili"
msgid "Registration"
msgstr "Rekisteröinti"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Rekisteröityminen on tällä hetkellä suljettu. Luo tili käyttämällä ylläpitäjältä saatua rekisteröitymislinkkiä."
@@ -28007,8 +28001,7 @@ msgstr "Poista URL-osoitteena tallennetuista GIF-suosikeista"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Poista kuvake"
@@ -34467,7 +34460,6 @@ msgstr "Tekstistä puheeksi -toimintoa ei tueta"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Tekstistä puheeksi -ilmoitukset"
@@ -37943,8 +37935,7 @@ msgstr "Lähetä tiedostoja ja mediaa tähän kanavaan."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Lataa kuvake"
@@ -41063,8 +41054,7 @@ msgstr "Tarvitset \"{permissionLabel}\" -käyttöoikeuden käyttääksesi muiden
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Tarvitset \"{permissionLabel}\" -käyttöoikeuden käyttääksesi muiden yhteisöjen tarroja täällä."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Sinun on viimeisteltävä tilisi rekisteröinti, ennen kuin voit luoda yhteisön."
@@ -41081,8 +41071,7 @@ msgstr "Sinun on viimeisteltävä tilisi rekisteröinti, jotta voit lähettää
msgid "You need to claim your account to send messages in this community."
msgstr "Sinun on viimeisteltävä tilisi rekisteröinti, jotta voit lähettää viestejä tässä yhteisössä."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Vahvista sähköpostiosoitteesi, ennen kuin voit luoda yhteisön."
@@ -41483,7 +41472,6 @@ msgstr "Tilisi rekisteröintiä ei ole vielä viimeistelty. Ilman sähköpostios
msgid "Your account is too new to send messages in this community."
msgstr "Tilisi on liian uusi viestien lähettämiseen tässä yhteisössä."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Tilipyyntösi odottaa hyväksyntää. Voit kirjautua sisään, kun ylläpitäjä on hyväksynyt sen."
diff --git a/fluxer_app/src/features/i18n/locales/fr/messages.po b/fluxer_app/src/features/i18n/locales/fr/messages.po
index b5d52d4a1..4c35c4447 100644
--- a/fluxer_app/src/features/i18n/locales/fr/messages.po
+++ b/fluxer_app/src/features/i18n/locales/fr/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Achetez un cadeau {premiumProductName} depuis l'onglet {premiumProductNa
msgid "Buy gift"
msgstr "Offrir"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "En créant une communauté, vous acceptez de suivre et de respecter les <0>règles de la communauté {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Modifier le surnom du groupe"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Récupérer le cadeau"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Finalisez votre inscription"
@@ -9067,8 +9066,7 @@ msgstr "MP de la communauté"
msgid "Community filter"
msgstr "Filtrer les communautés"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Icône de la communauté"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Contrôler le défilement fluide natif à la molette et au clavier dans l’application de bureau"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Gérer les commandes vocales et la narration pour le contenu entrant."
@@ -11735,7 +11733,6 @@ msgstr "Date et heure"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Paramètres du groupe"
msgid "Group typing states"
msgstr "États de saisie du groupe"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Groupe mis à jour"
@@ -21548,7 +21544,6 @@ msgstr "Mentionner tout le monde ou n’importe quel rôle dans ce salon, même
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "S'inscrire"
msgid "Registration"
msgstr "Inscription"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Les inscriptions sont actuellement fermées. Utilisez un lien d’inscription fourni par un admin pour créer un compte."
@@ -28007,8 +28001,7 @@ msgstr "Supprimer des favoris GIF enregistrés par URL"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Supprimer l'icône"
@@ -34467,7 +34460,6 @@ msgstr "Synthèse vocale non prise en charge"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Notifications par synthèse vocale"
@@ -37943,8 +37935,7 @@ msgstr "Envoyer des fichiers et des médias dans ce salon."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Importer une icône"
@@ -41063,8 +41054,7 @@ msgstr "Vous devez disposer de la permission « {permissionLabel} » pour utilis
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Vous devez disposer de la permission « {permissionLabel} » pour utiliser ici les stickers d’autres communautés."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Vous devez finaliser votre inscription avant de pouvoir créer une communauté."
@@ -41081,8 +41071,7 @@ msgstr "Vous devez finaliser votre inscription pour envoyer des messages privés
msgid "You need to claim your account to send messages in this community."
msgstr "Vous devez finaliser votre inscription pour envoyer des messages dans cette communauté."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Vous devez vérifier votre adresse e-mail avant de pouvoir créer une communauté."
@@ -41483,7 +41472,6 @@ msgstr "Votre inscription n’est pas encore finalisée. Sans adresse e-mail ni
msgid "Your account is too new to send messages in this community."
msgstr "Votre compte est trop récent pour envoyer des messages dans cette communauté."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Votre demande de compte est en attente d’approbation. Vous pourrez vous connecter lorsqu’un admin l’aura approuvée."
diff --git a/fluxer_app/src/features/i18n/locales/he/messages.po b/fluxer_app/src/features/i18n/locales/he/messages.po
index 82732e7e8..c2d2ed52c 100644
--- a/fluxer_app/src/features/i18n/locales/he/messages.po
+++ b/fluxer_app/src/features/i18n/locales/he/messages.po
@@ -6511,8 +6511,7 @@ msgstr "ניתן לקנות מתנת {premiumProductName} מהלשונית {prem
msgid "Buy gift"
msgstr "קניית מתנה"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "ביצירת קהילה, אתה מסכים לפעול לפי <0>הנחיות הקהילה של {PRODUCT_NAME}</0> ולשמור עליהן."
@@ -7088,6 +7087,7 @@ msgstr "שינוי הכינוי בקבוצה"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "קבל את המתנה"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "תבע את החשבון שלך"
@@ -9067,8 +9066,7 @@ msgstr "הודעה פרטית מקהילה"
msgid "Community filter"
msgstr "סינון קהילות"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "אייקון קהילה"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "שליטה בגלילה החלקה הטבעית באמצעות גלגלת ומקלדת באפליקציית המחשב"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "שליטה בפקודות טקסט לדיבור ובקריינות של תוכן נכנס."
@@ -11735,7 +11733,6 @@ msgstr "תאריך ושעה"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "הגדרות קבוצה"
msgid "Group typing states"
msgstr "מצבי הקלדה של קבוצה"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "הקבוצה עודכנה"
@@ -21548,7 +21544,6 @@ msgstr "אזכור כולם או כל תפקיד בערוץ זה (גם אם לת
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "צור חשבון"
msgid "Registration"
msgstr "הרשמה"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "ההרשמה סגורה כרגע. יש להשתמש בקישור הרשמה ממנהל כדי ליצור חשבון."
@@ -28007,8 +28001,7 @@ msgstr "הסרה מקובצי GIF מועדפים לפי כתובת URL בלבד"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "הסר אייקון"
@@ -34467,7 +34460,6 @@ msgstr "טקסט לדיבור אינו נתמך"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "התראות טקסט לדיבור"
@@ -37943,8 +37935,7 @@ msgstr "העלה קבצים ומדיה בערוץ זה."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "העלאת אייקון"
@@ -41063,8 +41054,7 @@ msgstr "דרושה לך ההרשאה \"{permissionLabel}\" כדי להשתמש
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "דרושה לך ההרשאה \"{permissionLabel}\" כדי להשתמש במדבקות מקהילות אחרות כאן."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "עליך לתבוע את החשבון שלך לפני שתוכל ליצור קהילה."
@@ -41081,8 +41071,7 @@ msgstr "עליך לתבוע את החשבון שלך כדי לשלוח הודע
msgid "You need to claim your account to send messages in this community."
msgstr "עליך לתבוע את החשבון שלך כדי לשלוח הודעות בקהילה זו."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "יש לאמת את כתובת האימייל שלך לפני שתוכל ליצור קהילה."
@@ -41483,7 +41472,6 @@ msgstr "החשבון שלך עדיין לא נתבע. ללא אימייל וסי
msgid "Your account is too new to send messages in this community."
msgstr "החשבון שלך חדש מדי כדי לשלוח הודעות בקהילה זו."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "בקשת החשבון שלך ממתינה לאישור. אפשר להתחבר לאחר שמנהל יאשר אותה."
diff --git a/fluxer_app/src/features/i18n/locales/hi/messages.po b/fluxer_app/src/features/i18n/locales/hi/messages.po
index 77605a54e..744346b2a 100644
--- a/fluxer_app/src/features/i18n/locales/hi/messages.po
+++ b/fluxer_app/src/features/i18n/locales/hi/messages.po
@@ -6511,8 +6511,7 @@ msgstr "दोस्तों के साथ शेयर करने के
msgid "Buy gift"
msgstr "उपहार खरीदें"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "एक कम्युनिटी बनाकर, आप <0>{PRODUCT_NAME} कम्युनिटी दिशानिर्देशों</0> का पालन करने और उन्हें बनाए रखने के लिए सहमत हैं।"
@@ -7088,6 +7087,7 @@ msgstr "ग्रुप का उपनाम बदलें"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "उपहार क्लेम करें"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "अपना अकाउंट क्लेम करें"
@@ -9067,8 +9066,7 @@ msgstr "कम्युनिटी DM"
msgid "Community filter"
msgstr "कम्युनिटी फ़िल्टर"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "कम्युनिटी आइकॉन"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "डेस्कटॉप ऐप में नेटिव स्मूथ व्हील और कीबोर्ड स्क्रॉलिंग को नियंत्रित करें"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "आने वाले कॉन्टेंट के लिए स्पीच कमांड और नरेशन कंट्रोल करें।"
@@ -11735,7 +11733,6 @@ msgstr "तारीख और समय"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "ग्रुप सेटिंग्स"
msgid "Group typing states"
msgstr "ग्रुप टाइपिंग स्टेटस"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "ग्रुप अपडेट किया गया"
@@ -21548,7 +21544,6 @@ msgstr "इस चैनल में सभी को या किसी भ
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "खाता पंजीकृत करें"
msgid "Registration"
msgstr "रजिस्ट्रेशन"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "फ़िलहाल रजिस्ट्रेशन बंद है। अकाउंट बनाने के लिए किसी एडमिन से मिला रजिस्ट्रेशन लिंक इस्तेमाल करें।"
@@ -28007,8 +28001,7 @@ msgstr "सिर्फ़ URL वाले पसंदीदा GIF से ह
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "आइकॉन हटाएँ"
@@ -34467,7 +34460,6 @@ msgstr "टेक्स्ट-टू-स्पीच समर्थित न
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "टेक्स्ट-टू-स्पीच सूचनाएं"
@@ -37943,8 +37935,7 @@ msgstr "इस चैनल में फ़ाइलें और मीडि
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "आइकॉन अपलोड करें"
@@ -41063,8 +41054,7 @@ msgstr "यहां अन्य कम्युनिटी से इमो
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "यहां अन्य कम्युनिटी से स्टिकर इस्तेमाल करने के लिए आपको \"{permissionLabel}\" अनुमति चाहिए।"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "कम्युनिटी बनाने से पहले आपको अपना अकाउंट क्लेम करना होगा।"
@@ -41081,8 +41071,7 @@ msgstr "डायरेक्ट मैसेज भेजने के लि
msgid "You need to claim your account to send messages in this community."
msgstr "इस कम्युनिटी में मैसेज भेजने के लिए आपको अपना अकाउंट क्लेम करना होगा।"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "कम्युनिटी बनाने से पहले आपको अपना ईमेल पता वेरिफ़ाई करना होगा।"
@@ -41483,7 +41472,6 @@ msgstr "आपका अकाउंट अभी तक क्लेम नह
msgid "Your account is too new to send messages in this community."
msgstr "इस कम्युनिटी में मैसेज भेजने के लिए आपका अकाउंट बहुत नया है।"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "आपके अकाउंट का अनुरोध मंज़ूरी के इंतज़ार में है। एडमिन के मंज़ूर करने के बाद आप साइन इन कर सकेंगे।"
diff --git a/fluxer_app/src/features/i18n/locales/hr/messages.po b/fluxer_app/src/features/i18n/locales/hr/messages.po
index 04cad3a16..9babbc4c1 100644
--- a/fluxer_app/src/features/i18n/locales/hr/messages.po
+++ b/fluxer_app/src/features/i18n/locales/hr/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Kupite poklon {premiumProductName} na kartici {premiumProductName} i pod
msgid "Buy gift"
msgstr "Kupi poklon"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Stvaranjem zajednice pristajete slijediti i podržavati <0>smjernice zajednice {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Promijeni nadimak u grupi"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Preuzmi poklon"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Preuzmite svoj račun"
@@ -9067,8 +9066,7 @@ msgstr "Izravne poruke iz zajednice"
msgid "Community filter"
msgstr "Filtar zajednice"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Ikona zajednice"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Kontrolirajte izvorno glatko pomicanje kotačićem i tipkovnicom u aplikaciji za stolna računala"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Upravljajte govornim naredbama i naracijom za dolazni sadržaj."
@@ -11735,7 +11733,6 @@ msgstr "Datum i vrijeme"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Postavke grupe"
msgid "Group typing states"
msgstr "Status tipkanja u grupi"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Grupa ažurirana"
@@ -21548,7 +21544,6 @@ msgstr "Spomeni sve ili bilo koju ulogu u ovom kanalu (čak i ako za ulogu nije
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Registriraj račun"
msgid "Registration"
msgstr "Registracija"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Registracija je trenutačno zatvorena. Za izradu računa upotrijebi registracijsku poveznicu od administratora."
@@ -28007,8 +28001,7 @@ msgstr "Ukloni iz favorita GIF-ova pohranjenih putem URL-a"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Ukloni ikonu"
@@ -34467,7 +34460,6 @@ msgstr "Pretvaranje teksta u govor nije podržano"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Obavijesti putem govora"
@@ -37943,8 +37935,7 @@ msgstr "Prenesite datoteke i medije u ovaj kanal."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Učitaj ikonu"
@@ -41063,8 +41054,7 @@ msgstr "Potrebno vam je dopuštenje \"{permissionLabel}\" da biste ovdje koristi
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Potrebno vam je dopuštenje \"{permissionLabel}\" da biste ovdje koristili naljepnice iz drugih zajednica."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Morate preuzeti svoj račun prije nego što možete stvoriti zajednicu."
@@ -41081,8 +41071,7 @@ msgstr "Morate preuzeti svoj račun da biste slali izravne poruke."
msgid "You need to claim your account to send messages in this community."
msgstr "Morate preuzeti svoj račun da biste slali poruke u ovoj zajednici."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Morate potvrditi svoju adresu e-pošte prije nego što možete stvoriti zajednicu."
@@ -41483,7 +41472,6 @@ msgstr "Vaš račun još nije preuzet. Bez e-pošte i lozinke nećete se moći p
msgid "Your account is too new to send messages in this community."
msgstr "Vaš je račun prenov da biste slali poruke u ovoj zajednici."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Vaš zahtjev za račun čeka odobrenje. Možete se prijaviti nakon što ga administrator odobri."
diff --git a/fluxer_app/src/features/i18n/locales/hu/messages.po b/fluxer_app/src/features/i18n/locales/hu/messages.po
index e2168e7f5..9b3f804da 100644
--- a/fluxer_app/src/features/i18n/locales/hu/messages.po
+++ b/fluxer_app/src/features/i18n/locales/hu/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Vásárolj {premiumProductName} ajándékot a(z) {premiumProductName} la
msgid "Buy gift"
msgstr "Ajándék vásárlása"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Közösség létrehozásával vállalod a(z) <0>{PRODUCT_NAME} közösségi irányelvek</0> betartását és betartatását."
@@ -7088,6 +7087,7 @@ msgstr "Csoportbeli becenév módosítása"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Ajándék beváltása"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Fejezd be a fiókod regisztrációját"
@@ -9067,8 +9066,7 @@ msgstr "Közösségi DM"
msgid "Community filter"
msgstr "Közösségi szűrő"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Közösség ikonja"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Az egérgörgővel és billentyűzettel végzett natív sima görgetés vezérlése az asztali alkalmazásban"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Beszédparancsok és felolvasás vezérlése a bejövő tartalomhoz."
@@ -11735,7 +11733,6 @@ msgstr "Dátum és idő"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Csoportbeállítások"
msgid "Group typing states"
msgstr "Csoportos gépelési állapotok"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Csoport frissítve"
@@ -21548,7 +21544,6 @@ msgstr "Mindenki vagy bármelyik szerepkör megemlítése ebben a csatornában (
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Fiók regisztrálása"
msgid "Registration"
msgstr "Regisztráció"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "A regisztráció jelenleg zárva van. Fiók létrehozásához használj egy admintól kapott regisztrációs hivatkozást."
@@ -28007,8 +28001,7 @@ msgstr "Eltávolítás az URL-en alapuló GIF-kedvencek közül"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Ikon eltávolítása"
@@ -34467,7 +34460,6 @@ msgstr "A szövegfelolvasás nem támogatott"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Értesítések szövegfelolvasással"
@@ -37943,8 +37935,7 @@ msgstr "Fájlok és média feltöltése ebben a csatornában."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Ikon feltöltése"
@@ -41063,8 +41054,7 @@ msgstr "Más közösségek emojijainak itteni használatához a(z) „{permissio
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Más közösségek matricáinak itteni használatához a(z) „{permissionLabel}” jogosultságra van szükséged."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Közösség létrehozása előtt be kell fejezned a fiókod regisztrációját."
@@ -41081,8 +41071,7 @@ msgstr "Közvetlen üzenetek küldéséhez be kell fejezned a fiókod regisztrá
msgid "You need to claim your account to send messages in this community."
msgstr "Ahhoz, hogy ebben a közösségben üzeneteket küldhess, be kell fejezned a fiókod regisztrációját."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Közösség létrehozása előtt meg kell erősítened az e-mail-címedet."
@@ -41483,7 +41472,6 @@ msgstr "A fiókod regisztrációja még nincs befejezve. E-mail-cím és jelszó
msgid "Your account is too new to send messages in this community."
msgstr "A fiókod túl új ahhoz, hogy üzeneteket küldj ebben a közösségben."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "A fiókkérelmed jóváhagyásra vár. Bejelentkezhetsz, miután egy admin jóváhagyta."
diff --git a/fluxer_app/src/features/i18n/locales/id/messages.po b/fluxer_app/src/features/i18n/locales/id/messages.po
index c35a5137a..dd167c60c 100644
--- a/fluxer_app/src/features/i18n/locales/id/messages.po
+++ b/fluxer_app/src/features/i18n/locales/id/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Beli hadiah {premiumProductName} dari tab {premiumProductName} untuk dib
msgid "Buy gift"
msgstr "Beli hadiah"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Dengan membuat komunitas, kamu setuju untuk mengikuti dan menjunjung tinggi <0>panduan komunitas {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Ubah nama panggilan grup"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Klaim hadiah"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Klaim akunmu"
@@ -9067,8 +9066,7 @@ msgstr "DM komunitas"
msgid "Community filter"
msgstr "Filter komunitas"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Ikon komunitas"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Kontrol gulir mulus bawaan untuk roda mouse dan keyboard di aplikasi desktop"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Kontrol perintah ucapan dan narasi untuk konten masuk."
@@ -11735,7 +11733,6 @@ msgstr "Tanggal dan waktu"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Pengaturan grup"
msgid "Group typing states"
msgstr "Status mengetik grup"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Grup diperbarui"
@@ -21548,7 +21544,6 @@ msgstr "Sebut semua orang atau peran apa pun di saluran ini (meskipun peran ters
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Daftarkan akun"
msgid "Registration"
msgstr "Pendaftaran"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Pendaftaran saat ini ditutup. Gunakan tautan pendaftaran dari admin untuk membuat akun."
@@ -28007,8 +28001,7 @@ msgstr "Hapus dari GIF favorit khusus URL"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Hapus ikon"
@@ -34467,7 +34460,6 @@ msgstr "Teks ke suara tidak didukung"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Notifikasi teks ke suara"
@@ -37943,8 +37935,7 @@ msgstr "Unggah file dan media di saluran ini."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Unggah ikon"
@@ -41063,8 +41054,7 @@ msgstr "Kamu memerlukan izin \"{permissionLabel}\" untuk menggunakan emoji dari
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Kamu memerlukan izin \"{permissionLabel}\" untuk menggunakan stiker dari komunitas lain di sini."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Kamu perlu mengklaim akunmu sebelum bisa membuat komunitas."
@@ -41081,8 +41071,7 @@ msgstr "Kamu perlu mengklaim akunmu untuk mengirim pesan langsung."
msgid "You need to claim your account to send messages in this community."
msgstr "Kamu perlu mengklaim akunmu untuk mengirim pesan di komunitas ini."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Kamu perlu memverifikasi alamat emailmu sebelum bisa membuat komunitas."
@@ -41483,7 +41472,6 @@ msgstr "Akunmu belum diklaim. Tanpa email dan kata sandi, kamu tidak bisa masuk
msgid "Your account is too new to send messages in this community."
msgstr "Akunmu terlalu baru untuk mengirim pesan di komunitas ini."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Permintaan akunmu menunggu persetujuan. Kamu dapat masuk setelah admin menyetujuinya."
diff --git a/fluxer_app/src/features/i18n/locales/it/messages.po b/fluxer_app/src/features/i18n/locales/it/messages.po
index 34fa2be0d..341d9bf19 100644
--- a/fluxer_app/src/features/i18n/locales/it/messages.po
+++ b/fluxer_app/src/features/i18n/locales/it/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Acquista un regalo {premiumProductName} dalla scheda {premiumProductName
msgid "Buy gift"
msgstr "Acquista regalo"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Creando una community, accetti di seguire e far rispettare le <0>linee guida della community di {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Cambia soprannome del gruppo"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Riscatta regalo"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Completa la registrazione del tuo account"
@@ -9067,8 +9066,7 @@ msgstr "DM della community"
msgid "Community filter"
msgstr "Filtro community"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Icona della community"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Controlla lo scorrimento fluido nativo con rotellina e tastiera nell'app desktop"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Controlla i comandi di sintesi vocale e la narrazione dei contenuti in arrivo."
@@ -11735,7 +11733,6 @@ msgstr "Data e ora"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Impostazioni gruppo"
msgid "Group typing states"
msgstr "Stati di digitazione del gruppo"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Gruppo aggiornato"
@@ -21548,7 +21544,6 @@ msgstr "Menziona tutti o qualsiasi ruolo in questo canale (anche se il ruolo non
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Registra un account"
msgid "Registration"
msgstr "Registrazione"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "La registrazione è attualmente chiusa. Usa un link di registrazione fornito da un amministratore per creare un account."
@@ -28007,8 +28001,7 @@ msgstr "Rimuovi dalle GIF preferite salvate solo tramite URL"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Rimuovi icona"
@@ -34467,7 +34460,6 @@ msgstr "Sintesi vocale non supportata"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Notifiche con sintesi vocale"
@@ -37943,8 +37935,7 @@ msgstr "Carica file e contenuti multimediali in questo canale."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Carica icona"
@@ -41063,8 +41054,7 @@ msgstr "Per usare le emoji di altre community qui, ti serve l'autorizzazione \"{
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Per usare gli sticker di altre community qui, ti serve il permesso \"{permissionLabel}\"."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Devi completare la registrazione del tuo account prima di poter creare una community."
@@ -41081,8 +41071,7 @@ msgstr "Devi completare la registrazione del tuo account per inviare messaggi di
msgid "You need to claim your account to send messages in this community."
msgstr "Devi completare la registrazione del tuo account per inviare messaggi in questa community."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Devi verificare il tuo indirizzo email prima di poter creare una community."
@@ -41483,7 +41472,6 @@ msgstr "Non hai ancora completato la registrazione del tuo account. Senza email
msgid "Your account is too new to send messages in this community."
msgstr "Il tuo account è troppo nuovo per inviare messaggi in questa community."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "La tua richiesta di account è in attesa di approvazione. Potrai accedere dopo l’approvazione di un amministratore."
diff --git a/fluxer_app/src/features/i18n/locales/ja/messages.po b/fluxer_app/src/features/i18n/locales/ja/messages.po
index 96fdfe41a..a9d7e4cd1 100644
--- a/fluxer_app/src/features/i18n/locales/ja/messages.po
+++ b/fluxer_app/src/features/i18n/locales/ja/messages.po
@@ -6511,8 +6511,7 @@ msgstr "{premiumProductName}タブから{premiumProductName}ギフトを購入
msgid "Buy gift"
msgstr "ギフトを購入"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "コミュニティを作成すると、<0>{PRODUCT_NAME}のコミュニティガイドライン</0>に従い、これを守ることに同意したことになります。"
@@ -7088,6 +7087,7 @@ msgstr "グループニックネームを変更"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "ギフトを受け取る"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "アカウントを登録"
@@ -9067,8 +9066,7 @@ msgstr "コミュニティDM"
msgid "Community filter"
msgstr "コミュニティフィルター"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "コミュニティアイコン"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "デスクトップアプリでのネイティブなスムーズホイールスクロールとキーボードスクロールを制御します"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "受信コンテンツの読み上げコマンドと自動読み上げを管理します。"
@@ -11735,7 +11733,6 @@ msgstr "日時"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "グループ設定"
msgid "Group typing states"
msgstr "グループの入力状況"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "グループを更新しました"
@@ -21548,7 +21544,6 @@ msgstr "このチャンネルの全員または任意のロールにメンショ
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "アカウントを登録"
msgid "Registration"
msgstr "登録"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "現在、登録は停止されています。アカウントを作成するには、管理者から受け取った登録リンクを使用してください。"
@@ -28007,8 +28001,7 @@ msgstr "URLのみで保存されたGIFをお気に入りから削除"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "アイコンを削除"
@@ -34467,7 +34460,6 @@ msgstr "テキスト読み上げはサポートされていません"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "テキスト読み上げ通知"
@@ -37943,8 +37935,7 @@ msgstr "このチャンネルにファイルやメディアをアップロード
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "アイコンをアップロード"
@@ -41063,8 +41054,7 @@ msgstr "他のコミュニティの絵文字をここで使用するには、「
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "他のコミュニティのスタンプをここで使用するには、「{permissionLabel}」の権限が必要です。"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "コミュニティを作成する前に、アカウントの登録が必要です。"
@@ -41081,8 +41071,7 @@ msgstr "ダイレクトメッセージを送信するには、アカウントの
msgid "You need to claim your account to send messages in this community."
msgstr "このコミュニティでメッセージを送信するには、アカウントの登録が必要です。"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "コミュニティを作成する前に、メールアドレスの確認が必要です。"
@@ -41483,7 +41472,6 @@ msgstr "アカウントが未登録です。メールアドレスとパスワー
msgid "Your account is too new to send messages in this community."
msgstr "アカウント作成から間もないため、このコミュニティではメッセージを送信できません。"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "アカウント申請は承認待ちです。管理者が承認するとサインインできます。"
diff --git a/fluxer_app/src/features/i18n/locales/ko/messages.po b/fluxer_app/src/features/i18n/locales/ko/messages.po
index fb914f285..998ad381e 100644
--- a/fluxer_app/src/features/i18n/locales/ko/messages.po
+++ b/fluxer_app/src/features/i18n/locales/ko/messages.po
@@ -6511,8 +6511,7 @@ msgstr "친구와 공유하려면 {premiumProductName} 탭에서 {premiumProduct
msgid "Buy gift"
msgstr "선물 구매"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "커뮤니티를 생성하면 <0>{PRODUCT_NAME} 커뮤니티 가이드라인</0>을 따르고 준수하는 데 동의하는 것입니다."
@@ -7088,6 +7087,7 @@ msgstr "그룹 닉네임 변경"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "선물 받기"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "계정 등록하기"
@@ -9067,8 +9066,7 @@ msgstr "커뮤니티 DM"
msgid "Community filter"
msgstr "커뮤니티 필터"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "커뮤니티 아이콘"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "데스크톱 앱에서 기본 부드러운 휠 및 키보드 스크롤을 제어합니다"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "수신 콘텐츠에 대한 음성 명령 및 내레이션을 제어합니다."
@@ -11735,7 +11733,6 @@ msgstr "날짜 및 시간"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "그룹 설정"
msgid "Group typing states"
msgstr "그룹 입력 중 상태"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "그룹이 업데이트되었습니다"
@@ -21548,7 +21544,6 @@ msgstr "이 채널에서 모든 사람 또는 역할을 멘션할 수 있습니
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "계정 등록"
msgid "Registration"
msgstr "가입"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "현재 가입이 닫혀 있습니다. 계정을 만들려면 관리자가 제공한 가입 링크를 사용하세요."
@@ -28007,8 +28001,7 @@ msgstr "URL 전용 GIF 즐겨찾기에서 제거"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "아이콘 삭제"
@@ -34467,7 +34460,6 @@ msgstr "텍스트 음성 변환 미지원"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "텍스트 음성 변환 알림"
@@ -37943,8 +37935,7 @@ msgstr "이 채널에 파일 및 미디어를 업로드합니다."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "아이콘 업로드"
@@ -41063,8 +41054,7 @@ msgstr "여기에서 다른 커뮤니티의 이모티콘을 사용하려면 \"{p
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "여기에서 다른 커뮤니티의 스티커를 사용하려면 \"{permissionLabel}\" 권한이 필요합니다."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "커뮤니티를 만들려면 먼저 계정을 등록해야 합니다."
@@ -41081,8 +41071,7 @@ msgstr "DM을 보내려면 계정을 등록해야 합니다."
msgid "You need to claim your account to send messages in this community."
msgstr "이 커뮤니티에서 메시지를 보내려면 계정을 등록해야 합니다."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "커뮤니티를 만들려면 먼저 이메일 주소를 인증해야 합니다."
@@ -41483,7 +41472,6 @@ msgstr "아직 계정이 등록되지 않았습니다. 이메일과 비밀번호
msgid "Your account is too new to send messages in this community."
msgstr "계정을 만든 지 얼마 되지 않아 이 커뮤니티에서 메시지를 보낼 수 없습니다."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "계정 요청이 승인 대기 중입니다. 관리자가 승인한 후 로그인할 수 있습니다."
diff --git a/fluxer_app/src/features/i18n/locales/lt/messages.po b/fluxer_app/src/features/i18n/locales/lt/messages.po
index 3fc084703..45c45e816 100644
--- a/fluxer_app/src/features/i18n/locales/lt/messages.po
+++ b/fluxer_app/src/features/i18n/locales/lt/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Įsigykite {premiumProductName} dovaną skirtuke „{premiumProductName}
msgid "Buy gift"
msgstr "Pirkti dovaną"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Kurdami bendruomenę, sutinkate laikytis <0>{PRODUCT_NAME} bendruomenės gairių</0>."
@@ -7088,6 +7087,7 @@ msgstr "Keisti grupės slapyvardį"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Atsiimti dovaną"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Užregistruokite paskyrą"
@@ -9067,8 +9066,7 @@ msgstr "Bendruomenės DM"
msgid "Community filter"
msgstr "Bendruomenės filtras"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Bendruomenės piktograma"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Valdykite sklandų ratuko ir klaviatūros slinkimą darbalaukio programoje"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Valdykite kalbos komandas ir gaunamo turinio skaitymą balsu."
@@ -11735,7 +11733,6 @@ msgstr "Data ir laikas"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Grupės nustatymai"
msgid "Group typing states"
msgstr "Grupės rašymo būsenos"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Grupė atnaujinta"
@@ -21549,7 +21545,6 @@ msgstr "Paminėti visus arba bet kokį vaidmenį šiame kanale (net jei vaidmuo
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27730,7 +27725,6 @@ msgstr "Registruoti paskyrą"
msgid "Registration"
msgstr "Registracija"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Registracija šiuo metu uždaryta. Norėdami sukurti paskyrą, naudokite administratoriaus suteiktą registracijos nuorodą."
@@ -28008,8 +28002,7 @@ msgstr "Pašalinti iš mėgstamiausių GIF (tik URL)"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Pašalinti piktogramą"
@@ -34468,7 +34461,6 @@ msgstr "Teksto į kalbą funkcija nepalaikoma"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Teksto į kalbą pranešimai"
@@ -37944,8 +37936,7 @@ msgstr "Įkelkite failus ir mediją į šį kanalą."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Įkelti piktogramą"
@@ -41064,8 +41055,7 @@ msgstr "Norėdami čia naudoti jaustukus iš kitų bendruomenių, turite turėti
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Norėdami čia naudoti lipdukus iš kitų bendruomenių, turite turėti leidimą „{permissionLabel}“."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Prieš kurdami bendruomenę turite užregistruoti savo paskyrą."
@@ -41082,8 +41072,7 @@ msgstr "Kad galėtumėte siųsti tiesiogines žinutes, turite užregistruoti sav
msgid "You need to claim your account to send messages in this community."
msgstr "Kad galėtumėte siųsti žinutes šioje bendruomenėje, turite užregistruoti savo paskyrą."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Prieš kurdami bendruomenę, turite patvirtinti savo el. pašto adresą."
@@ -41484,7 +41473,6 @@ msgstr "Jūsų paskyra dar neužregistruota. Be el. pašto ir slaptažodžio neg
msgid "Your account is too new to send messages in this community."
msgstr "Jūsų paskyra per nauja, kad galėtų siųsti žinutes šioje bendruomenėje."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Jūsų paskyros užklausa laukia patvirtinimo. Prisijungti galėsite, kai administratorius ją patvirtins."
diff --git a/fluxer_app/src/features/i18n/locales/nl/messages.po b/fluxer_app/src/features/i18n/locales/nl/messages.po
index 6a19d9417..2a513c8f9 100644
--- a/fluxer_app/src/features/i18n/locales/nl/messages.po
+++ b/fluxer_app/src/features/i18n/locales/nl/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Koop een {premiumProductName}-cadeau via het tabblad {premiumProductName
msgid "Buy gift"
msgstr "Cadeau kopen"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Door een community aan te maken, ga je akkoord met het volgen en naleven van de <0>communityrichtlijnen van {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Groepsbijnaam wijzigen"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Cadeau inwisselen"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Voltooi de registratie van je account"
@@ -9067,8 +9066,7 @@ msgstr "Community-DM"
msgid "Community filter"
msgstr "Communityfilter"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Communitypictogram"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Regel vloeiend scrollen met het muiswiel en toetsenbord via de ingebouwde browserfunctie in de desktopapp"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Beheer spraakopdrachten en het voorlezen van binnenkomende inhoud."
@@ -11735,7 +11733,6 @@ msgstr "Datum en tijd"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Groepsinstellingen"
msgid "Group typing states"
msgstr "Typestatussen in groepen"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Groep bijgewerkt"
@@ -21548,7 +21544,6 @@ msgstr "Vermeld iedereen of een rol in dit kanaal (zelfs als de rol niet als ver
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Registreer een account"
msgid "Registration"
msgstr "Registratie"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Registratie is momenteel gesloten. Gebruik een registratielink van een beheerder om een account aan te maken."
@@ -28007,8 +28001,7 @@ msgstr "Verwijderen uit URL-gebaseerde GIF-favorieten"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Pictogram verwijderen"
@@ -34467,7 +34460,6 @@ msgstr "Tekst-naar-spraak niet ondersteund"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Tekst-naar-spraakmeldingen"
@@ -37943,8 +37935,7 @@ msgstr "Upload bestanden en media in dit kanaal."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Pictogram uploaden"
@@ -41063,8 +41054,7 @@ msgstr "Je hebt de machtiging \"{permissionLabel}\" nodig om hier emoji uit ande
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Je hebt de \"{permissionLabel}\"-machtiging nodig om hier stickers van andere communities te gebruiken."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Je moet de registratie van je account voltooien voordat je een community kunt aanmaken."
@@ -41081,8 +41071,7 @@ msgstr "Je moet de registratie van je account voltooien om privéberichten te ku
msgid "You need to claim your account to send messages in this community."
msgstr "Je moet de registratie van je account voltooien om berichten in deze community te kunnen versturen."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Je moet je e-mailadres verifiëren voordat je een community kunt aanmaken."
@@ -41483,7 +41472,6 @@ msgstr "De registratie van je account is nog niet voltooid. Zonder e-mailadres e
msgid "Your account is too new to send messages in this community."
msgstr "Je account is te nieuw om berichten te versturen in deze community."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Je accountaanvraag wacht op goedkeuring. Je kunt inloggen nadat een beheerder deze heeft goedgekeurd."
diff --git a/fluxer_app/src/features/i18n/locales/no/messages.po b/fluxer_app/src/features/i18n/locales/no/messages.po
index 593a5cf9e..f7c18b7fb 100644
--- a/fluxer_app/src/features/i18n/locales/no/messages.po
+++ b/fluxer_app/src/features/i18n/locales/no/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Kjøp en {premiumProductName}-gave fra {premiumProductName}-fanen for å
msgid "Buy gift"
msgstr "Kjøp gave"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Ved å opprette et fellesskap godtar du å følge og overholde <0>retningslinjene for {PRODUCT_NAME}-fellesskapet</0>."
@@ -7088,6 +7087,7 @@ msgstr "Endre kallenavn i gruppen"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Hent gave"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Fullfør registreringen av kontoen din"
@@ -9067,8 +9066,7 @@ msgstr "Fellesskaps-DM"
msgid "Community filter"
msgstr "Fellesskapsfilter"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Fellesskapsikon"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Kontroller jevn rulling med hjul og tastatur i skrivebordsappen"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Styr talekommandoer og opplesing for innkommende innhold."
@@ -11735,7 +11733,6 @@ msgstr "Dato og tid"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Gruppeinnstillinger"
msgid "Group typing states"
msgstr "Gruppens skriveindikatorer"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Gruppe oppdatert"
@@ -21548,7 +21544,6 @@ msgstr "Omtal alle eller en hvilken som helst rolle i denne kanalen (selv om rol
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Registrer en konto"
msgid "Registration"
msgstr "Registrering"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Registrering er stengt for øyeblikket. Bruk en registreringslenke fra en administrator for å opprette en konto."
@@ -28007,8 +28001,7 @@ msgstr "Fjern fra URL-baserte GIF-favoritter"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Fjern ikon"
@@ -34467,7 +34460,6 @@ msgstr "Tekst-til-tale støttes ikke"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Tekst-til-tale-varsler"
@@ -37943,8 +37935,7 @@ msgstr "Last opp filer og medier i denne kanalen."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Last opp ikon"
@@ -41063,8 +41054,7 @@ msgstr "Du trenger tillatelsen «{permissionLabel}» for å bruke emojier fra an
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Du trenger tillatelsen «{permissionLabel}» for å bruke klistremerker fra andre fellesskap her."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Du må fullføre registreringen av kontoen din før du kan opprette et fellesskap."
@@ -41081,8 +41071,7 @@ msgstr "Du må fullføre registreringen av kontoen din for å sende direktemeldi
msgid "You need to claim your account to send messages in this community."
msgstr "Du må fullføre registreringen av kontoen din for å sende meldinger i dette fellesskapet."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Du må bekrefte e-postadressen din før du kan opprette et fellesskap."
@@ -41483,7 +41472,6 @@ msgstr "Du har ikke fullført registreringen av kontoen din ennå. Uten e-postad
msgid "Your account is too new to send messages in this community."
msgstr "Kontoen din er for ny til å sende meldinger i dette fellesskapet."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Kontoforespørselen din venter på godkjenning. Du kan logge på når en administrator har godkjent den."
diff --git a/fluxer_app/src/features/i18n/locales/pl/messages.po b/fluxer_app/src/features/i18n/locales/pl/messages.po
index 3a54d3b26..a4fc5d885 100644
--- a/fluxer_app/src/features/i18n/locales/pl/messages.po
+++ b/fluxer_app/src/features/i18n/locales/pl/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Kup prezent {premiumProductName} w zakładce {premiumProductName}, aby p
msgid "Buy gift"
msgstr "Kup prezent"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Tworząc społeczność, zobowiązujesz się do przestrzegania i egzekwowania <0>zasad społeczności {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Zmień pseudonim w grupie"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Odbierz prezent"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Dokończ rejestrację swojego konta"
@@ -9067,8 +9066,7 @@ msgstr "Wiadomości prywatne od członków społeczności"
msgid "Community filter"
msgstr "Filtr społeczności"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Ikona społeczności"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Kontroluj natywne płynne przewijanie kółkiem myszy i klawiaturą w aplikacji komputerowej"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Steruj poleceniami zamiany tekstu na mowę i odczytywaniem przychodzących treści."
@@ -11735,7 +11733,6 @@ msgstr "Data i godzina"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Ustawienia grupy"
msgid "Group typing states"
msgstr "Stany pisania w grupie"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Grupa zaktualizowana"
@@ -21548,7 +21544,6 @@ msgstr "Wspominaj wszystkich lub dowolną rolę w tym kanale, nawet jeśli nie w
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Zarejestruj konto"
msgid "Registration"
msgstr "Rejestracja"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Rejestracja jest obecnie zamknięta. Aby utworzyć konto, użyj linku rejestracyjnego od administratora."
@@ -28007,8 +28001,7 @@ msgstr "Usuń z ulubionych GIF-ów zapisanych na podstawie adresu URL"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Usuń ikonę"
@@ -34467,7 +34460,6 @@ msgstr "Funkcja zamiany tekstu na mowę nie jest obsługiwana"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Powiadomienia odczytywane na głos"
@@ -37943,8 +37935,7 @@ msgstr "Przesyłaj pliki i multimedia na ten kanał."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Prześlij ikonę"
@@ -41063,8 +41054,7 @@ msgstr "Potrzebujesz uprawnienia „{permissionLabel}”, aby używać tutaj emo
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Aby używać naklejek z innych społeczności, potrzebujesz uprawnienia „{permissionLabel}”."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Musisz dokończyć rejestrację konta, zanim utworzysz społeczność."
@@ -41081,8 +41071,7 @@ msgstr "Musisz dokończyć rejestrację konta, aby wysyłać wiadomości prywatn
msgid "You need to claim your account to send messages in this community."
msgstr "Musisz dokończyć rejestrację konta, aby wysyłać wiadomości w tej społeczności."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Musisz zweryfikować swój adres e-mail, zanim utworzysz społeczność."
@@ -41483,7 +41472,6 @@ msgstr "Rejestracja Twojego konta nie została jeszcze dokończona. Bez adresu e
msgid "Your account is too new to send messages in this community."
msgstr "Twoje konto jest zbyt nowe, by wysyłać wiadomości w tej społeczności."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Twoja prośba o konto oczekuje na zatwierdzenie. Możesz się zalogować po zatwierdzeniu jej przez administratora."
diff --git a/fluxer_app/src/features/i18n/locales/pt-BR/messages.po b/fluxer_app/src/features/i18n/locales/pt-BR/messages.po
index fc0e33d07..9e32d4713 100644
--- a/fluxer_app/src/features/i18n/locales/pt-BR/messages.po
+++ b/fluxer_app/src/features/i18n/locales/pt-BR/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Compre um presente {premiumProductName} na aba {premiumProductName} para
msgid "Buy gift"
msgstr "Comprar presente"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Ao criar uma comunidade, você concorda em seguir e fazer cumprir as <0>diretrizes da comunidade do {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Alterar apelido do grupo"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Resgatar presente"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Reivindique sua conta"
@@ -9067,8 +9066,7 @@ msgstr "Mensagem direta da comunidade"
msgid "Community filter"
msgstr "Filtro da comunidade"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Ícone da comunidade"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Controla a rolagem suave nativa com a roda do mouse e o teclado no aplicativo para computador"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Controle os comandos de voz e a narração para o conteúdo recebido."
@@ -11735,7 +11733,6 @@ msgstr "Data e hora"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Configurações do grupo"
msgid "Group typing states"
msgstr "Status de digitação do grupo"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Grupo atualizado"
@@ -21548,7 +21544,6 @@ msgstr "Mencionar todos ou qualquer cargo neste canal (mesmo que o cargo não es
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Registrar uma conta"
msgid "Registration"
msgstr "Cadastro"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "O cadastro está fechado no momento. Use um link de cadastro de um administrador para criar uma conta."
@@ -28007,8 +28001,7 @@ msgstr "Remover dos GIFs favoritos salvos por URL"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Remover ícone"
@@ -34467,7 +34460,6 @@ msgstr "Conversão de texto em fala não é compatível"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Notificações de conversão de texto em fala"
@@ -37943,8 +37935,7 @@ msgstr "Envie arquivos e mídias neste canal."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Enviar ícone"
@@ -41063,8 +41054,7 @@ msgstr "Você precisa da permissão \"{permissionLabel}\" para usar emojis de ou
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Você precisa da permissão \"{permissionLabel}\" para usar figurinhas de outras comunidades aqui."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Você precisa reivindicar sua conta antes de criar uma comunidade."
@@ -41081,8 +41071,7 @@ msgstr "Você precisa reivindicar sua conta para enviar mensagens diretas."
msgid "You need to claim your account to send messages in this community."
msgstr "Você precisa reivindicar sua conta para enviar mensagens nesta comunidade."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Você precisa verificar seu endereço de e-mail antes de criar uma comunidade."
@@ -41483,7 +41472,6 @@ msgstr "Sua conta ainda não foi reivindicada. Sem um e-mail e senha, você não
msgid "Your account is too new to send messages in this community."
msgstr "Sua conta é muito nova para enviar mensagens nesta comunidade."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Sua solicitação de conta está aguardando aprovação. Você poderá entrar depois que um administrador aprová-la."
diff --git a/fluxer_app/src/features/i18n/locales/ro/messages.po b/fluxer_app/src/features/i18n/locales/ro/messages.po
index d1b428eee..6474df859 100644
--- a/fluxer_app/src/features/i18n/locales/ro/messages.po
+++ b/fluxer_app/src/features/i18n/locales/ro/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Cumpără un cadou {premiumProductName} din fila {premiumProductName} pe
msgid "Buy gift"
msgstr "Cumpără cadou"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Prin crearea unei comunități, ești de acord să respecți și să susții <0>regulile comunității {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Schimbă pseudonimul în grup"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Revendică cadoul"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Revendică-ți contul"
@@ -9067,8 +9066,7 @@ msgstr "DM comunitate"
msgid "Community filter"
msgstr "Filtru de comunități"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Pictogramă comunitate"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Controlează derularea lină nativă cu rotița mouse-ului și tastatura în aplicația desktop"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Controlează comenzile vocale și nararea pentru conținutul primit."
@@ -11735,7 +11733,6 @@ msgstr "Data și ora"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Setări grup"
msgid "Group typing states"
msgstr "Stări de tastare în grup"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Grup actualizat"
@@ -21548,7 +21544,6 @@ msgstr "Menționează pe toată lumea sau orice rol din acest canal (chiar dacă
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Înregistrează un cont"
msgid "Registration"
msgstr "Înregistrare"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Înregistrarea este închisă momentan. Folosește un link de înregistrare de la un administrator pentru a crea un cont."
@@ -28007,8 +28001,7 @@ msgstr "Elimină din favoritele GIF salvate doar prin URL"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Elimină pictograma"
@@ -34467,7 +34460,6 @@ msgstr "Text în vorbire neacceptat"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Notificări text în vorbire"
@@ -37943,8 +37935,7 @@ msgstr "Încarcă fișiere și media în acest canal."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Încarcă pictogramă"
@@ -41063,8 +41054,7 @@ msgstr "Ai nevoie de permisiunea „{permissionLabel}” pentru a folosi emoji d
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Ai nevoie de permisiunea „{permissionLabel}” pentru a folosi stickere din alte comunități aici."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Trebuie să-ți revendici contul înainte de a putea crea o comunitate."
@@ -41081,8 +41071,7 @@ msgstr "Trebuie să-ți revendici contul pentru a trimite mesaje directe."
msgid "You need to claim your account to send messages in this community."
msgstr "Trebuie să-ți revendici contul pentru a trimite mesaje în această comunitate."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Trebuie să-ți verifici adresa de e-mail înainte de a putea crea o comunitate."
@@ -41483,7 +41472,6 @@ msgstr "Contul tău nu a fost revendicat încă. Fără o adresă de e-mail și
msgid "Your account is too new to send messages in this community."
msgstr "Contul tău este prea nou pentru a trimite mesaje în această comunitate."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Solicitarea ta de cont așteaptă aprobare. Te poți conecta după ce un administrator o aprobă."
diff --git a/fluxer_app/src/features/i18n/locales/ru/messages.po b/fluxer_app/src/features/i18n/locales/ru/messages.po
index 3b8e3fdf8..cfcdf5fd5 100644
--- a/fluxer_app/src/features/i18n/locales/ru/messages.po
+++ b/fluxer_app/src/features/i18n/locales/ru/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Купите подарок {premiumProductName} на вкладке {pr
msgid "Buy gift"
msgstr "Купить подарок"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Создавая сообщество, вы соглашаетесь соблюдать <0>правила сообщества {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Изменить никнейм в группе"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Забрать подарок"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Подтвердите аккаунт"
@@ -9067,8 +9066,7 @@ msgstr "Личные сообщения из сообществ"
msgid "Community filter"
msgstr "Фильтр сообществ"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Значок сообщества"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Управление плавной прокруткой колесом мыши и клавиатурой в приложении для ПК"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Управление голосовыми командами и озвучиванием входящего контента."
@@ -11735,7 +11733,6 @@ msgstr "Дата и время"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Настройки группы"
msgid "Group typing states"
msgstr "Статусы набора в группах"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Группа обновлена"
@@ -21548,7 +21544,6 @@ msgstr "Упоминать всех или любую роль в этом ка
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Зарегистрировать аккаунт"
msgid "Registration"
msgstr "Регистрация"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Регистрация сейчас закрыта. Чтобы создать аккаунт, используйте регистрационную ссылку от администратора."
@@ -28007,8 +28001,7 @@ msgstr "Удалить из избранных GIF (только по URL)"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Удалить значок"
@@ -34467,7 +34460,6 @@ msgstr "Преобразование текста в речь не поддер
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Озвучивание уведомлений"
@@ -37943,8 +37935,7 @@ msgstr "Загружать файлы и медиа в этом канале."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Загрузить значок"
@@ -41063,8 +41054,7 @@ msgstr "Чтобы использовать здесь эмодзи из дру
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Чтобы использовать здесь стикеры из других сообществ, вам нужно разрешение «{permissionLabel}»."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Чтобы создать сообщество, нужно сначала подтвердить аккаунт."
@@ -41081,8 +41071,7 @@ msgstr "Чтобы отправлять личные сообщения, нуж
msgid "You need to claim your account to send messages in this community."
msgstr "Чтобы отправлять сообщения в этом сообществе, нужно подтвердить аккаунт."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Чтобы создать сообщество, подтвердите адрес электронной почты."
@@ -41483,7 +41472,6 @@ msgstr "Ваш аккаунт ещё не подтверждён. Без эле
msgid "Your account is too new to send messages in this community."
msgstr "Ваш аккаунт слишком новый, чтобы отправлять сообщения в этом сообществе."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Ваш запрос на создание аккаунта ожидает одобрения. Вы сможете войти после одобрения администратором."
diff --git a/fluxer_app/src/features/i18n/locales/sv-SE/messages.po b/fluxer_app/src/features/i18n/locales/sv-SE/messages.po
index e68ee587f..c33ce710f 100644
--- a/fluxer_app/src/features/i18n/locales/sv-SE/messages.po
+++ b/fluxer_app/src/features/i18n/locales/sv-SE/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Köp en {premiumProductName}-present på fliken {premiumProductName} fö
msgid "Buy gift"
msgstr "Köp present"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Genom att skapa en community godkänner du att följa och upprätthålla <0>{PRODUCT_NAME}s communityriktlinjer</0>."
@@ -7088,6 +7087,7 @@ msgstr "Ändra gruppsmeknamn"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Lös in present"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Säkra ditt konto"
@@ -9067,8 +9066,7 @@ msgstr "DM för community"
msgid "Community filter"
msgstr "Communityfilter"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Communityikon"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Styr mjuk rullning med mushjul och tangentbord i datorappen"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Styr röstkommandon och uppläsning för inkommande innehåll."
@@ -11735,7 +11733,6 @@ msgstr "Datum och tid"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Gruppinställningar"
msgid "Group typing states"
msgstr "Gruppens skrivindikationer"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Gruppen uppdaterad"
@@ -21548,7 +21544,6 @@ msgstr "Nämn alla eller en valfri roll i den här kanalen (även om rollen inte
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Registrera ett konto"
msgid "Registration"
msgstr "Registrering"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Registreringen är för närvarande stängd. Använd en registreringslänk från en administratör för att skapa ett konto."
@@ -28007,8 +28001,7 @@ msgstr "Ta bort från URL-baserade GIF-favoriter"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Ta bort ikon"
@@ -34467,7 +34460,6 @@ msgstr "Text till tal stöds inte"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Text-till-tal-aviseringar"
@@ -37943,8 +37935,7 @@ msgstr "Ladda upp filer och medier i den här kanalen."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Ladda upp ikon"
@@ -41063,8 +41054,7 @@ msgstr "Du behöver behörigheten ”{permissionLabel}” för att använda emoj
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Du behöver behörigheten ”{permissionLabel}” för att använda klistermärken från andra communities här."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Du måste säkra ditt konto innan du kan skapa en community."
@@ -41081,8 +41071,7 @@ msgstr "Du måste säkra ditt konto för att skicka direktmeddelanden."
msgid "You need to claim your account to send messages in this community."
msgstr "Du måste säkra ditt konto för att skicka meddelanden i den här communityn."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Du måste verifiera din e-postadress innan du kan skapa en community."
@@ -41483,7 +41472,6 @@ msgstr "Ditt konto är ännu inte säkrat. Utan e-postadress och lösenord kan d
msgid "Your account is too new to send messages in this community."
msgstr "Ditt konto är för nytt för att skicka meddelanden i den här communityn."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Din kontobegäran väntar på godkännande. Du kan logga in efter att en administratör har godkänt den."
diff --git a/fluxer_app/src/features/i18n/locales/th/messages.po b/fluxer_app/src/features/i18n/locales/th/messages.po
index 006531148..143039711 100644
--- a/fluxer_app/src/features/i18n/locales/th/messages.po
+++ b/fluxer_app/src/features/i18n/locales/th/messages.po
@@ -6511,8 +6511,7 @@ msgstr "ซื้อของขวัญ {premiumProductName} จากแท
msgid "Buy gift"
msgstr "ซื้อของขวัญ"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "การสร้างคอมมูนิตี้แสดงว่าคุณยอมรับที่จะปฏิบัติตามและรักษา<0>หลักเกณฑ์คอมมูนิตี้ของ {PRODUCT_NAME}</0>"
@@ -7088,6 +7087,7 @@ msgstr "เปลี่ยนชื่อเล่นกลุ่ม"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "รับของขวัญ"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "ยืนยันบัญชีของคุณ"
@@ -9067,8 +9066,7 @@ msgstr "DM คอมมูนิตี้"
msgid "Community filter"
msgstr "ตัวกรองคอมมูนิตี้"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "ไอคอนคอมมูนิตี้"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "ควบคุมการเลื่อนด้วยล้อเลื่อนและคีย์บอร์ดแบบเนียนในแอปเดสก์ท็อป"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "ควบคุมคำสั่งเสียงและการบรรยายสำหรับเนื้อหาที่เข้ามา"
@@ -11735,7 +11733,6 @@ msgstr "วันและเวลา"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "ตั้งค่ากลุ่ม"
msgid "Group typing states"
msgstr "สถานะกำลังพิมพ์ของกลุ่ม"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "อัปเดตกลุ่มแล้ว"
@@ -21548,7 +21544,6 @@ msgstr "กล่าวถึงทุกคนหรือทุกบทบา
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "ลงทะเบียนบัญชี"
msgid "Registration"
msgstr "การลงทะเบียน"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "ขณะนี้ปิดการลงทะเบียนอยู่ ใช้ลิงก์ลงทะเบียนจากผู้ดูแลระบบเพื่อสร้างบัญชี"
@@ -28007,8 +28001,7 @@ msgstr "นำออกจาก GIF รายการโปรด (เฉพ
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "ลบไอคอน"
@@ -34467,7 +34460,6 @@ msgstr "ไม่รองรับการอ่านออกเสียง
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "การแจ้งเตือนแบบอ่านออกเสียงข้อความ"
@@ -37943,8 +37935,7 @@ msgstr "อัปโหลดไฟล์และสื่อในช่อง
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "อัปโหลดไอคอน"
@@ -41063,8 +41054,7 @@ msgstr "คุณต้องมีสิทธิ์ \"{permissionLabel}\" เ
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "คุณต้องมีสิทธิ์ \"{permissionLabel}\" เพื่อใช้สติกเกอร์จากคอมมูนิตี้อื่นที่นี่"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "คุณต้องยืนยันบัญชีก่อนจึงจะสร้างคอมมูนิตี้ได้"
@@ -41081,8 +41071,7 @@ msgstr "คุณต้องยืนยันบัญชีก่อนจึ
msgid "You need to claim your account to send messages in this community."
msgstr "คุณต้องยืนยันบัญชีก่อนจึงจะส่งข้อความในคอมมูนิตี้นี้ได้"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "คุณต้องยืนยันอีเมลก่อนจึงจะสร้างคอมมูนิตี้ได้"
@@ -41483,7 +41472,6 @@ msgstr "บัญชีของคุณยังไม่ได้ยืนย
msgid "Your account is too new to send messages in this community."
msgstr "บัญชีของคุณใหม่เกินไปที่จะส่งข้อความในคอมมูนิตี้นี้"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "คำขอบัญชีของคุณกำลังรอการอนุมัติ คุณจะลงชื่อเข้าใช้ได้หลังจากผู้ดูแลระบบอนุมัติแล้ว"
diff --git a/fluxer_app/src/features/i18n/locales/tr/messages.po b/fluxer_app/src/features/i18n/locales/tr/messages.po
index 76de6b1b5..68c71c5d4 100644
--- a/fluxer_app/src/features/i18n/locales/tr/messages.po
+++ b/fluxer_app/src/features/i18n/locales/tr/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Arkadaşlarınızla paylaşmak için {premiumProductName} sekmesinden bi
msgid "Buy gift"
msgstr "Hediye satın al"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Bir topluluk oluşturarak <0>{PRODUCT_NAME} Topluluk Kurallarına</0> uymayı ve bunları sürdürmeyi kabul etmiş olursunuz."
@@ -7088,6 +7087,7 @@ msgstr "Grup takma adını değiştir"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Hediyeyi al"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Hesabınızı sahiplenin"
@@ -9067,8 +9066,7 @@ msgstr "Topluluk DM'i"
msgid "Community filter"
msgstr "Topluluk filtresi"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Topluluk simgesi"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Masaüstü uygulamasında yerel akıcı tekerlek ve klavye kaydırmasını kontrol edin"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Gelen içerik için konuşma komutlarını ve anlatımı kontrol edin."
@@ -11735,7 +11733,6 @@ msgstr "Tarih ve saat"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Grup ayarları"
msgid "Group typing states"
msgstr "Grup yazma durumları"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Grup güncellendi"
@@ -21548,7 +21544,6 @@ msgstr "Bu kanalda herkesten veya herhangi bir rolden bahset (rol bahsedilebilir
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Hesap oluştur"
msgid "Registration"
msgstr "Kayıt"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Kayıt şu anda kapalı. Hesap oluşturmak için bir yöneticiden aldığınız kayıt bağlantısını kullanın."
@@ -28007,8 +28001,7 @@ msgstr "Yalnızca URL'den kaydedilen GIF favorilerinden kaldır"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Simgeyi kaldır"
@@ -34467,7 +34460,6 @@ msgstr "Metin okuma desteklenmiyor"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Metin okuma bildirimleri"
@@ -37943,8 +37935,7 @@ msgstr "Bu kanalda dosya ve medya yükleyin."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Simge yükle"
@@ -41063,8 +41054,7 @@ msgstr "Burada diğer topluluklardan emoji kullanmak için \"{permissionLabel}\"
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Burada diğer topluluklardan çıkartma kullanmak için \"{permissionLabel}\" iznine sahip olmanız gerekir."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Topluluk oluşturmadan önce hesabınızı sahiplenmeniz gerekiyor."
@@ -41081,8 +41071,7 @@ msgstr "Doğrudan mesaj göndermek için hesabınızı sahiplenmeniz gerekiyor."
msgid "You need to claim your account to send messages in this community."
msgstr "Bu toplulukta mesaj göndermek için hesabınızı sahiplenmeniz gerekiyor."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Bir topluluk oluşturmadan önce e-posta adresinizi doğrulamanız gerekiyor."
@@ -41483,7 +41472,6 @@ msgstr "Hesabınız henüz sahiplenilmedi. E-posta ve parola olmadan başka ciha
msgid "Your account is too new to send messages in this community."
msgstr "Bu toplulukta mesaj göndermek için hesabınız çok yeni."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Hesap isteğiniz onay bekliyor. Bir yönetici onayladıktan sonra oturum açabilirsiniz."
diff --git a/fluxer_app/src/features/i18n/locales/uk/messages.po b/fluxer_app/src/features/i18n/locales/uk/messages.po
index b3d1bfa74..e502c99b3 100644
--- a/fluxer_app/src/features/i18n/locales/uk/messages.po
+++ b/fluxer_app/src/features/i18n/locales/uk/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Придбайте подарунок {premiumProductName} на вкла
msgid "Buy gift"
msgstr "Купити подарунок"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Створюючи спільноту, ви погоджуєтеся дотримуватися <0>правил спільноти {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Змінити псевдонім у групі"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Отримати подарунок"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Зареєструйте свій обліковий запис"
@@ -9067,8 +9066,7 @@ msgstr "Особисті повідомлення спільноти"
msgid "Community filter"
msgstr "Фільтр спільноти"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Іконка спільноти"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Керування плавним прокручуванням коліщатком миші та клавіатурою в десктопному застосунку"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Керуйте голосовими командами та озвученням вхідного вмісту."
@@ -11735,7 +11733,6 @@ msgstr "Дата й час"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Налаштування групи"
msgid "Group typing states"
msgstr "Стани набору в групі"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Групу оновлено"
@@ -21548,7 +21544,6 @@ msgstr "Згадувати всіх або будь-яку роль у цьом
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Зареєструвати обліковий запис"
msgid "Registration"
msgstr "Реєстрація"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Реєстрацію зараз закрито. Щоб створити обліковий запис, скористайтеся реєстраційним посиланням від адміністратора."
@@ -28007,8 +28001,7 @@ msgstr "Видалити з вибраних GIF за URL-адресою"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Видалити іконку"
@@ -34467,7 +34460,6 @@ msgstr "Перетворення тексту на мовлення не під
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Озвучення сповіщень"
@@ -37943,8 +37935,7 @@ msgstr "Завантажувати файли та медіа в цьому ка
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Завантажити іконку"
@@ -41063,8 +41054,7 @@ msgstr "Щоб використовувати тут емодзі з інших
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Щоб використовувати тут стікери з інших спільнот, вам потрібен дозвіл «{permissionLabel}»."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Щоб створити спільноту, потрібно зареєструвати свій обліковий запис."
@@ -41081,8 +41071,7 @@ msgstr "Щоб надсилати особисті повідомлення, п
msgid "You need to claim your account to send messages in this community."
msgstr "Щоб надсилати повідомлення в цій спільноті, потрібно зареєструвати свій обліковий запис."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Щоб створити спільноту, потрібно підтвердити свою електронну адресу."
@@ -41483,7 +41472,6 @@ msgstr "Ваш обліковий запис ще не зареєстрован
msgid "Your account is too new to send messages in this community."
msgstr "Ваш обліковий запис занадто новий, щоб надсилати повідомлення в цій спільноті."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Ваш запит на обліковий запис очікує схвалення. Ви зможете ввійти після схвалення адміністратором."
diff --git a/fluxer_app/src/features/i18n/locales/vi/messages.po b/fluxer_app/src/features/i18n/locales/vi/messages.po
index 76171432e..a7b9b3e80 100644
--- a/fluxer_app/src/features/i18n/locales/vi/messages.po
+++ b/fluxer_app/src/features/i18n/locales/vi/messages.po
@@ -6511,8 +6511,7 @@ msgstr "Mua quà {premiumProductName} từ tab {premiumProductName} để chia s
msgid "Buy gift"
msgstr "Mua quà tặng"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "Bằng cách tạo cộng đồng, bạn đồng ý tuân thủ và duy trì <0>nguyên tắc cộng đồng {PRODUCT_NAME}</0>."
@@ -7088,6 +7087,7 @@ msgstr "Đổi biệt danh nhóm"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "Nhận quà"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "Xác nhận tài khoản"
@@ -9067,8 +9066,7 @@ msgstr "Tin nhắn cộng đồng"
msgid "Community filter"
msgstr "Bộ lọc cộng đồng"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "Biểu tượng cộng đồng"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "Kiểm soát tính năng cuộn mượt tích hợp bằng bánh xe chuột và bàn phím trong ứng dụng máy tính để bàn"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "Kiểm soát lệnh chuyển văn bản thành giọng nói và việc đọc nội dung đến."
@@ -11735,7 +11733,6 @@ msgstr "Ngày và giờ"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "Cài đặt nhóm"
msgid "Group typing states"
msgstr "Trạng thái đang nhập của nhóm"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "Đã cập nhật nhóm"
@@ -21548,7 +21544,6 @@ msgstr "Nhắc đến mọi người hoặc bất kỳ vai trò nào trong kênh
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "Đăng ký tài khoản"
msgid "Registration"
msgstr "Đăng ký"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "Hiện tại đăng ký đang đóng. Hãy dùng liên kết đăng ký từ quản trị viên để tạo tài khoản."
@@ -28007,8 +28001,7 @@ msgstr "Xóa khỏi GIF yêu thích lưu theo URL"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "Xóa biểu tượng"
@@ -34467,7 +34460,6 @@ msgstr "Tính năng chuyển văn bản thành giọng nói không được hỗ
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "Thông báo chuyển văn bản thành giọng nói"
@@ -37943,8 +37935,7 @@ msgstr "Tải tệp và phương tiện lên kênh này."
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "Tải biểu tượng lên"
@@ -41063,8 +41054,7 @@ msgstr "Bạn cần có quyền \"{permissionLabel}\" để sử dụng biểu t
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "Bạn cần có quyền \"{permissionLabel}\" để sử dụng nhãn dán từ các cộng đồng khác tại đây."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "Bạn cần xác nhận tài khoản trước khi tạo cộng đồng."
@@ -41081,8 +41071,7 @@ msgstr "Bạn cần xác nhận tài khoản để gửi tin nhắn trực tiế
msgid "You need to claim your account to send messages in this community."
msgstr "Bạn cần xác nhận tài khoản để gửi tin nhắn trong cộng đồng này."
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "Bạn cần xác minh địa chỉ email trước khi tạo cộng đồng."
@@ -41483,7 +41472,6 @@ msgstr "Tài khoản của bạn chưa được xác nhận. Nếu không có em
msgid "Your account is too new to send messages in this community."
msgstr "Tài khoản của bạn còn quá mới để gửi tin nhắn trong cộng đồng này."
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "Yêu cầu tài khoản của bạn đang chờ phê duyệt. Bạn có thể đăng nhập sau khi quản trị viên phê duyệt."
diff --git a/fluxer_app/src/features/i18n/locales/zh-CN/messages.po b/fluxer_app/src/features/i18n/locales/zh-CN/messages.po
index dec40bb68..44d2258cf 100644
--- a/fluxer_app/src/features/i18n/locales/zh-CN/messages.po
+++ b/fluxer_app/src/features/i18n/locales/zh-CN/messages.po
@@ -6511,8 +6511,7 @@ msgstr "在{premiumProductName}标签页购买{premiumProductName}礼物,然
msgid "Buy gift"
msgstr "购买礼物"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "创建社区即表示你同意遵守并维护<0>{PRODUCT_NAME}社区准则</0>。"
@@ -7088,6 +7087,7 @@ msgstr "修改群昵称"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "领取礼物"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "认领你的账号"
@@ -9067,8 +9066,7 @@ msgstr "社区私信"
msgid "Community filter"
msgstr "社区筛选"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "社区图标"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "控制桌面应用中的原生平滑滚轮和键盘滚动"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "控制语音指令以及收到内容的朗读。"
@@ -11735,7 +11733,6 @@ msgstr "日期和时间"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "群设置"
msgid "Group typing states"
msgstr "群聊输入状态"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "群聊已更新"
@@ -21548,7 +21544,6 @@ msgstr "在此频道中提及所有人或任何身份组(即使该身份组未
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "注册账号"
msgid "Registration"
msgstr "注册"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "当前已关闭注册。请使用管理员提供的注册链接创建账号。"
@@ -28007,8 +28001,7 @@ msgstr "从仅限 URL 的 GIF 收藏夹中移除"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "移除图标"
@@ -34467,7 +34460,6 @@ msgstr "不支持文本转语音"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "文本转语音通知"
@@ -37943,8 +37935,7 @@ msgstr "在此频道上传文件和媒体。"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "上传图标"
@@ -41063,8 +41054,7 @@ msgstr "你需要“{permissionLabel}”权限才能在此处使用其他社区
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "你需要“{permissionLabel}”权限才能在此处使用其他社区的贴纸。"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "你需要先认领账号,才能创建社区。"
@@ -41081,8 +41071,7 @@ msgstr "你需要先认领账号才能发送私信。"
msgid "You need to claim your account to send messages in this community."
msgstr "你需要先认领账号,才能在此社区中发送消息。"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "你需要先验证邮箱地址,才能创建社区。"
@@ -41483,7 +41472,6 @@ msgstr "你的账号尚未认领。如果没有邮箱和密码,你将无法在
msgid "Your account is too new to send messages in this community."
msgstr "你的账号注册时间太短,无法在此社区中发送消息。"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "你的账号申请正在等待审核。管理员批准后即可登录。"
diff --git a/fluxer_app/src/features/i18n/locales/zh-TW/messages.po b/fluxer_app/src/features/i18n/locales/zh-TW/messages.po
index 6e820b583..c2b556d8f 100644
--- a/fluxer_app/src/features/i18n/locales/zh-TW/messages.po
+++ b/fluxer_app/src/features/i18n/locales/zh-TW/messages.po
@@ -6511,8 +6511,7 @@ msgstr "從「{premiumProductName}」分頁購買 {premiumProductName} 禮物,
msgid "Buy gift"
msgstr "購買禮物"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "By creating a community, you agree to follow and uphold the <0>{PRODUCT_NAME} community guidelines</0>."
msgstr "建立社群即表示您同意遵守並維護 <0>{PRODUCT_NAME} 社群準則</0>。"
@@ -7088,6 +7087,7 @@ msgstr "變更群組暱稱"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Change icon"
@@ -8189,8 +8189,7 @@ msgstr "領取禮物"
#: src/features/auth/components/modals/ClaimAccountModal.tsx
#: src/features/channel/components/direct_message/AddFriendForm.tsx
#: src/features/channel/utils/CreateDMModalUtils.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/user/components/modals/tabs/GiftInventoryTab.tsx
msgid "Claim your account"
msgstr "認領您的帳號"
@@ -9067,8 +9066,7 @@ msgstr "社群私訊"
msgid "Community filter"
msgstr "社群篩選條件"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Community icon"
msgstr "社群圖示"
@@ -9767,7 +9765,7 @@ msgid "Control native smooth wheel and keyboard scrolling in the desktop app"
msgstr "控制桌面應用程式中的原生平滑滾輪和鍵盤捲動"
#. Description text in the inline.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Control speech commands and narration for incoming content."
msgstr "控制收到內容的語音指令與旁白。"
@@ -11735,7 +11733,6 @@ msgstr "日期和時間"
#. Short label in the authentication auth minimal register form core. Keep the tone plain and specific.
#. Short label in the authentication auth register form core. Keep the tone plain and specific.
#. Short label in the authentication date of birth field. Keep the tone plain and specific.
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
#: src/features/auth/flow/DateOfBirthField.tsx
#: src/features/auth/flow/MockMinimalRegisterForm.tsx
@@ -17507,8 +17504,7 @@ msgstr "群組設定"
msgid "Group typing states"
msgstr "群組輸入狀態"
-#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
-#: src/features/channel/components/modals/EditGroupModal.tsx
+#: src/features/channel/components/modals/useEditGroupForm.tsx
msgid "Group updated"
msgstr "群組已更新"
@@ -21548,7 +21544,6 @@ msgstr "提及此頻道中的所有人或任何身分組(即使該身分組未
#. Notifications settings: section heading for the default reply-mention behavior.
#. Settings section label. Names the settings section in the settings UI.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
#: src/features/user/components/settings_utils/section_registry/NotificationsSections.ts
msgid "Mention preference"
@@ -27729,7 +27724,6 @@ msgstr "註冊帳號"
msgid "Registration"
msgstr "註冊"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Registration is currently closed. Use a registration link from an admin to create an account."
msgstr "目前已關閉註冊。請使用管理員提供的註冊連結建立帳號。"
@@ -28007,8 +28001,7 @@ msgstr "從僅限網址的 GIF 最愛中移除"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "Remove icon"
msgstr "移除圖示"
@@ -34467,7 +34460,6 @@ msgstr "不支援文字轉語音"
#. Notifications settings: section heading for text-to-speech notification behavior.
#. Short label in the inline. Keep it concise.
-#: src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
#: src/features/user/components/modals/tabs/NotificationsTab.tsx
msgid "Text-to-speech notifications"
msgstr "文字轉語音通知"
@@ -37943,8 +37935,7 @@ msgstr "在此頻道上傳檔案和媒體。"
#: src/features/channel/components/modals/EditGroupBottomSheet.tsx
#: src/features/channel/components/modals/EditGroupModal.tsx
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
#: src/features/guild/components/modals/guild_tabs/guild_overview_tab/fields/GuildIconUploadField.tsx
msgid "Upload icon"
msgstr "上傳圖示"
@@ -41063,8 +41054,7 @@ msgstr "您需要「{permissionLabel}」權限才能在這裡使用來自其他
msgid "You need the \"{permissionLabel}\" permission to use stickers from other communities here."
msgstr "您需要「{permissionLabel}」權限才能在這裡使用來自其他社群的貼圖。"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to claim your account before you can create a community."
msgstr "您必須先認領帳號,才能建立社群。"
@@ -41081,8 +41071,7 @@ msgstr "您需要先認領帳號才能傳送私訊。"
msgid "You need to claim your account to send messages in this community."
msgstr "您必須先認領帳號,才能在這個社群傳送訊息。"
-#: src/features/guild/components/modals/add_guild_modal/GuildCreateForm.tsx
-#: src/features/guild/components/modals/add_guild_modal/TemplateImportForm.tsx
+#: src/features/guild/components/modals/add_guild_modal/GuildCreateShared.tsx
msgid "You need to verify your email address before you can create a community."
msgstr "您必須先驗證電子郵件地址,才能建立社群。"
@@ -41483,7 +41472,6 @@ msgstr "您的帳號尚未認領。如果沒有電子郵件和密碼,您將無
msgid "Your account is too new to send messages in this community."
msgstr "您的帳號建立時間太短,無法在此社群傳送訊息。"
-#: src/features/auth/flow/AuthMinimalRegisterFormCore.tsx
#: src/features/auth/flow/AuthRegisterFormCore.tsx
msgid "Your account request is pending approval. You can sign in after an admin approves it."
msgstr "您的帳號申請正在等待核准。管理員核准後即可登入。"
diff --git a/fluxer_app/src/features/i18n/utils/IntlCache.ts b/fluxer_app/src/features/i18n/utils/IntlCache.ts
index c0e9881aa..4b9da1493 100644
--- a/fluxer_app/src/features/i18n/utils/IntlCache.ts
+++ b/fluxer_app/src/features/i18n/utils/IntlCache.ts
@@ -3,6 +3,7 @@
const numberFormatCache = new Map<string, Intl.NumberFormat>();
const dateTimeFormatCache = new Map<string, Intl.DateTimeFormat>();
const collatorCache = new Map<string, Intl.Collator>();
+const listFormatCache = new Map<string, Intl.ListFormat>();
function getCacheKey(locale: string | undefined, options: object | undefined): string {
if (!options) {
@@ -40,3 +41,58 @@ export function getCachedCollator(locale?: string, options?: Intl.CollatorOption
}
return collator;
}
+
+export function getCachedListFormat(locale: string, options: Intl.ListFormatOptions): Intl.ListFormat {
+ const key = getCacheKey(locale, options);
+ let formatter = listFormatCache.get(key);
+ if (!formatter) {
+ formatter = new Intl.ListFormat(locale, options);
+ listFormatCache.set(key, formatter);
+ }
+ return formatter;
+}
+
+export function formatNumber(value: number, locale: string): string {
+ return getCachedNumberFormat(locale).format(Number.isFinite(value) ? value : 0);
+}
+
+function formatListWithoutIntl(items: ReadonlyArray<string>, type: Intl.ListFormatType): string {
+ if (type === 'unit') {
+ return items.join(', ');
+ }
+ const conjunction = type === 'disjunction' ? 'or' : 'and';
+ if (items.length === 2) {
+ return `${items[0]} ${conjunction} ${items[1]}`;
+ }
+ return `${items.slice(0, -1).join(', ')}, ${conjunction} ${items[items.length - 1]}`;
+}
+
+function isListFormatLocaleSupported(locale: string): boolean {
+ try {
+ return Intl.ListFormat.supportedLocalesOf([locale]).length > 0;
+ } catch {
+ return false;
+ }
+}
+
+export function formatList(
+ items: ReadonlyArray<string>,
+ options: {locale: string; style: Intl.ListFormatStyle; type: Intl.ListFormatType},
+): string {
+ if (items.length === 0) {
+ return '';
+ }
+ if (items.length === 1) {
+ return items[0] ?? '';
+ }
+ if (typeof Intl === 'undefined' || typeof Intl.ListFormat === 'undefined') {
+ return formatListWithoutIntl(items, options.type);
+ }
+ const requestedLocale = options.locale.trim();
+ const locale = requestedLocale !== '' && isListFormatLocaleSupported(requestedLocale) ? requestedLocale : 'en-US';
+ try {
+ return getCachedListFormat(locale, {style: options.style, type: options.type}).format(items);
+ } catch {
+ return formatListWithoutIntl(items, options.type);
+ }
+}
diff --git a/fluxer_app/src/features/input/components/KeybindRecorder.tsx b/fluxer_app/src/features/input/components/KeybindRecorder.tsx
index a2eefb0d1..89486ad4d 100644
--- a/fluxer_app/src/features/input/components/KeybindRecorder.tsx
+++ b/fluxer_app/src/features/input/components/KeybindRecorder.tsx
@@ -16,16 +16,12 @@ import {isGamepadButtonPressed} from '@app/features/input/utils/GamepadButtonUti
import {isKeybindModifierKey} from '@app/features/input/utils/KeybindComboUtils';
import {formatKeyCombo} from '@app/features/input/utils/KeybindUtils';
import {isKeyboardActivationKey} from '@app/features/input/utils/KeyboardUtils';
-import type {
- GlobalKeyEvent,
- GlobalShortcutCaptureEvent,
- GlobalShortcutsApi,
-} from '@app/features/platform/types/Electron';
import {remFromPx} from '@app/features/theme/layout/RemFromPx';
import {Button} from '@app/features/ui/button/Button';
import FocusRing from '@app/features/ui/focus_ring/FocusRing';
import {Popout} from '@app/features/ui/popover/PopoverPopout';
import {getElectronAPI} from '@app/features/ui/utils/NativeUtils';
+import type {GlobalKeyEvent, GlobalShortcutCaptureEvent, GlobalShortcutsApi} from '@app/types/electron.d';
import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
import {ArrowCounterClockwiseIcon, KeyboardIcon, PencilSimpleIcon, TrashIcon} from '@phosphor-icons/react';
diff --git a/fluxer_app/src/features/input/components/KeybindRecorderCapture.ts b/fluxer_app/src/features/input/components/KeybindRecorderCapture.ts
index 0834f7a09..0f86c5afa 100644
--- a/fluxer_app/src/features/input/components/KeybindRecorderCapture.ts
+++ b/fluxer_app/src/features/input/components/KeybindRecorderCapture.ts
@@ -1,11 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import type {KeyCombo} from '@app/features/input/state/InputKeybind';
-import type {
- GlobalKeyEvent,
- GlobalShortcutCaptureEvent,
- GlobalShortcutsApi,
-} from '@app/features/platform/types/Electron';
+import type {GlobalKeyEvent, GlobalShortcutCaptureEvent, GlobalShortcutsApi} from '@app/types/electron.d';
const GLOBAL_KEY_NAME_ALIASES: Readonly<Record<string, string>> = {
Esc: 'Escape',
diff --git a/fluxer_app/src/features/invite/components/InviteListItem.tsx b/fluxer_app/src/features/invite/components/InviteListItem.tsx
index 74a4988c5..65715ca6b 100644
--- a/fluxer_app/src/features/invite/components/InviteListItem.tsx
+++ b/fluxer_app/src/features/invite/components/InviteListItem.tsx
@@ -4,6 +4,7 @@ import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
import Channels from '@app/features/channel/state/Channels';
import * as ChannelUtils from '@app/features/channel/utils/ChannelUtils';
import {EXPIRES_DESCRIPTOR, NEVER_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
+import {formatNumber} from '@app/features/i18n/utils/IntlCache';
import {isKeyboardActivationKey, stopPropagationOnEnterSpace} from '@app/features/input/utils/KeyboardUtils';
import styles from '@app/features/invite/components/InviteListItem.module.css';
import {useInviteCountdown} from '@app/features/invite/hooks/useInviteCountdown';
@@ -24,7 +25,6 @@ import type {Invite} from '@fluxer/schema/src/domains/invite/InviteSchemas';
import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
import {ClipboardIcon, XIcon} from '@phosphor-icons/react';
-import {formatNumber} from '@pkgs/number_utils/src/NumberFormatting';
import {observer} from 'mobx-react-lite';
import type React from 'react';
import {useMemo} from 'react';
diff --git a/fluxer_app/src/features/invite/components/pages/InviteRegisterPage.tsx b/fluxer_app/src/features/invite/components/pages/InviteRegisterPage.tsx
index d71e86846..4c06522fb 100644
--- a/fluxer_app/src/features/invite/components/pages/InviteRegisterPage.tsx
+++ b/fluxer_app/src/features/invite/components/pages/InviteRegisterPage.tsx
@@ -6,8 +6,8 @@ import type {RuntimeConfigSnapshot} from '@app/features/app/state/InstanceSnapsh
import {AuthBottomLink} from '@app/features/auth/flow/AuthBottomLink';
import {AuthErrorState} from '@app/features/auth/flow/AuthErrorState';
import {AuthLoadingState} from '@app/features/auth/flow/AuthLoadingState';
-import {AuthMinimalRegisterFormCore} from '@app/features/auth/flow/AuthMinimalRegisterFormCore';
import sharedStyles from '@app/features/auth/flow/AuthPageStyles.module.css';
+import {AuthRegisterFormCore} from '@app/features/auth/flow/AuthRegisterFormCore';
import {AuthRouterLink} from '@app/features/auth/flow/AuthRouterLink';
import {AuthRuntimeTargetGate} from '@app/features/auth/flow/AuthRuntimeTargetGate';
import {AuthRuntimeTargetResetAction} from '@app/features/auth/flow/AuthRuntimeTargetResetAction';
@@ -199,7 +199,8 @@ const InviteRegisterPageContent = observer(function InviteRegisterPageContent({
/>
<InviteHeader invite={invite} data-flx="invite.invite-register-page.invite-header" />
<div className={sharedStyles.container} data-flx="invite.invite-register-page.div--4">
- <AuthMinimalRegisterFormCore
+ <AuthRegisterFormCore
+ fields={{showUsername: false}}
submitLabel={i18n._(CREATE_ACCOUNT_DESCRIPTOR)}
redirectPath="/"
inviteCode={code}
diff --git a/fluxer_app/src/features/lexical/composer/nodes/ComposerAtomicTokenNode.ts b/fluxer_app/src/features/lexical/composer/nodes/ComposerAtomicTokenNode.ts
new file mode 100644
index 000000000..26b3c1753
--- /dev/null
+++ b/fluxer_app/src/features/lexical/composer/nodes/ComposerAtomicTokenNode.ts
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {DecoratorNode, type NodeKey} from 'lexical';
+import type {JSX} from 'react';
+
+export abstract class ComposerAtomicTokenNode extends DecoratorNode<JSX.Element> {
+ __display: string;
+ __literal: boolean;
+ __spoiler: boolean;
+
+ constructor(display: string, literal: boolean, spoiler: boolean, key?: NodeKey) {
+ super(key);
+ this.__display = display;
+ this.__literal = literal;
+ this.__spoiler = spoiler;
+ }
+
+ override updateDOM(): boolean {
+ return false;
+ }
+
+ override getTextContent(): string {
+ return this.getLatest().__display;
+ }
+
+ isLiteral(): boolean {
+ return this.getLatest().__literal;
+ }
+
+ setLiteral(literal: boolean): this {
+ this.getWritable().__literal = literal;
+ return this;
+ }
+
+ isSpoiler(): boolean {
+ return this.getLatest().__spoiler;
+ }
+
+ setSpoiler(spoiler: boolean): this {
+ this.getWritable().__spoiler = spoiler;
+ return this;
+ }
+
+ override isInline(): true {
+ return true;
+ }
+
+ override isKeyboardSelectable(): false {
+ return false;
+ }
+}
diff --git a/fluxer_app/src/features/lexical/composer/nodes/ComposerCustomEmojiNode.tsx b/fluxer_app/src/features/lexical/composer/nodes/ComposerCustomEmojiNode.tsx
index 6e58f8a44..4db63bea5 100644
--- a/fluxer_app/src/features/lexical/composer/nodes/ComposerCustomEmojiNode.tsx
+++ b/fluxer_app/src/features/lexical/composer/nodes/ComposerCustomEmojiNode.tsx
@@ -1,17 +1,10 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {ComposerAtomicPresentation} from '@app/features/lexical/composer/nodes/ComposerAtomicPresentation';
+import {ComposerAtomicTokenNode} from '@app/features/lexical/composer/nodes/ComposerAtomicTokenNode';
import {ComposerCustomEmoji} from '@app/features/lexical/composer/nodes/ComposerCustomEmoji';
import styles from '@app/features/lexical/composer/nodes/ComposerInline.module.css';
-import {
- DecoratorNode,
- type DOMExportOutput,
- type EditorConfig,
- type LexicalNode,
- type NodeKey,
- type SerializedLexicalNode,
- type Spread,
-} from 'lexical';
+import type {DOMExportOutput, EditorConfig, LexicalNode, NodeKey, SerializedLexicalNode, Spread} from 'lexical';
import type {JSX} from 'react';
export type SerializedComposerCustomEmojiNode = Spread<
@@ -26,10 +19,9 @@ export type SerializedComposerCustomEmojiNode = Spread<
SerializedLexicalNode
>;
-export class ComposerCustomEmojiNode extends DecoratorNode<JSX.Element> {
+export class ComposerCustomEmojiNode extends ComposerAtomicTokenNode {
__emojiId: string;
__animated: boolean;
- __display: string;
__wire: string;
static override getType(): string {
@@ -59,9 +51,6 @@ export class ComposerCustomEmojiNode extends DecoratorNode<JSX.Element> {
);
}
- __literal: boolean;
- __spoiler: boolean;
-
constructor(
emojiId: string,
animated: boolean,
@@ -71,13 +60,10 @@ export class ComposerCustomEmojiNode extends DecoratorNode<JSX.Element> {
spoiler = false,
key?: NodeKey,
) {
- super(key);
+ super(display, literal, spoiler, key);
this.__emojiId = emojiId;
this.__animated = animated;
- this.__display = display;
this.__wire = wire;
- this.__literal = literal;
- this.__spoiler = spoiler;
}
override exportJSON(): SerializedComposerCustomEmojiNode {
@@ -103,20 +89,12 @@ export class ComposerCustomEmojiNode extends DecoratorNode<JSX.Element> {
return span;
}
- override updateDOM(): boolean {
- return false;
- }
-
override exportDOM(): DOMExportOutput {
const element = document.createElement('span');
element.textContent = this.__wire;
return {element};
}
- override getTextContent(): string {
- return this.getLatest().__display;
- }
-
getWireText(): string {
return this.getLatest().__wire;
}
@@ -125,32 +103,6 @@ export class ComposerCustomEmojiNode extends DecoratorNode<JSX.Element> {
return this.getLatest().__emojiId;
}
- isLiteral(): boolean {
- return this.getLatest().__literal;
- }
-
- setLiteral(literal: boolean): this {
- this.getWritable().__literal = literal;
- return this;
- }
-
- isSpoiler(): boolean {
- return this.getLatest().__spoiler;
- }
-
- setSpoiler(spoiler: boolean): this {
- this.getWritable().__spoiler = spoiler;
- return this;
- }
-
- override isInline(): true {
- return true;
- }
-
- override isKeyboardSelectable(): false {
- return false;
- }
-
override decorate(): JSX.Element {
return (
<ComposerAtomicPresentation
diff --git a/fluxer_app/src/features/lexical/composer/nodes/ComposerMentionNode.tsx b/fluxer_app/src/features/lexical/composer/nodes/ComposerMentionNode.tsx
index 0b5d4da88..5f479deed 100644
--- a/fluxer_app/src/features/lexical/composer/nodes/ComposerMentionNode.tsx
+++ b/fluxer_app/src/features/lexical/composer/nodes/ComposerMentionNode.tsx
@@ -1,18 +1,11 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {ComposerAtomicPresentation} from '@app/features/lexical/composer/nodes/ComposerAtomicPresentation';
+import {ComposerAtomicTokenNode} from '@app/features/lexical/composer/nodes/ComposerAtomicTokenNode';
import styles from '@app/features/lexical/composer/nodes/ComposerInline.module.css';
import {ComposerMentionPill} from '@app/features/lexical/composer/nodes/ComposerMentionPill';
import type {MentionSegment} from '@app/features/messaging/utils/TextareaSegmentManager';
-import {
- DecoratorNode,
- type DOMExportOutput,
- type EditorConfig,
- type LexicalNode,
- type NodeKey,
- type SerializedLexicalNode,
- type Spread,
-} from 'lexical';
+import type {DOMExportOutput, EditorConfig, LexicalNode, NodeKey, SerializedLexicalNode, Spread} from 'lexical';
import type {CSSProperties, JSX} from 'react';
export type ComposerMentionType = 'user' | 'role' | 'channel' | 'special';
@@ -40,10 +33,9 @@ export type SerializedComposerMentionNode = Spread<
SerializedLexicalNode
>;
-export class ComposerMentionNode extends DecoratorNode<JSX.Element> {
+export class ComposerMentionNode extends ComposerAtomicTokenNode {
__mentionType: ComposerMentionType;
__mentionId: string;
- __display: string;
__wire: string;
static override getType(): string {
@@ -75,8 +67,6 @@ export class ComposerMentionNode extends DecoratorNode<JSX.Element> {
);
}
- __literal: boolean;
- __spoiler: boolean;
__presentation: ComposerMentionPresentationFormat;
constructor(
@@ -89,13 +79,10 @@ export class ComposerMentionNode extends DecoratorNode<JSX.Element> {
presentation: ComposerMentionPresentationFormat = ComposerMentionPresentation.none,
key?: NodeKey,
) {
- super(key);
+ super(display, literal, spoiler, key);
this.__mentionType = mentionType;
this.__mentionId = mentionId;
- this.__display = display;
this.__wire = wire;
- this.__literal = literal;
- this.__spoiler = spoiler;
this.__presentation = presentation;
}
@@ -126,10 +113,6 @@ export class ComposerMentionNode extends DecoratorNode<JSX.Element> {
return span;
}
- override updateDOM(): boolean {
- return false;
- }
-
override exportDOM(): DOMExportOutput {
const element = document.createElement('span');
element.setAttribute('data-lexical-composer-mention', this.__mentionType);
@@ -137,10 +120,6 @@ export class ComposerMentionNode extends DecoratorNode<JSX.Element> {
return {element};
}
- override getTextContent(): string {
- return this.getLatest().__display;
- }
-
getWireText(): string {
return this.getLatest().__wire;
}
@@ -153,24 +132,6 @@ export class ComposerMentionNode extends DecoratorNode<JSX.Element> {
return this.getLatest().__mentionId;
}
- isLiteral(): boolean {
- return this.getLatest().__literal;
- }
-
- setLiteral(literal: boolean): this {
- this.getWritable().__literal = literal;
- return this;
- }
-
- isSpoiler(): boolean {
- return this.getLatest().__spoiler;
- }
-
- setSpoiler(spoiler: boolean): this {
- this.getWritable().__spoiler = spoiler;
- return this;
- }
-
getPresentation(): ComposerMentionPresentationFormat {
return this.getLatest().__presentation;
}
@@ -180,14 +141,6 @@ export class ComposerMentionNode extends DecoratorNode<JSX.Element> {
return this;
}
- override isInline(): true {
- return true;
- }
-
- override isKeyboardSelectable(): false {
- return false;
- }
-
override decorate(): JSX.Element {
const presentationStyle = mentionPresentationStyle(this.__presentation);
return (
diff --git a/fluxer_app/src/features/lexical/composer/nodes/ComposerStandardEmojiNode.tsx b/fluxer_app/src/features/lexical/composer/nodes/ComposerStandardEmojiNode.tsx
index f4e695649..eef22aae7 100644
--- a/fluxer_app/src/features/lexical/composer/nodes/ComposerStandardEmojiNode.tsx
+++ b/fluxer_app/src/features/lexical/composer/nodes/ComposerStandardEmojiNode.tsx
@@ -1,17 +1,10 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {ComposerAtomicPresentation} from '@app/features/lexical/composer/nodes/ComposerAtomicPresentation';
+import {ComposerAtomicTokenNode} from '@app/features/lexical/composer/nodes/ComposerAtomicTokenNode';
import styles from '@app/features/lexical/composer/nodes/ComposerInline.module.css';
import {ComposerStandardEmoji} from '@app/features/lexical/composer/nodes/ComposerStandardEmoji';
-import {
- DecoratorNode,
- type DOMExportOutput,
- type EditorConfig,
- type LexicalNode,
- type NodeKey,
- type SerializedLexicalNode,
- type Spread,
-} from 'lexical';
+import type {DOMExportOutput, EditorConfig, LexicalNode, NodeKey, SerializedLexicalNode, Spread} from 'lexical';
import type {JSX} from 'react';
export type SerializedComposerStandardEmojiNode = Spread<
@@ -26,11 +19,10 @@ export type SerializedComposerStandardEmojiNode = Spread<
SerializedLexicalNode
>;
-export class ComposerStandardEmojiNode extends DecoratorNode<JSX.Element> {
+export class ComposerStandardEmojiNode extends ComposerAtomicTokenNode {
__name: string;
__surrogate: string;
__url: string | null;
- __display: string;
static override getType(): string {
return 'composer-standard-emoji';
@@ -59,9 +51,6 @@ export class ComposerStandardEmojiNode extends DecoratorNode<JSX.Element> {
);
}
- __literal: boolean;
- __spoiler: boolean;
-
constructor(
name: string,
surrogate: string,
@@ -71,13 +60,10 @@ export class ComposerStandardEmojiNode extends DecoratorNode<JSX.Element> {
spoiler = false,
key?: NodeKey,
) {
- super(key);
+ super(display, literal, spoiler, key);
this.__name = name;
this.__surrogate = surrogate;
this.__url = url;
- this.__display = display;
- this.__literal = literal;
- this.__spoiler = spoiler;
}
override exportJSON(): SerializedComposerStandardEmojiNode {
@@ -103,20 +89,12 @@ export class ComposerStandardEmojiNode extends DecoratorNode<JSX.Element> {
return span;
}
- override updateDOM(): boolean {
- return false;
- }
-
override exportDOM(): DOMExportOutput {
const element = document.createElement('span');
element.textContent = this.__display;
return {element};
}
- override getTextContent(): string {
- return this.getLatest().__display;
- }
-
getWireText(): string {
const self = this.getLatest();
return self.__literal ? self.__display : self.__surrogate;
@@ -126,32 +104,6 @@ export class ComposerStandardEmojiNode extends DecoratorNode<JSX.Element> {
return this.getLatest().__name;
}
- isLiteral(): boolean {
- return this.getLatest().__literal;
- }
-
- setLiteral(literal: boolean): this {
- this.getWritable().__literal = literal;
- return this;
- }
-
- isSpoiler(): boolean {
- return this.getLatest().__spoiler;
- }
-
- setSpoiler(spoiler: boolean): this {
- this.getWritable().__spoiler = spoiler;
- return this;
- }
-
- override isInline(): true {
- return true;
- }
-
- override isKeyboardSelectable(): false {
- return false;
- }
-
override decorate(): JSX.Element {
return (
<ComposerAtomicPresentation
diff --git a/fluxer_app/src/features/messaging/hooks/useTextareaDraftAndTyping.ts b/fluxer_app/src/features/messaging/hooks/useTextareaDraftAndTyping.ts
index 4bac3c0be..dbcdbce13 100644
--- a/fluxer_app/src/features/messaging/hooks/useTextareaDraftAndTyping.ts
+++ b/fluxer_app/src/features/messaging/hooks/useTextareaDraftAndTyping.ts
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import * as DraftCommands from '@app/features/messaging/commands/DraftCommands';
+import {segmentsEqual} from '@app/features/messaging/state/MessagingDrafts';
import type {MentionSegment, TextareaSegmentManager} from '@app/features/messaging/utils/TextareaSegmentManager';
import {onBeforeAppStorageScopeChange} from '@app/features/platform/state/PersistentStorage';
import {flushPendingPersistWrites} from '@app/features/platform/utils/MobXPersistence';
@@ -25,25 +26,6 @@ function cloneSegments(segments: ReadonlyArray<MentionSegment> | null | undefine
return segments?.map((segment) => ({...segment})) ?? [];
}
-function segmentsEqual(a: ReadonlyArray<MentionSegment>, b: ReadonlyArray<MentionSegment>): boolean {
- if (a.length !== b.length) return false;
- for (let i = 0; i < a.length; i++) {
- const left = a[i];
- const right = b[i];
- if (
- left.type !== right.type ||
- left.id !== right.id ||
- left.displayText !== right.displayText ||
- left.actualText !== right.actualText ||
- left.start !== right.start ||
- left.end !== right.end
- ) {
- return false;
- }
- }
- return true;
-}
-
export const useTextareaDraftAndTyping = ({
draftOwner,
channelId,
diff --git a/fluxer_app/src/features/messaging/state/MessagingDrafts.ts b/fluxer_app/src/features/messaging/state/MessagingDrafts.ts
index 2d18424e4..5675376b9 100644
--- a/fluxer_app/src/features/messaging/state/MessagingDrafts.ts
+++ b/fluxer_app/src/features/messaging/state/MessagingDrafts.ts
@@ -30,7 +30,7 @@ function normalizeDraftSegments(
.sort((a, b) => a.start - b.start);
}
-function segmentsEqual(a: ReadonlyArray<MentionSegment>, b: ReadonlyArray<MentionSegment>): boolean {
+export function segmentsEqual(a: ReadonlyArray<MentionSegment>, b: ReadonlyArray<MentionSegment>): boolean {
if (a.length !== b.length) return false;
for (let i = 0; i < a.length; i++) {
const left = a[i];
diff --git a/fluxer_app/src/features/messaging/state/Spellcheck.ts b/fluxer_app/src/features/messaging/state/Spellcheck.ts
index 7a8105cca..1515043a4 100644
--- a/fluxer_app/src/features/messaging/state/Spellcheck.ts
+++ b/fluxer_app/src/features/messaging/state/Spellcheck.ts
@@ -1,13 +1,9 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import type {
- SpellcheckBundledDictionary,
- SpellcheckEngine,
- SpellcheckResolvedEngineInfo,
-} from '@app/features/platform/types/Electron';
import {initializeStore} from '@app/features/platform/utils/StoreInitialization';
import {getElectronAPI, isElectron} from '@app/features/ui/utils/NativeUtils';
import {makeSyncedField} from '@app/features/user/state/SyncedField';
+import type {SpellcheckBundledDictionary, SpellcheckEngine, SpellcheckResolvedEngineInfo} from '@app/types/electron.d';
import {SpellcheckSettingsSchema} from '@fluxer/schema/src/gen/fluxer/user/preferences/v1/preferences_pb';
import {makeAutoObservable, runInAction} from 'mobx';
diff --git a/fluxer_app/src/features/messaging/state/Translation.ts b/fluxer_app/src/features/messaging/state/Translation.ts
index 90d566b3e..d3240dca0 100644
--- a/fluxer_app/src/features/messaging/state/Translation.ts
+++ b/fluxer_app/src/features/messaging/state/Translation.ts
@@ -1,175 +1,52 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import {Logger} from '@app/features/platform/utils/AppLogger';
import {makePersistent} from '@app/features/platform/utils/MobXPersistence';
-import {initializeStore} from '@app/features/platform/utils/StoreInitialization';
-import UserSettings from '@app/features/user/state/UserSettings';
-import {create} from '@bufbuild/protobuf';
-import {SearchEngineSettingsSchema} from '@fluxer/schema/src/gen/fluxer/user/preferences/v1/preferences_pb';
-import {makeAutoObservable} from 'mobx';
+import {UrlTemplateProviderStore} from '@app/features/search/state/UrlTemplateProviderStore';
-interface TranslationProvider {
- id: string;
- name: string;
- urlTemplate: string;
- enabled: boolean;
- isBuiltIn: boolean;
-}
-
-const logger = new Logger('Translation');
-const BUILT_IN_TRANSLATION_PROVIDERS: ReadonlyArray<Omit<TranslationProvider, 'enabled'>> = [
- {
- id: 'google_translate',
- name: 'Google Translate',
- urlTemplate: 'https://translate.google.com/?sl=auto&tl=auto&text={query}&op=translate',
- isBuiltIn: true,
- },
- {
- id: 'deepl',
- name: 'DeepL',
- urlTemplate: 'https://www.deepl.com/translator#auto/auto/{query}',
- isBuiltIn: true,
- },
- {
- id: 'bing_translator',
- name: 'Bing Translator',
- urlTemplate: 'https://www.bing.com/translator/?text={query}',
- isBuiltIn: true,
- },
- {
- id: 'yandex_translate',
- name: 'Yandex Translate',
- urlTemplate: 'https://translate.yandex.com/?text={query}',
- isBuiltIn: true,
- },
- {
- id: 'reverso',
- name: 'Reverso',
- urlTemplate: 'https://www.reverso.net/text-translation#sl=auto&tl=eng&text={query}',
- isBuiltIn: true,
- },
- {
- id: 'linguee',
- name: 'Linguee',
- urlTemplate: 'https://www.linguee.com/english-german/search?source=auto&query={query}',
- isBuiltIn: true,
+export default new UrlTemplateProviderStore({
+ name: 'Translation',
+ persist() {
+ return makePersistent(this, 'Translation', ['engines'], {version: 1});
},
- {
- id: 'papago',
- name: 'Papago',
- urlTemplate: 'https://papago.naver.com/?st={query}',
- isBuiltIn: true,
- },
-];
-const SUGGESTED_DEFAULT_TRANSLATION_PROVIDER_ID = 'google_translate';
-
-function createDefaultTranslationProviders(): Array<TranslationProvider> {
- return BUILT_IN_TRANSLATION_PROVIDERS.map((provider) => ({
- ...provider,
- enabled: provider.id === SUGGESTED_DEFAULT_TRANSLATION_PROVIDER_ID,
- }));
-}
-
-class Translation {
- engines: Array<TranslationProvider> = createDefaultTranslationProviders();
-
- constructor() {
- makeAutoObservable(this, {}, {autoBind: true});
- initializeStore(this, () => makePersistent(this, 'Translation', ['engines'], {version: 1}));
- }
-
- get enabledEngines(): ReadonlyArray<TranslationProvider> {
- return this.engines.filter((engine) => engine.enabled);
- }
-
- get defaultEngineId(): string | null {
- const value = UserSettings.getSubPreference('searchEngines')?.translationProviderId;
- return typeof value === 'string' && value.length > 0 ? value : null;
- }
-
- get defaultEngine(): TranslationProvider | null {
- const id = this.defaultEngineId;
- if (id == null) return null;
- const engine = this.engines.find((entry) => entry.id === id && entry.enabled);
- return engine ?? null;
- }
-
- get effectiveDefaultEngine(): TranslationProvider | null {
- if (this.defaultEngine) return this.defaultEngine;
- const enabled = this.enabledEngines;
- return enabled.length === 1 ? enabled[0] : null;
- }
-
- get nonDefaultEnabledEngines(): ReadonlyArray<TranslationProvider> {
- const defaultId = this.defaultEngine?.id;
- return this.enabledEngines.filter((engine) => engine.id !== defaultId);
- }
-
- setEnabled(engineId: string, enabled: boolean): void {
- const engine = this.engines.find((entry) => entry.id === engineId);
- if (!engine) return;
- engine.enabled = enabled;
- if (!enabled && this.defaultEngineId === engineId) {
- void this.persistDefault(null);
- }
- }
-
- setDefaultEngine(engineId: string): Promise<void> {
- const engine = this.engines.find((entry) => entry.id === engineId);
- if (!engine) return Promise.resolve();
- if (!engine.enabled) {
- engine.enabled = true;
- }
- return this.persistDefault(engineId);
- }
-
- addCustomEngine(name: string, urlTemplate: string): string {
- const id = `custom_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
- this.engines.push({
- id,
- name,
- urlTemplate,
- enabled: true,
- isBuiltIn: false,
- });
- return id;
- }
-
- removeCustomEngine(engineId: string): void {
- const engine = this.engines.find((entry) => entry.id === engineId);
- if (!engine || engine.isBuiltIn) return;
- this.engines = this.engines.filter((entry) => entry.id !== engineId);
- if (this.defaultEngineId === engineId) {
- void this.persistDefault(null);
- }
- }
-
- updateCustomEngine(engineId: string, name: string, urlTemplate: string): void {
- const engine = this.engines.find((entry) => entry.id === engineId);
- if (!engine || engine.isBuiltIn) return;
- engine.name = name;
- engine.urlTemplate = urlTemplate;
- }
-
- buildSearchUrl(engineId: string, query: string): string {
- const engine = this.engines.find((entry) => entry.id === engineId);
- if (!engine) return '';
- return engine.urlTemplate.replace(/\{query\}/gu, encodeURIComponent(query));
- }
-
- private async persistDefault(engineId: string | null): Promise<void> {
- try {
- const current = UserSettings.getSubPreference('searchEngines');
- const next = create(SearchEngineSettingsSchema, {
- textSearchEngineId: current?.textSearchEngineId,
- reverseImageSearchEngineId: current?.reverseImageSearchEngineId,
- translationProviderId: engineId ?? undefined,
- });
- await UserSettings.setSubPreference('searchEngines', next);
- } catch (error) {
- logger.error('Failed to persist default translation provider', error);
- }
- }
-}
-
-export default new Translation();
+ builtIns: [
+ {
+ id: 'google_translate',
+ name: 'Google Translate',
+ urlTemplate: 'https://translate.google.com/?sl=auto&tl=auto&text={query}&op=translate',
+ },
+ {
+ id: 'deepl',
+ name: 'DeepL',
+ urlTemplate: 'https://www.deepl.com/translator#auto/auto/{query}',
+ },
+ {
+ id: 'bing_translator',
+ name: 'Bing Translator',
+ urlTemplate: 'https://www.bing.com/translator/?text={query}',
+ },
+ {
+ id: 'yandex_translate',
+ name: 'Yandex Translate',
+ urlTemplate: 'https://translate.yandex.com/?text={query}',
+ },
+ {
+ id: 'reverso',
+ name: 'Reverso',
+ urlTemplate: 'https://www.reverso.net/text-translation#sl=auto&tl=eng&text={query}',
+ },
+ {
+ id: 'linguee',
+ name: 'Linguee',
+ urlTemplate: 'https://www.linguee.com/english-german/search?source=auto&query={query}',
+ },
+ {
+ id: 'papago',
+ name: 'Papago',
+ urlTemplate: 'https://papago.naver.com/?st={query}',
+ },
+ ],
+ suggestedDefaultId: 'google_translate',
+ defaultField: 'translationProviderId',
+ placeholder: /\{query\}/gu,
+ persistFailureMessage: 'Failed to persist default translation provider',
+});
diff --git a/fluxer_app/src/features/messaging/utils/EmoticonConversionUtils.ts b/fluxer_app/src/features/messaging/utils/EmoticonConversionUtils.ts
index 12b3c00ed..de3fb7ceb 100644
--- a/fluxer_app/src/features/messaging/utils/EmoticonConversionUtils.ts
+++ b/fluxer_app/src/features/messaging/utils/EmoticonConversionUtils.ts
@@ -1,79 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import UnicodeEmojis from '@app/features/expressions/utils/UnicodeEmojis';
-
-const HTTP_PREFIX = 'http://';
-const HTTPS_PREFIX = 'https://';
-const APP_PROTOCOL_SCHEME = 'fluxer:';
-const TRIMMED_AUTOLINK_PUNCTUATION = new Set(['.', ',', ';', ':', '!', '?']);
-
-function isUrlStart(content: string, index: number): boolean {
- if (content.startsWith(HTTP_PREFIX, index) || content.startsWith(HTTPS_PREFIX, index)) {
- return true;
- }
- if (!content.startsWith(APP_PROTOCOL_SCHEME, index)) {
- return false;
- }
- const nextChar = content[index + APP_PROTOCOL_SCHEME.length] ?? '';
- return nextChar === '/' || /[A-Za-z0-9_-]/u.test(nextChar);
-}
-
-function isUrlTerminationChar(char: string): boolean {
- return (
- char === '' ||
- char === ' ' ||
- char === '\t' ||
- char === '\n' ||
- char === '\r' ||
- char === ')' ||
- char === '"' ||
- char === '<' ||
- char === '>'
- );
-}
-
-function hasTerminalTld(text: string): boolean {
- let index = text.length;
- let letterCount = 0;
- while (index > 0 && /[A-Za-z]/u.test(text[index - 1] ?? '')) {
- letterCount++;
- index--;
- }
- return letterCount >= 2 && index > 0 && text[index - 1] === '.';
-}
-
-function findUrlEnd(content: string, start: number): number {
- let end = start;
- let parenDepth = 0;
- while (end < content.length) {
- const char = content[end] ?? '';
- if (char === '(') {
- parenDepth++;
- end++;
- continue;
- }
- if (char === ')') {
- if (parenDepth > 0) {
- parenDepth--;
- end++;
- continue;
- }
- break;
- }
- if (isUrlTerminationChar(char)) {
- break;
- }
- end++;
- }
- while (
- end > start &&
- TRIMMED_AUTOLINK_PUNCTUATION.has(content[end - 1] ?? '') &&
- !hasTerminalTld(content.slice(start, end))
- ) {
- end--;
- }
- return end;
-}
+import {findUrlEnd, isUrlStart} from '@app/features/messaging/utils/markdown/UrlSpanUtils';
function isEscaped(content: string, index: number): boolean {
let backslashCount = 0;
@@ -177,7 +105,7 @@ function findProtectedSpanEnd(content: string, index: number): number | null {
if (!isUrlStart(content, index)) {
return null;
}
- const urlEnd = findUrlEnd(content, index);
+ const urlEnd = findUrlEnd(content, index, true);
return urlEnd > index ? urlEnd : null;
}
diff --git a/fluxer_app/src/features/messaging/utils/MessageCopyTextUtils.ts b/fluxer_app/src/features/messaging/utils/MessageCopyTextUtils.ts
index aaa92f309..5c32d3cfd 100644
--- a/fluxer_app/src/features/messaging/utils/MessageCopyTextUtils.ts
+++ b/fluxer_app/src/features/messaging/utils/MessageCopyTextUtils.ts
@@ -5,6 +5,7 @@ import {MarkdownContext} from '@app/features/messaging/components/markdown/rende
import type {Message} from '@app/features/messaging/models/MessagingMessage';
import {getParserFlagsForContext} from '@app/features/messaging/utils/markdown/MarkdownParserFlags';
import {
+ normaliseUrlForComparison,
type PlaintextRenderOptions,
parseAndRenderToPlaintext,
renderAstToPlaintext,
@@ -73,17 +74,6 @@ function normaliseCopyBlock(value?: string | null): string {
.trim();
}
-function normaliseUrlForComparison(value?: string | null): string | null {
- if (!value) {
- return null;
- }
- try {
- return new URL(value).href.replace(/\/$/u, '');
- } catch {
- return null;
- }
-}
-
function trimUrlCandidate(value: string): string {
return value.replace(/[),.;:!?]+$/u, '');
}
diff --git a/fluxer_app/src/features/messaging/utils/ReactionUtils.ts b/fluxer_app/src/features/messaging/utils/ReactionUtils.ts
index 4ade62079..15a37b6b8 100644
--- a/fluxer_app/src/features/messaging/utils/ReactionUtils.ts
+++ b/fluxer_app/src/features/messaging/utils/ReactionUtils.ts
@@ -8,6 +8,7 @@ import {buildCustomEmojiURL} from '@app/features/expressions/utils/CustomEmojiIm
import * as EmojiUtils from '@app/features/expressions/utils/EmojiUtils';
import {getSkinTonedSurrogate} from '@app/features/expressions/utils/SkinToneUtils';
import UnicodeEmojis from '@app/features/expressions/utils/UnicodeEmojis';
+import {getCachedListFormat} from '@app/features/i18n/utils/IntlCache';
import type {Message} from '@app/features/messaging/models/MessagingMessage';
import MessageReactions from '@app/features/messaging/state/MessageReactions';
import {getCurrentLocale} from '@app/features/user/utils/LocaleUtils';
@@ -19,16 +20,6 @@ const REACTED_BY_DESCRIPTOR = msg({
comment:
'Reaction tooltip. Preserve {emojiName}, {reactors}; they are inserted by code. {reactorCount} is how many people reacted, for verb agreement. Order the parts so the emoji never reads as the one doing the reacting.',
});
-const listFormatterCache = new Map<string, Intl.ListFormat>();
-
-function getReactorListFormatter(locale: string): Intl.ListFormat {
- let formatter = listFormatterCache.get(locale);
- if (!formatter) {
- formatter = new Intl.ListFormat(locale, {type: 'conjunction', style: 'long'});
- listFormatterCache.set(locale, formatter);
- }
- return formatter;
-}
export interface ReactionEmoji {
id?: string | null;
@@ -53,7 +44,7 @@ export function getReactionTooltip(message: Message, emoji: ReactionEmoji) {
if (othersCount > 0) {
parts.push(plural({count: othersCount}, {one: '# other', other: '# others'}));
}
- const reactors = getReactorListFormatter(getCurrentLocale()).format(parts);
+ const reactors = getCachedListFormat(getCurrentLocale(), {type: 'conjunction', style: 'long'}).format(parts);
return i18n._(REACTED_BY_DESCRIPTOR, {emojiName, reactors, reactorCount});
}
diff --git a/fluxer_app/src/features/messaging/utils/TypedEmojiShortcodeUtils.ts b/fluxer_app/src/features/messaging/utils/TypedEmojiShortcodeUtils.ts
index ddf641c05..a2366b5f8 100644
--- a/fluxer_app/src/features/messaging/utils/TypedEmojiShortcodeUtils.ts
+++ b/fluxer_app/src/features/messaging/utils/TypedEmojiShortcodeUtils.ts
@@ -9,14 +9,11 @@ import {
checkEmojiAvailabilityWithGuildFallback,
} from '@app/features/expressions/utils/ExpressionPermissionUtils';
import UnicodeEmojis from '@app/features/expressions/utils/UnicodeEmojis';
+import {findUrlSpans, isInsideSpan, type TextSpan} from '@app/features/messaging/utils/markdown/UrlSpanUtils';
import type {I18n} from '@lingui/core';
const TYPED_EMOJI_SHORTCODE_PATTERN = /:([\p{L}\p{N}_+~.-]{2,}):/gu;
const CUSTOM_EMOJI_SHORTCODE_NAME_PATTERN = /^[a-zA-Z0-9_+~-]{2,}$/;
-const HTTP_PREFIX = 'http://';
-const HTTPS_PREFIX = 'https://';
-const APP_PROTOCOL_SCHEME = 'fluxer:';
-const TRIMMED_AUTOLINK_PUNCTUATION = new Set(['.', ',', ';', ':', '!', '?']);
type ShortcodeResolver = (shortcodeName: string) => string | null | undefined;
@@ -43,106 +40,10 @@ interface ResolveTypedEmojiShortcodesOptions {
i18n: I18n;
}
-interface TextSpan {
- start: number;
- end: number;
-}
-
function isExistingCustomEmojiMarkdown(content: string, matchIndex: number): boolean {
return content[matchIndex - 1] === '<' || (content[matchIndex - 2] === '<' && content[matchIndex - 1] === 'a');
}
-function isUrlStart(content: string, index: number): boolean {
- if (content.startsWith(HTTP_PREFIX, index) || content.startsWith(HTTPS_PREFIX, index)) {
- return true;
- }
- if (!content.startsWith(APP_PROTOCOL_SCHEME, index)) {
- return false;
- }
- const nextChar = content[index + APP_PROTOCOL_SCHEME.length] ?? '';
- return nextChar === '/' || /[A-Za-z0-9_-]/u.test(nextChar);
-}
-
-function isUrlTerminationChar(char: string): boolean {
- return (
- char === '' ||
- char === ' ' ||
- char === '\t' ||
- char === '\n' ||
- char === '\r' ||
- char === ')' ||
- char === '"' ||
- char === '<' ||
- char === '>'
- );
-}
-
-function hasTerminalTld(text: string): boolean {
- let index = text.length;
- let letterCount = 0;
- while (index > 0 && /[A-Za-z]/u.test(text[index - 1])) {
- letterCount++;
- index--;
- }
- return letterCount >= 2 && index > 0 && text[index - 1] === '.';
-}
-
-function findUrlEnd(content: string, start: number): number {
- let end = start;
- let parenDepth = 0;
- while (end < content.length) {
- const char = content[end];
- if (char === '(') {
- parenDepth++;
- end++;
- continue;
- }
- if (char === ')') {
- if (parenDepth > 0) {
- parenDepth--;
- end++;
- continue;
- }
- break;
- }
- if (isUrlTerminationChar(char)) {
- break;
- }
- end++;
- }
- while (
- end > start &&
- TRIMMED_AUTOLINK_PUNCTUATION.has(content[end - 1]) &&
- !hasTerminalTld(content.slice(start, end))
- ) {
- end--;
- }
- return end;
-}
-
-function findUrlSpans(content: string): Array<TextSpan> {
- const spans: Array<TextSpan> = [];
- let index = 0;
- while (index < content.length) {
- if (!isUrlStart(content, index)) {
- index++;
- continue;
- }
- const end = findUrlEnd(content, index);
- if (end > index) {
- spans.push({start: index, end});
- index = end;
- continue;
- }
- index++;
- }
- return spans;
-}
-
-function isInsideSpan(spans: ReadonlyArray<TextSpan>, index: number): boolean {
- return spans.some((span) => index >= span.start && index < span.end);
-}
-
function isCustomEmoji(emoji: FlatEmoji): boolean {
return !!emoji.id && !!emoji.guildId;
}
@@ -166,7 +67,7 @@ function replaceTypedEmojiShortcodes(content: string, resolveShortcode: Shortcod
if (isExistingCustomEmojiMarkdown(content, matchIndex)) {
return match;
}
- urlSpans ??= findUrlSpans(content);
+ urlSpans ??= findUrlSpans(content, true);
if (isInsideSpan(urlSpans, matchIndex)) {
return match;
}
diff --git a/fluxer_app/src/features/messaging/utils/markdown/Plaintext.ts b/fluxer_app/src/features/messaging/utils/markdown/Plaintext.ts
index beda2c8b3..9945bc67c 100644
--- a/fluxer_app/src/features/messaging/utils/markdown/Plaintext.ts
+++ b/fluxer_app/src/features/messaging/utils/markdown/Plaintext.ts
@@ -287,7 +287,7 @@ function renderTableCellToPlaintext(cell: TableCellNode, options: PlaintextRende
.trim();
}
-function normaliseUrlForComparison(value?: string | null): string | null {
+export function normaliseUrlForComparison(value?: string | null): string | null {
if (!value) {
return null;
}
diff --git a/fluxer_app/src/features/messaging/utils/markdown/UrlSpanUtils.ts b/fluxer_app/src/features/messaging/utils/markdown/UrlSpanUtils.ts
index 75a6fd1ca..19a373d95 100644
--- a/fluxer_app/src/features/messaging/utils/markdown/UrlSpanUtils.ts
+++ b/fluxer_app/src/features/messaging/utils/markdown/UrlSpanUtils.ts
@@ -10,7 +10,7 @@ export interface TextSpan {
end: number;
}
-function isUrlStart(content: string, index: number): boolean {
+export function isUrlStart(content: string, index: number): boolean {
if (content.startsWith(HTTP_PREFIX, index) || content.startsWith(HTTPS_PREFIX, index)) {
return true;
}
@@ -22,8 +22,17 @@ function isUrlStart(content: string, index: number): boolean {
return nextChar === '/' || /[A-Za-z0-9_-]/u.test(nextChar);
}
-function isUrlTerminationChar(char: string): boolean {
- return char === '' || char === ' ' || char === '\t' || char === '\n' || char === '\r' || char === ')' || char === '"';
+function isUrlTerminationChar(char: string, terminateOnAngleBrackets: boolean): boolean {
+ return (
+ char === '' ||
+ char === ' ' ||
+ char === '\t' ||
+ char === '\n' ||
+ char === '\r' ||
+ char === ')' ||
+ char === '"' ||
+ (terminateOnAngleBrackets && (char === '<' || char === '>'))
+ );
}
function hasTerminalTld(text: string): boolean {
@@ -36,7 +45,7 @@ function hasTerminalTld(text: string): boolean {
return letterCount >= 2 && index > 0 && text[index - 1] === '.';
}
-export function findUrlEnd(content: string, start: number): number {
+export function findUrlEnd(content: string, start: number, terminateOnAngleBrackets = false): number {
let end = start;
let parenDepth = 0;
while (end < content.length) {
@@ -54,7 +63,7 @@ export function findUrlEnd(content: string, start: number): number {
}
break;
}
- if (isUrlTerminationChar(char)) {
+ if (isUrlTerminationChar(char, terminateOnAngleBrackets)) {
break;
}
end++;
@@ -75,7 +84,7 @@ function containsAngleBracketSyntax(value: string): boolean {
return ANGLE_BRACKET_SYNTAX_NEEDLES.some((needle) => value.includes(needle));
}
-export function findUrlSpans(content: string): Array<TextSpan> {
+export function findUrlSpans(content: string, terminateOnAngleBrackets = false): Array<TextSpan> {
const spans: Array<TextSpan> = [];
let index = 0;
while (index < content.length) {
@@ -83,7 +92,7 @@ export function findUrlSpans(content: string): Array<TextSpan> {
index++;
continue;
}
- const end = findUrlEnd(content, index);
+ const end = findUrlEnd(content, index, terminateOnAngleBrackets);
if (end > index && !containsAngleBracketSyntax(content.slice(index, end))) {
spans.push({start: index, end});
index = end;
diff --git a/fluxer_app/src/features/notification/utils/MessageNotificationPreview.ts b/fluxer_app/src/features/notification/utils/MessageNotificationPreview.ts
index e34913151..5303ff1c0 100644
--- a/fluxer_app/src/features/notification/utils/MessageNotificationPreview.ts
+++ b/fluxer_app/src/features/notification/utils/MessageNotificationPreview.ts
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {STICKER_DESCRIPTOR, STICKERS_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
+import {formatList} from '@app/features/i18n/utils/IntlCache';
import {MarkdownContext} from '@app/features/messaging/components/markdown/renderers/RendererTypes';
import type {Message} from '@app/features/messaging/models/MessagingMessage';
import {getParserFlagsForContext} from '@app/features/messaging/utils/markdown/MarkdownParserFlags';
@@ -18,7 +19,6 @@ import type {
} from '@fluxer/schema/src/domains/message/MessageResponseSchemas';
import type {I18n} from '@lingui/core';
import {msg} from '@lingui/core/macro';
-import {formatListWithConfig} from '@pkgs/list_utils/src/ListFormatting';
const MESSAGE_NOTIFICATION_PARSER_FLAGS = getParserFlagsForContext(MarkdownContext.STANDARD_WITHOUT_JUMBO);
const ATTACHMENT_DESCRIPTOR = msg({
@@ -103,7 +103,7 @@ function buildStickerNotificationPreview(
if (stickers.length === 1) {
return i18n._(STICKER_NOTIFICATION_BODY_DESCRIPTOR, {stickerName: stickerNames[0]});
}
- const formattedStickerNames = formatListWithConfig(stickerNames, {
+ const formattedStickerNames = formatList(stickerNames, {
locale: i18n.locale,
style: 'long',
type: 'conjunction',
diff --git a/fluxer_app/src/features/platform/state/DesktopStoreAccess.ts b/fluxer_app/src/features/platform/state/DesktopStoreAccess.ts
index b516bb36f..f31dda804 100644
--- a/fluxer_app/src/features/platform/state/DesktopStoreAccess.ts
+++ b/fluxer_app/src/features/platform/state/DesktopStoreAccess.ts
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import type {ElectronAPI} from '@app/features/platform/types/Electron';
+import type {ElectronAPI} from '@app/types/electron.d';
export interface DesktopStoreAccessOptions {
readonly allowUnavailable?: boolean;
diff --git a/fluxer_app/src/features/platform/state/LegacyOriginUpgrade.test.ts b/fluxer_app/src/features/platform/state/LegacyOriginUpgrade.test.ts
index 252e1af6b..a2ae91c51 100644
--- a/fluxer_app/src/features/platform/state/LegacyOriginUpgrade.test.ts
+++ b/fluxer_app/src/features/platform/state/LegacyOriginUpgrade.test.ts
@@ -27,7 +27,7 @@ import {
APP_STORAGE_OBJECT_STORE,
} from '@app/features/platform/state/PersistentStorageBackend';
import {getProtectedIndexedDB} from '@app/features/platform/state/ProtectedWebStorage';
-import type {ElectronAPI} from '@app/features/platform/types/Electron';
+import type {ElectronAPI} from '@app/types/electron.d';
import type {DesktopLegacyHarvest, DesktopLegacyHarvestStore} from '@fluxer/desktop_ipc/src/LegacyHarvestContract';
import {
DESKTOP_LEGACY_RAW_STORAGE_SEED_MARKER_KEY,
diff --git a/fluxer_app/src/features/platform/state/LegacyStorageContinuity.test.ts b/fluxer_app/src/features/platform/state/LegacyStorageContinuity.test.ts
index 56ccc0bdf..cc9513037 100644
--- a/fluxer_app/src/features/platform/state/LegacyStorageContinuity.test.ts
+++ b/fluxer_app/src/features/platform/state/LegacyStorageContinuity.test.ts
@@ -31,7 +31,7 @@ import {
} from '@app/features/platform/state/AppStorageKeys';
import {APP_STORAGE_INDEXED_DB_NAME} from '@app/features/platform/state/PersistentStorageBackend';
import {getProtectedIndexedDB} from '@app/features/platform/state/ProtectedWebStorage';
-import type {ElectronAPI} from '@app/features/platform/types/Electron';
+import type {ElectronAPI} from '@app/types/electron.d';
import type {DesktopLegacyHarvest} from '@fluxer/desktop_ipc/src/LegacyHarvestContract';
import {
DESKTOP_LEGACY_RAW_STORAGE_SEED_MARKER_KEY,
diff --git a/fluxer_app/src/features/platform/types/Electron.ts b/fluxer_app/src/features/platform/types/Electron.ts
deleted file mode 100644
index 87f662e70..000000000
--- a/fluxer_app/src/features/platform/types/Electron.ts
+++ /dev/null
@@ -1,762 +0,0 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-import type {DesktopAccountStorageAPI} from '@fluxer/desktop_ipc/src/AccountContract';
-import type {DesktopHandoffAPI} from '@fluxer/desktop_ipc/src/BrowserHandoffContract';
-import type {DesktopCapabilityManifest} from '@fluxer/desktop_ipc/src/CapabilityManifest';
-import type {NativeGatewayTransportAPI} from '@fluxer/desktop_ipc/src/GatewayTransportContract';
-import type {DesktopKnownInstanceStorageAPI} from '@fluxer/desktop_ipc/src/KnownInstanceContract';
-import type {DesktopLegacyHarvest} from '@fluxer/desktop_ipc/src/LegacyHarvestContract';
-import type {DesktopLocalAppUploadProgress} from '@fluxer/desktop_ipc/src/LocalAppRouteContract';
-import type {DesktopRuntimeConfigAPI} from '@fluxer/desktop_ipc/src/LocalAppRuntimeContract';
-import type {DesktopModuleAPI, DesktopUpdateAPI} from '@fluxer/desktop_ipc/src/ModuleContract';
-import type {DesktopStorageAPI} from '@fluxer/desktop_ipc/src/StorageContract';
-import type {VoiceEngineV2BridgeHardwareEncoderApi} from '@fluxer/voice_engine_v2/bridge';
-import type {
- AuthenticationResponseJSON,
- PublicKeyCredentialCreationOptionsJSON,
- PublicKeyCredentialRequestOptionsJSON,
- RegistrationResponseJSON,
-} from '@simplewebauthn/browser';
-
-export interface DesktopInfo {
- version: string;
- channel: 'stable' | 'canary';
- arch: string;
- hardwareArch: string;
- runningUnderRosetta: boolean;
- os: NodeJS.Platform;
- osVersion: string;
- systemVersion?: string;
- electronVersion: string;
- chromeVersion: string;
- nodeVersion: string;
- waylandSession: boolean;
- portable: boolean;
- flatpak: boolean;
- flatpakAppId: string | null;
- chromiumRuntime: ChromiumRuntimeInfo;
-}
-
-interface ChromiumRuntimeInfo {
- enableFeatures: Array<string>;
- disableFeatures: Array<string>;
- switches: Array<string>;
-}
-
-interface GpuDeviceInfo {
- active: boolean;
- vendorId: number;
- deviceId: number;
- vendorName?: string;
- deviceString?: string;
- driverVendor?: string;
- driverVersion?: string;
- dedicatedVideoMemory?: number;
- sharedSystemMemory?: number;
- subsystemVendorId?: number;
- subsystemDeviceId?: number;
- registryId?: string;
- adapterLuid?: string;
- pciPath?: string;
- integrated?: boolean;
- removable?: boolean;
- headless?: boolean;
- source?: 'metal' | 'dxgi' | 'linux-sysfs' | 'electron';
-}
-
-export interface GpuInfo {
- devices: ReadonlyArray<GpuDeviceInfo>;
- glRenderer?: string;
- glVendor?: string;
- machineModelName?: string;
- machineModelVersion?: string;
- nativeSource?: 'metal' | 'dxgi' | 'linux-sysfs';
-}
-
-interface DesktopWindowBehaviorSettings {
- showTrayIcon: boolean;
- minimizeToTray: boolean;
- closeToTray: boolean;
- startMinimized?: boolean;
- useNativeTitleBar: boolean;
- activeUseNativeTitleBar: boolean;
- rememberWindowState: boolean;
- allowTransparency: boolean;
- activeAllowTransparency: boolean;
- smoothScrolling: boolean;
- activeSmoothScrolling: boolean;
- middleClickAutoscroll: boolean;
- activeMiddleClickAutoscroll: boolean;
-}
-
-interface ThemeLocalFileReference {
- id: string;
- name: string;
- path: string;
- mimeType: string;
- size: number;
-}
-
-interface ThemeLocalFileReadResult {
- path: string;
- dataUrl?: string;
- error?: string;
-}
-
-interface ThemeDirectoryCssFile {
- fileName: string;
- path: string;
- css: string;
-}
-
-type ThemeLinkedFileError = 'not_allowed' | 'missing' | 'not_file' | 'too_large' | 'too_many' | 'read_failed';
-
-interface ThemeLinkedFileChange {
- path: string;
- css?: string;
- error?: ThemeLinkedFileError;
-}
-
-type VoiceBackgroundMediaKind = 'static' | 'animated' | 'video';
-
-interface VoiceBackgroundMediaCacheRequest {
- id: string;
- mimeType: string;
- fileName?: string;
- data: ArrayBuffer;
-}
-
-interface VoiceBackgroundMediaCacheResult {
- path: string;
- mediaKind: VoiceBackgroundMediaKind;
-}
-
-interface VoiceBackgroundMediaReadResult {
- path: string;
- mediaKind: VoiceBackgroundMediaKind;
- dataUrl: string;
-}
-
-interface DesktopVoiceDebugEventSinkEntry {
- sequence: number;
- line: string;
-}
-
-type TrayPresenceStatus = 'online' | 'idle' | 'dnd' | 'invisible';
-
-interface TrayRuntimeStatePayload {
- voiceConnected: boolean;
- voiceChannelLabel: string | null;
- selfMute: boolean;
- selfDeaf: boolean;
- presenceStatus: TrayPresenceStatus | null;
- buildInfo: string | null;
-}
-
-type TrayActionPayload =
- | {
- action: 'set-status';
- status: TrayPresenceStatus;
- }
- | {
- action: 'toggle-mute';
- }
- | {
- action: 'toggle-deafen';
- }
- | {
- action: 'disconnect-voice';
- }
- | {
- action: 'check-for-updates';
- };
-export type UpdaterContext = 'user' | 'background' | 'focus';
-export type UpdaterDownloadFormat = 'setup' | 'dmg' | 'zip' | 'appimage' | 'deb' | 'rpm' | 'tar_gz';
-export interface UpdaterDownloadOption {
- format: UpdaterDownloadFormat;
- label: string;
- url: string;
- suggestedName?: string;
- sha256?: string | null;
-}
-export type UpdaterEvent =
- | {
- type: 'checking';
- context: UpdaterContext;
- }
- | {
- type: 'available';
- context: UpdaterContext;
- version: string | null;
- downloadUrl?: string;
- downloadOptions?: Array<UpdaterDownloadOption>;
- }
- | {
- type: 'not-available';
- context: UpdaterContext;
- }
- | {
- type: 'downloaded';
- context: UpdaterContext;
- }
- | {
- type: 'error';
- context: UpdaterContext;
- message: string;
- }
- | {
- type: 'unsupported';
- context: UpdaterContext;
- reason: 'platform' | 'unpackaged' | 'managed-package';
- downloadUrl?: string;
- };
-
-interface DownloadFileResult {
- success: boolean;
- canceled?: boolean;
- checksumMismatch?: boolean;
- path?: string;
- error?: string;
-}
-
-type ClipboardWriteFileMediaType = 'image' | 'gif' | 'video' | 'audio';
-
-interface ClipboardWriteFileOptions {
- url: string;
- suggestedName?: string;
- mediaType: ClipboardWriteFileMediaType;
-}
-
-interface ClipboardWriteFileResult {
- success: boolean;
- path?: string;
- error?: string;
-}
-
-export type MediaAccessType = 'microphone' | 'camera' | 'screen' | 'audio-capture';
-export type MediaAccessStatus = 'granted' | 'denied' | 'not-determined' | 'restricted' | 'unknown';
-type InputMonitoringPermissionStatus = 'granted' | 'denied' | 'not-determined' | 'unsupported';
-
-interface DesktopSource {
- id: string;
- name: string;
- thumbnailDataUrl?: string;
- appIconDataUrl?: string;
- display_id?: string;
- nativeWidth?: number;
- nativeHeight?: number;
- isOwnWindow?: boolean;
-}
-
-interface DisplayMediaRequestInfo {
- audioRequested: boolean;
- videoRequested: boolean;
- supportsLoopbackAudio?: boolean;
-}
-
-interface NotificationOptions {
- id?: string;
- title: string;
- subtitle?: string;
- body: string;
- icon?: string;
- url?: string;
-}
-
-interface NotificationResult {
- id: string;
-}
-
-interface StreamerModeCaptureProcess {
- name: string;
- pid?: number;
-}
-
-interface StreamerModeCaptureAppStatus {
- detected: boolean;
- processes: Array<StreamerModeCaptureProcess>;
-}
-
-interface CpuInfo {
- model: string;
- speed: number;
- cores: number;
- physicalCores: number;
-}
-
-interface ProcessMetrics {
- cpu: {
- percentCPUUsage: number;
- };
- memory: {
- workingSetSize: number;
- peakWorkingSetSize: number;
- privateBytes?: number;
- };
- pid: number;
- type: string;
- name?: string;
-}
-
-export interface AppMetricsSnapshot {
- cpuInfo: CpuInfo;
- processes: Array<ProcessMetrics>;
- totalMemoryMB: number;
- freeMemoryMB: number;
-}
-
-interface DesktopLegacyHarvestAPI {
- read: () => Promise<DesktopLegacyHarvest | null>;
- markReplanted: () => Promise<void>;
- discard: () => Promise<void>;
-}
-
-interface DesktopLocalAppUploadAPI {
- subscribe: (listener: (progress: DesktopLocalAppUploadProgress) => void) => () => void;
-}
-
-interface DesktopLocalAppInfo {
- readonly origin: string;
-}
-
-export interface ElectronAPI {
- platform: NodeJS.Platform;
- localDevelopmentInstanceUrl?: string | null;
- getDesktopInfo: () => Promise<DesktopInfo>;
- getGpuInfo?: () => Promise<GpuInfo>;
- getAppMetrics?: () => Promise<AppMetricsSnapshot>;
- getSystemIdleTimeMs?: () => Promise<number>;
- getDesktopWindowBehaviorSettings: () => Promise<DesktopWindowBehaviorSettings>;
- setDesktopWindowBehaviorSettings: (
- settings: Partial<DesktopWindowBehaviorSettings>,
- ) => Promise<DesktopWindowBehaviorSettings>;
- getDesktopWindowBehaviorPendingRestart: () => Promise<boolean>;
- desktopAppRelaunch: () => Promise<void>;
- pickThemeLocalFiles: () => Promise<Array<ThemeLocalFileReference>>;
- readThemeLocalFiles: (paths: Array<string>) => Promise<Array<ThemeLocalFileReadResult>>;
- clearThemeLocalFiles: () => Promise<void>;
- importThemeDirectory: () => Promise<Array<ThemeDirectoryCssFile>>;
- pickThemeLinkedFiles: (options?: {multiple?: boolean}) => Promise<Array<ThemeDirectoryCssFile>>;
- watchThemeLinkedFiles: (paths: Array<string>) => Promise<void>;
- onThemeLinkedFileChange: (callback: (change: ThemeLinkedFileChange) => void) => () => void;
- cacheVoiceBackgroundMedia: (options: VoiceBackgroundMediaCacheRequest) => Promise<VoiceBackgroundMediaCacheResult>;
- readVoiceBackgroundMedia: (id: string) => Promise<VoiceBackgroundMediaReadResult | null>;
- deleteVoiceBackgroundMedia: (id: string) => Promise<void>;
- onUpdaterEvent: (callback: (event: UpdaterEvent) => void) => () => void;
- updaterCheck: (context: UpdaterContext) => Promise<void>;
- updaterDownload?: (context: UpdaterContext) => Promise<void>;
- updaterInstall?: () => Promise<void>;
- windowMinimize: () => void;
- windowMaximize: () => void;
- windowClose: () => void;
- windowIsMaximized: () => Promise<boolean>;
- focusThemeStudioPopout: () => Promise<boolean>;
- closeThemeStudioPopout: () => Promise<boolean>;
- popoutSetAlwaysOnTop?: (key: string, flag: boolean) => Promise<boolean>;
- popoutFocus?: (key: string) => Promise<boolean>;
- openVoiceDebugEventSinkPopout?: (entries: Array<DesktopVoiceDebugEventSinkEntry>) => Promise<void>;
- appendVoiceDebugEventSinkEntries?: (entries: Array<DesktopVoiceDebugEventSinkEntry>) => void;
- setVoiceDebugEventSinkStatsHtml?: (html: string) => void;
- onWindowLiveResizeChange: (callback: (resizing: boolean) => void) => () => void;
- onWindowMaximizeChange: (callback: (maximized: boolean) => void) => () => void;
- openExternal: (url: string) => Promise<void>;
- clipboardWriteText: (text: string) => Promise<void>;
- clipboardReadText: () => Promise<string>;
- clipboardWriteFile: (options: ClipboardWriteFileOptions) => Promise<ClipboardWriteFileResult>;
- pasteFromClipboard: () => Promise<void>;
- onDeepLink: (callback: (url: string) => void) => () => void;
- getInitialDeepLink: () => Promise<string | null>;
- autostartEnable: () => Promise<void>;
- autostartDisable: () => Promise<void>;
- autostartIsEnabled: () => Promise<boolean>;
- autostartIsInitialized: () => Promise<boolean>;
- autostartMarkInitialized: () => Promise<void>;
- checkMediaAccess: (type: MediaAccessType) => Promise<MediaAccessStatus>;
- requestMediaAccess: (type: MediaAccessType) => Promise<boolean>;
- openMediaAccessSettings: (type: MediaAccessType) => Promise<void>;
- openInputMonitoringSettings: () => Promise<void>;
- getInputMonitoringPermissionStatus?: () => Promise<InputMonitoringPermissionStatus>;
- requestInputMonitoringPermission?: () => Promise<InputMonitoringPermissionStatus>;
- getScreenRecordingPermissionStatus?: () => Promise<InputMonitoringPermissionStatus>;
- requestScreenRecordingPermission?: () => Promise<InputMonitoringPermissionStatus>;
- downloadFile: (url: string, defaultPath: string, sha256?: string | null) => Promise<DownloadFileResult>;
- showNotification: (options: NotificationOptions) => Promise<NotificationResult>;
- shouldPlayNotificationSound?: () => Promise<boolean>;
- getStreamerModeCaptureAppStatus?: () => Promise<StreamerModeCaptureAppStatus>;
- closeNotification: (id: string) => void;
- closeNotifications: (ids: Array<string>) => void;
- onNotificationClick: (callback: (id: string, url?: string) => void) => () => void;
- setBadgeCount: (count: number) => void;
- setNativeLocale: (locale: string, strings: Record<string, string>) => void;
- flashFrame: (persistent?: boolean) => void;
- stopFlashFrame: () => void;
- setTaskbarProgress: (fraction: number, mode?: 'normal' | 'indeterminate' | 'error' | 'paused' | 'none') => void;
- onJumpListNewDm: (callback: () => void) => () => void;
- setZoomFactor: (factor: number) => void;
- getAccessibilitySupportEnabled: () => Promise<boolean>;
- onAccessibilitySupportChanged: (callback: (enabled: boolean) => void) => () => void;
- onZoomIn: (callback: () => void) => () => void;
- onZoomOut: (callback: () => void) => () => void;
- onZoomReset: (callback: () => void) => () => void;
- onOpenSettings: (callback: () => void) => () => void;
- setTrayRuntimeState: (state: Partial<TrayRuntimeStatePayload>) => void;
- onTrayAction: (callback: (payload: TrayActionPayload) => void) => () => void;
- globalKeyHookStart: () => Promise<boolean>;
- globalKeyHookStop: () => Promise<void>;
- checkInputMonitoringAccess: () => Promise<boolean>;
- globalKeyHookRegister: (options: GlobalKeyHookRegisterOptions) => Promise<void>;
- globalKeyHookUnregister: (id: string) => Promise<void>;
- globalKeyHookUnregisterAll: () => Promise<void>;
- linuxEvdevStatus: () => Promise<{
- supported: boolean;
- hasAccess: boolean;
- canPrompt: boolean;
- sandboxed: boolean;
- username: string | null;
- totalEventDevices: number;
- readableEventDevices: number;
- inInputGroup: boolean;
- }>;
- globalShortcuts?: GlobalShortcutsApi;
- onGlobalKeyEvent: (callback: (event: GlobalKeyEvent) => void) => () => void;
- onGlobalMouseEvent: (callback: (event: GlobalMouseEvent) => void) => () => void;
- onGlobalKeybindTriggered: (callback: (event: GlobalKeybindTriggeredEvent) => void) => () => void;
- spellcheckSetState: (state: Partial<SpellcheckState>) => Promise<SpellcheckState>;
- spellcheckGetAvailableLanguages: () => Promise<Array<string>>;
- spellcheckGetBundledDictionaries?: () => Promise<Array<SpellcheckBundledDictionary>>;
- onSpellcheckStateChanged: (callback: (state: SpellcheckState) => void) => () => void;
- onSpellcheckEngineResolved?: (callback: (info: SpellcheckResolvedEngineInfo) => void) => () => void;
- onTextareaContextMenu: (callback: (params: TextareaContextMenuParams) => void) => () => void;
- spellcheckReplaceMisspelling: (replacement: string) => Promise<void>;
- spellcheckAddWordToDictionary: (word: string) => Promise<void>;
- passkeyIsSupported: () => Promise<boolean>;
- passkeyAuthenticate: (
- options: PublicKeyCredentialRequestOptionsJSON,
- requestContext?: {pin?: string; instanceKey?: string},
- ) => Promise<AuthenticationResponseJSON>;
- passkeyRegister: (
- options: PublicKeyCredentialCreationOptionsJSON,
- requestContext?: {pin?: string; instanceKey?: string},
- ) => Promise<RegistrationResponseJSON>;
- getDesktopSources: (
- types: Array<'screen' | 'window'>,
- requestId?: string,
- options?: {listOnly?: boolean},
- ) => Promise<Array<DesktopSource>>;
- onDisplayMediaRequested?: (callback: (requestId: string, info: DisplayMediaRequestInfo) => void) => () => void;
- onDisplayMediaPortalEmpty?: (callback: (requestId: string) => void) => () => void;
- selectDisplayMediaSource: (requestId: string, sourceId: string | null, withAudio: boolean) => void;
- virtmic: VirtmicApi;
- nativeAudio: NativeAudioApi;
- capabilities?: DesktopCapabilityManifest;
- desktopAccounts?: DesktopAccountStorageAPI;
- desktopStorage?: DesktopStorageAPI;
- desktopKnownInstances?: DesktopKnownInstanceStorageAPI;
- desktopHandoff?: DesktopHandoffAPI;
- desktopRuntimeConfig?: DesktopRuntimeConfigAPI;
- voiceEngine?: VoiceEngineV2BridgeHardwareEncoderApi;
- desktopModules?: DesktopModuleAPI;
- desktopUpdate?: DesktopUpdateAPI;
- desktopLegacyHarvest?: DesktopLegacyHarvestAPI;
- reportLastRoute?: (routePath: string) => void;
- notifyFirstContentPainted?: () => void;
- localAppUpload?: DesktopLocalAppUploadAPI;
- localApp?: DesktopLocalAppInfo;
- nativeGatewayTransport?: NativeGatewayTransportAPI;
-}
-
-type VirtmicUnavailableReason =
- | 'not-linux'
- | 'addon-not-installed'
- | 'load-failed'
- | 'no-pipewire'
- | 'disabled-by-launch'
- | 'glibcxx-too-old';
-type VirtmicBackend = 'pipewire';
-
-interface VirtmicAvailability {
- available: boolean;
- reason?: VirtmicUnavailableReason;
- backend?: VirtmicBackend;
-}
-
-type VirtmicNode = Record<string, string>;
-
-interface VirtmicLinkOptions {
- ignoreDevices?: boolean;
- ignoreInputMedia?: boolean;
- ignoreVirtual?: boolean;
- workaround?: boolean;
-}
-
-interface VirtmicApi {
- getAvailability: () => Promise<VirtmicAvailability>;
- listTargets: (options?: {granular?: boolean}) => Promise<{
- ok: boolean;
- targets?: Array<VirtmicNode>;
- availability: VirtmicAvailability;
- }>;
- stop: () => Promise<void>;
-}
-
-type NativeAudioBackend = 'macos-sck' | 'macos-coreaudio' | 'windows-wasapi-loopback' | 'linux-pipewire';
-
-interface NativeAudioAvailability {
- available: boolean;
- backend?: NativeAudioBackend;
- capabilities?: {
- process: boolean;
- system: boolean;
- systemExcludesSelf?: boolean;
- processInclude?: boolean;
- processExclude?: boolean;
- sessionMixer?: boolean;
- systemLoopbackMode?: 'process-exclude' | 'session-mixer' | 'unavailable';
- };
- reason?:
- | 'unsupported-platform'
- | 'addon-not-installed'
- | 'load-failed'
- | 'os-version-too-old'
- | 'permission-denied'
- | 'no-pipewire'
- | 'disabled-by-launch';
- detail?: string;
-}
-
-interface NativeAudioApplication {
- pid: number;
- identifier: string;
- name: string;
- audible?: boolean;
-}
-
-interface NativeAudioStartOptions {
- targetPid?: number;
- includeProcessTree?: boolean;
- macBackend?: 'sck' | 'coreaudio' | 'auto';
- macCaptureScope?: 'process' | 'system';
- winCaptureScope?: 'process' | 'system' | 'session-mixer';
- linuxRule?: VirtmicLinkOptions & {
- include?: Array<VirtmicNode>;
- exclude?: Array<VirtmicNode>;
- onlySpeakers?: boolean;
- onlyDefaultSpeakers?: boolean;
- };
-}
-
-interface NativeAudioStartResult {
- captureId: string;
- sampleRate: number;
- channels: number;
-}
-
-interface NativeAudioFrameMessage {
- captureId: string;
- sampleRate: number;
- channels: number;
- timestampUs: number;
- samples: ArrayBuffer;
-}
-
-type NativeAudioEndReason = 'stopped' | 'target-exited' | 'addon-error';
-
-interface NativeAudioEndMessage {
- captureId: string;
- reason: NativeAudioEndReason;
- detail?: string;
-}
-
-interface NativeAudioApi {
- getAvailability: () => Promise<NativeAudioAvailability>;
- listAudibleApplications: () => Promise<Array<NativeAudioApplication>>;
- resolveAudioRootPidForSource: (sourceId: string) => Promise<number | null>;
- start: (options: NativeAudioStartOptions) => Promise<NativeAudioStartResult>;
- setRule: (captureId: string, linuxRule: NonNullable<NativeAudioStartOptions['linuxRule']>) => Promise<boolean>;
- stop: (captureId: string) => Promise<void>;
- onFrame: (callback: (message: NativeAudioFrameMessage) => void) => () => void;
- onEnd: (callback: (message: NativeAudioEndMessage) => void) => () => void;
-}
-
-interface GlobalKeyHookRegisterOptions {
- id: string;
- description?: string;
- keycode?: number;
- keyName?: string;
- physicalKeyName?: string;
- mouseButton?: number;
- ctrl?: boolean;
- alt?: boolean;
- shift?: boolean;
- meta?: boolean;
-}
-
-export interface GlobalKeyEvent {
- type: 'keydown' | 'keyup';
- keycode: number;
- keyName: string;
- backend?: 'evdev' | 'native' | null;
- altKey: boolean;
- ctrlKey: boolean;
- shiftKey: boolean;
- metaKey: boolean;
-}
-
-interface GlobalMouseEvent {
- type: 'mousedown' | 'mouseup';
- button: number;
- altKey: boolean;
- ctrlKey: boolean;
- shiftKey: boolean;
- metaKey: boolean;
-}
-
-interface GlobalKeybindTriggeredEvent {
- id: string;
- type: 'keydown' | 'keyup';
-}
-
-type GlobalShortcutsBackend = 'portal' | 'x11' | 'evdev' | 'windows' | 'macos' | 'none';
-
-type GlobalShortcutsPortalState =
- | 'unknown'
- | 'probing'
- | 'unsupported'
- | 'not-set-up'
- | 'binding'
- | 'bound'
- | 'declined'
- | 'error';
-
-interface GlobalShortcutsPortalShortcut {
- action: string;
- triggerDescription: string | null;
-}
-
-interface GlobalShortcutsPortalStatus {
- state: GlobalShortcutsPortalState;
- version: number | null;
- canConfigure: boolean;
- canRecheck: boolean;
- portalAppId: string | null;
- shortcuts: Array<GlobalShortcutsPortalShortcut>;
- error: string | null;
- recovering: boolean;
-}
-
-interface GlobalShortcutsLinuxStatus {
- session: 'wayland' | 'x11' | 'unknown';
- sandbox: 'flatpak' | 'none';
- desktop: 'kde' | 'gnome' | 'hyprland' | 'other';
- portal: GlobalShortcutsPortalStatus | null;
- directInput: {available: boolean; enabled: boolean; locked: boolean};
-}
-
-interface GlobalShortcutsStatus {
- backend: GlobalShortcutsBackend;
- platform: 'linux' | 'windows' | 'macos';
- linux: GlobalShortcutsLinuxStatus | null;
- hooksActive: boolean;
- hookError: 'permission' | 'start-failed' | null;
- supportsMouseButtons: boolean;
- supportsModifierOnly: boolean;
-}
-
-interface GlobalShortcutCombo {
- code?: string;
- key: string;
- ctrl: boolean;
- alt: boolean;
- shift: boolean;
- meta: boolean;
- mouseButton?: number;
- modifierOnly?: boolean;
- bothSides?: boolean;
-}
-
-interface GlobalShortcutBinding {
- sourceId: string;
- action: string;
- combo: GlobalShortcutCombo;
-}
-
-interface GlobalShortcutActionDefinition {
- action: string;
- description: string;
- preferredCombo: GlobalShortcutCombo | null;
-}
-
-interface GlobalShortcutsSyncPayload {
- bindings: Array<GlobalShortcutBinding>;
- actions: Array<GlobalShortcutActionDefinition>;
-}
-
-interface GlobalShortcutEvent {
- action: string;
- sourceId: string;
- phase: 'press' | 'release';
-}
-
-export interface GlobalShortcutCaptureEvent {
- type: 'keydown' | 'keyup' | 'mousedown' | 'mouseup';
- code: string | null;
- key: string | null;
- button: number | null;
- ctrl: boolean;
- alt: boolean;
- shift: boolean;
- meta: boolean;
-}
-
-export interface GlobalShortcutsApi {
- sync: (payload: GlobalShortcutsSyncPayload) => Promise<void>;
- setPaused: (paused: boolean) => Promise<void>;
- getStatus: () => Promise<GlobalShortcutsStatus>;
- onStatus: (callback: (status: GlobalShortcutsStatus) => void) => () => void;
- onEvent: (callback: (event: GlobalShortcutEvent) => void) => () => void;
- setUp: () => Promise<GlobalShortcutsStatus>;
- configure: () => Promise<void>;
- setDirectInputEnabled: (enabled: boolean) => Promise<GlobalShortcutsStatus>;
- recheck: () => Promise<GlobalShortcutsStatus>;
- startCapture: () => Promise<number | null>;
- stopCapture: (captureId: number) => Promise<void>;
- onCapture: (callback: (event: GlobalShortcutCaptureEvent) => void) => () => void;
-}
-
-export type SpellcheckEngine = 'auto' | 'hunspell' | 'system';
-
-interface SpellcheckState {
- enabled: boolean;
- engine: SpellcheckEngine;
- autoDetect: boolean;
- languages: Array<string>;
- personalDictionary: Array<string>;
-}
-
-export interface SpellcheckBundledDictionary {
- tag: string;
- package: string;
- displayName: string;
- nativeName: string;
-}
-
-export interface SpellcheckResolvedEngineInfo {
- mode: 'hunspell' | 'system' | 'off';
- hunspellLangs: Array<string>;
- systemLangs: Array<string>;
-}
-
-interface TextareaContextMenuParams {
- misspelledWord?: string;
- suggestions?: Array<string>;
- editFlags: {
- canUndo: boolean;
- canRedo: boolean;
- canCut: boolean;
- canCopy: boolean;
- canPaste: boolean;
- canSelectAll: boolean;
- };
- x: number;
- y: number;
-}
diff --git a/fluxer_app/src/features/platform/utils/DesktopModuleRequest.test.ts b/fluxer_app/src/features/platform/utils/DesktopModuleRequest.test.ts
index 86d33eb5d..a084ffaa2 100644
--- a/fluxer_app/src/features/platform/utils/DesktopModuleRequest.test.ts
+++ b/fluxer_app/src/features/platform/utils/DesktopModuleRequest.test.ts
@@ -1,8 +1,8 @@
// @vitest-environment happy-dom
// SPDX-License-Identifier: AGPL-3.0-or-later
-import type {ElectronAPI} from '@app/features/platform/types/Electron';
import {createDesktopModuleRequest} from '@app/features/platform/utils/DesktopModuleRequest';
+import type {ElectronAPI} from '@app/types/electron.d';
import type {DesktopModuleEnsureResult, DesktopModuleEnsureStatus} from '@fluxer/desktop_ipc/src/ModuleContract';
import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
diff --git a/fluxer_app/src/features/premium/commands/PremiumCommands.ts b/fluxer_app/src/features/premium/commands/PremiumCommands.ts
index 9e49ed140..871f82663 100644
--- a/fluxer_app/src/features/premium/commands/PremiumCommands.ts
+++ b/fluxer_app/src/features/premium/commands/PremiumCommands.ts
@@ -12,15 +12,12 @@ import type {
PriceIdsResponse,
SelfServeRefundResponse,
SwitchToListPriceResponse,
+ UrlResponse,
} from '@fluxer/schema/src/domains/premium/PremiumSchemas';
const logger = new Logger('Premium');
export type PriceIds = PriceIdsResponse;
-interface UrlResponse {
- url: string;
-}
-
interface PremiumPerksDisabledRequest {
disabled: boolean;
}
diff --git a/fluxer_app/src/features/premium/components/plutonium_page/PlutoniumPageComparison.tsx b/fluxer_app/src/features/premium/components/plutonium_page/PlutoniumPageComparison.tsx
index 1fee1bab2..6fa755df4 100644
--- a/fluxer_app/src/features/premium/components/plutonium_page/PlutoniumPageComparison.tsx
+++ b/fluxer_app/src/features/premium/components/plutonium_page/PlutoniumPageComparison.tsx
@@ -2,6 +2,7 @@
import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
import {Limits} from '@app/features/app/utils/UserLimits';
+import {formatNumber} from '@app/features/i18n/utils/IntlCache';
import styles from '@app/features/premium/components/plutonium_page/PlutoniumPage.module.css';
import {
PlutoniumPageIcon,
@@ -42,7 +43,6 @@ import {
} from '@fluxer/constants/src/LimitTierPerks';
import type {MessageDescriptor} from '@lingui/core';
import {useLingui} from '@lingui/react/macro';
-import {formatNumber} from '@pkgs/number_utils/src/NumberFormatting';
import {clsx} from 'clsx';
import {observer} from 'mobx-react-lite';
import type React from 'react';
diff --git a/fluxer_app/src/features/read_state/commands/ReadStateCommands.ts b/fluxer_app/src/features/read_state/commands/ReadStateCommands.ts
index 10bad287f..f4438fe88 100644
--- a/fluxer_app/src/features/read_state/commands/ReadStateCommands.ts
+++ b/fluxer_app/src/features/read_state/commands/ReadStateCommands.ts
@@ -4,6 +4,7 @@ import Channels from '@app/features/channel/state/Channels';
import Messages from '@app/features/messaging/state/MessagingMessages';
import {Logger} from '@app/features/platform/utils/AppLogger';
import ReadStates from '@app/features/read_state/state/ReadStates';
+import {chunkEntries} from '@app/features/read_state/state/read_states/shared';
import {atPreviousMillisecond} from '@fluxer/snowflake/src/SnowflakeUtils';
const logger = new Logger('ReadStateCommands');
@@ -26,14 +27,6 @@ function previousReadableMessageId(channelId: string, messageId: string): string
return messageIndex > 0 ? messagesArray[messageIndex - 1].id : atPreviousMillisecond(messageId);
}
-function chunkEntries<T>(entries: Array<T>, size: number): Array<Array<T>> {
- const chunks: Array<Array<T>> = [];
- for (let i = 0; i < entries.length; i += size) {
- chunks.push(entries.slice(i, i + size));
- }
- return chunks;
-}
-
function latestBulkAckEntry(channelId: string): BulkAckEntry | null {
const messageId = ReadStates.lastMessageId(channelId) ?? Channels.getChannel(channelId)?.lastMessageId ?? null;
if (messageId == null) {
diff --git a/fluxer_app/src/features/search/state/ReverseImageSearch.ts b/fluxer_app/src/features/search/state/ReverseImageSearch.ts
index 9e7842d17..af87b017a 100644
--- a/fluxer_app/src/features/search/state/ReverseImageSearch.ts
+++ b/fluxer_app/src/features/search/state/ReverseImageSearch.ts
@@ -1,169 +1,47 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import {Logger} from '@app/features/platform/utils/AppLogger';
import {makePersistent} from '@app/features/platform/utils/MobXPersistence';
-import {initializeStore} from '@app/features/platform/utils/StoreInitialization';
-import UserSettings from '@app/features/user/state/UserSettings';
-import {create} from '@bufbuild/protobuf';
-import {SearchEngineSettingsSchema} from '@fluxer/schema/src/gen/fluxer/user/preferences/v1/preferences_pb';
-import {makeAutoObservable} from 'mobx';
+import {UrlTemplateProviderStore} from '@app/features/search/state/UrlTemplateProviderStore';
-interface ReverseImageSearchEngine {
- id: string;
- name: string;
- urlTemplate: string;
- enabled: boolean;
- isBuiltIn: boolean;
-}
-
-const logger = new Logger('ReverseImageSearch');
-const BUILT_IN_ENGINES: ReadonlyArray<Omit<ReverseImageSearchEngine, 'enabled'>> = [
- {
- id: 'google_lens',
- name: 'Google Lens',
- urlTemplate: 'https://lens.google.com/uploadbyurl?url={url}',
- isBuiltIn: true,
- },
- {
- id: 'yandex',
- name: 'Yandex',
- urlTemplate: 'https://yandex.com/images/search?rpt=imageview&url={url}',
- isBuiltIn: true,
- },
- {
- id: 'bing',
- name: 'Bing',
- urlTemplate: 'https://www.bing.com/images/searchbyimage?cbir=sbi&imgurl={url}',
- isBuiltIn: true,
- },
- {
- id: 'tineye',
- name: 'TinEye',
- urlTemplate: 'https://tineye.com/search?url={url}',
- isBuiltIn: true,
- },
- {
- id: 'saucenao',
- name: 'SauceNAO',
- urlTemplate: 'https://saucenao.com/search.php?url={url}',
- isBuiltIn: true,
- },
- {
- id: 'iqdb',
- name: 'IQDB',
- urlTemplate: 'https://iqdb.org/?url={url}',
- isBuiltIn: true,
+export default new UrlTemplateProviderStore({
+ name: 'ReverseImageSearch',
+ persist() {
+ return makePersistent(this, 'ReverseImageSearch', ['engines'], {version: 2});
},
-];
-const SUGGESTED_DEFAULT_REVERSE_IMAGE_SEARCH_ENGINE_ID = 'google_lens';
-
-function createDefaultReverseImageSearchEngines(): Array<ReverseImageSearchEngine> {
- return BUILT_IN_ENGINES.map((engine) => ({
- ...engine,
- enabled: engine.id === SUGGESTED_DEFAULT_REVERSE_IMAGE_SEARCH_ENGINE_ID,
- }));
-}
-
-class ReverseImageSearch {
- engines: Array<ReverseImageSearchEngine> = createDefaultReverseImageSearchEngines();
-
- constructor() {
- makeAutoObservable(this, {}, {autoBind: true});
- initializeStore(this, () => makePersistent(this, 'ReverseImageSearch', ['engines'], {version: 2}));
- }
-
- get enabledEngines(): ReadonlyArray<ReverseImageSearchEngine> {
- return this.engines.filter((engine) => engine.enabled);
- }
-
- get defaultEngineId(): string | null {
- const value = UserSettings.getSubPreference('searchEngines')?.reverseImageSearchEngineId;
- return typeof value === 'string' && value.length > 0 ? value : null;
- }
-
- get defaultEngine(): ReverseImageSearchEngine | null {
- const id = this.defaultEngineId;
- if (id == null) return null;
- const engine = this.engines.find((entry) => entry.id === id && entry.enabled);
- return engine ?? null;
- }
-
- get effectiveDefaultEngine(): ReverseImageSearchEngine | null {
- if (this.defaultEngine) return this.defaultEngine;
- const enabled = this.enabledEngines;
- return enabled.length === 1 ? enabled[0] : null;
- }
-
- get nonDefaultEnabledEngines(): ReadonlyArray<ReverseImageSearchEngine> {
- const defaultId = this.defaultEngine?.id;
- return this.enabledEngines.filter((engine) => engine.id !== defaultId);
- }
-
- setEnabled(engineId: string, enabled: boolean): void {
- const engine = this.engines.find((entry) => entry.id === engineId);
- if (!engine) return;
- engine.enabled = enabled;
- if (!enabled && this.defaultEngineId === engineId) {
- void this.persistDefault(null);
- }
- }
-
- setDefaultEngine(engineId: string): Promise<void> {
- const engine = this.engines.find((entry) => entry.id === engineId);
- if (!engine) return Promise.resolve();
- if (!engine.enabled) {
- engine.enabled = true;
- }
- return this.persistDefault(engineId);
- }
-
- addCustomEngine(name: string, urlTemplate: string): string {
- const id = `custom_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
- this.engines.push({
- id,
- name,
- urlTemplate,
- enabled: true,
- isBuiltIn: false,
- });
- return id;
- }
-
- removeCustomEngine(engineId: string): void {
- const engine = this.engines.find((entry) => entry.id === engineId);
- if (!engine || engine.isBuiltIn) return;
- this.engines = this.engines.filter((entry) => entry.id !== engineId);
- if (this.defaultEngineId === engineId) {
- void this.persistDefault(null);
- }
- }
-
- updateCustomEngine(engineId: string, name: string, urlTemplate: string): void {
- const engine = this.engines.find((entry) => entry.id === engineId);
- if (!engine || engine.isBuiltIn) return;
- engine.name = name;
- engine.urlTemplate = urlTemplate;
- }
-
- buildSearchUrl(engineId: string, imageUrl: string): string {
- const engine = this.engines.find((entry) => entry.id === engineId);
- if (!engine) return '';
- return engine.urlTemplate.replace(/\{url\}/gu, encodeURIComponent(imageUrl));
- }
-
- private async persistDefault(engineId: string | null): Promise<void> {
- try {
- const current = UserSettings.getSubPreference('searchEngines');
- const next = create(SearchEngineSettingsSchema, {
- textSearchEngineId: current?.textSearchEngineId,
- reverseImageSearchEngineId: engineId ?? undefined,
- translationProviderId: current?.translationProviderId,
- });
- await UserSettings.setSubPreference('searchEngines', next);
- } catch (error) {
- logger.error('Failed to persist default reverse-image-search engine', error);
- }
- }
-}
-
-export default new ReverseImageSearch();
+ builtIns: [
+ {
+ id: 'google_lens',
+ name: 'Google Lens',
+ urlTemplate: 'https://lens.google.com/uploadbyurl?url={url}',
+ },
+ {
+ id: 'yandex',
+ name: 'Yandex',
+ urlTemplate: 'https://yandex.com/images/search?rpt=imageview&url={url}',
+ },
+ {
+ id: 'bing',
+ name: 'Bing',
+ urlTemplate: 'https://www.bing.com/images/searchbyimage?cbir=sbi&imgurl={url}',
+ },
+ {
+ id: 'tineye',
+ name: 'TinEye',
+ urlTemplate: 'https://tineye.com/search?url={url}',
+ },
+ {
+ id: 'saucenao',
+ name: 'SauceNAO',
+ urlTemplate: 'https://saucenao.com/search.php?url={url}',
+ },
+ {
+ id: 'iqdb',
+ name: 'IQDB',
+ urlTemplate: 'https://iqdb.org/?url={url}',
+ },
+ ],
+ suggestedDefaultId: 'google_lens',
+ defaultField: 'reverseImageSearchEngineId',
+ placeholder: /\{url\}/gu,
+ persistFailureMessage: 'Failed to persist default reverse-image-search engine',
+});
diff --git a/fluxer_app/src/features/search/state/SearchEngine.ts b/fluxer_app/src/features/search/state/SearchEngine.ts
index 1a21255c2..819be77ea 100644
--- a/fluxer_app/src/features/search/state/SearchEngine.ts
+++ b/fluxer_app/src/features/search/state/SearchEngine.ts
@@ -1,160 +1,41 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import {Logger} from '@app/features/platform/utils/AppLogger';
import {makePersistent} from '@app/features/platform/utils/MobXPersistence';
-import {initializeStore} from '@app/features/platform/utils/StoreInitialization';
-import UserSettings from '@app/features/user/state/UserSettings';
-import {create} from '@bufbuild/protobuf';
-import {SearchEngineSettingsSchema} from '@fluxer/schema/src/gen/fluxer/user/preferences/v1/preferences_pb';
-import {makeAutoObservable} from 'mobx';
+import {UrlTemplateProviderStore} from '@app/features/search/state/UrlTemplateProviderStore';
-interface SearchEngine {
- id: string;
- name: string;
- urlTemplate: string;
- enabled: boolean;
- isBuiltIn: boolean;
-}
-
-const logger = new Logger('SearchEngine');
-const BUILT_IN_SEARCH_ENGINES: ReadonlyArray<Omit<SearchEngine, 'enabled'>> = [
- {id: 'google', name: 'Google', urlTemplate: 'https://www.google.com/search?q={query}', isBuiltIn: true},
- {id: 'bing', name: 'Bing', urlTemplate: 'https://www.bing.com/search?q={query}', isBuiltIn: true},
- {id: 'duckduckgo', name: 'DuckDuckGo', urlTemplate: 'https://duckduckgo.com/?q={query}', isBuiltIn: true},
- {id: 'yahoo', name: 'Yahoo', urlTemplate: 'https://search.yahoo.com/search?p={query}', isBuiltIn: true},
- {id: 'ecosia', name: 'Ecosia', urlTemplate: 'https://www.ecosia.org/search?q={query}', isBuiltIn: true},
- {id: 'brave', name: 'Brave Search', urlTemplate: 'https://search.brave.com/search?q={query}', isBuiltIn: true},
- {
- id: 'startpage',
- name: 'Startpage',
- urlTemplate: 'https://www.startpage.com/do/dsearch?query={query}',
- isBuiltIn: true,
- },
- {id: 'yandex', name: 'Yandex', urlTemplate: 'https://yandex.com/search/?text={query}', isBuiltIn: true},
- {
- id: 'wikipedia',
- name: 'Wikipedia',
- urlTemplate: 'https://en.wikipedia.org/w/index.php?search={query}',
- isBuiltIn: true,
- },
- {
- id: 'youtube',
- name: 'YouTube',
- urlTemplate: 'https://www.youtube.com/results?search_query={query}',
- isBuiltIn: true,
+export default new UrlTemplateProviderStore({
+ name: 'SearchEngine',
+ persist() {
+ return makePersistent(this, 'SearchEngine', ['engines'], {version: 2});
},
- {id: 'github', name: 'GitHub', urlTemplate: 'https://github.com/search?q={query}', isBuiltIn: true},
- {id: 'reddit', name: 'Reddit', urlTemplate: 'https://www.reddit.com/search/?q={query}', isBuiltIn: true},
-];
-const SUGGESTED_DEFAULT_SEARCH_ENGINE_ID = 'google';
-
-function createDefaultSearchEngines(): Array<SearchEngine> {
- return BUILT_IN_SEARCH_ENGINES.map((engine) => ({
- ...engine,
- enabled: engine.id === SUGGESTED_DEFAULT_SEARCH_ENGINE_ID,
- }));
-}
-
-class SearchEngines {
- engines: Array<SearchEngine> = createDefaultSearchEngines();
-
- constructor() {
- makeAutoObservable(this, {}, {autoBind: true});
- initializeStore(this, () => makePersistent(this, 'SearchEngine', ['engines'], {version: 2}));
- }
-
- get enabledEngines(): ReadonlyArray<SearchEngine> {
- return this.engines.filter((engine) => engine.enabled);
- }
-
- get defaultEngineId(): string | null {
- const value = UserSettings.getSubPreference('searchEngines')?.textSearchEngineId;
- return typeof value === 'string' && value.length > 0 ? value : null;
- }
-
- get defaultEngine(): SearchEngine | null {
- const id = this.defaultEngineId;
- if (id == null) return null;
- const engine = this.engines.find((entry) => entry.id === id && entry.enabled);
- return engine ?? null;
- }
-
- get effectiveDefaultEngine(): SearchEngine | null {
- if (this.defaultEngine) return this.defaultEngine;
- const enabled = this.enabledEngines;
- return enabled.length === 1 ? enabled[0] : null;
- }
-
- get nonDefaultEnabledEngines(): ReadonlyArray<SearchEngine> {
- const defaultId = this.defaultEngine?.id;
- return this.enabledEngines.filter((engine) => engine.id !== defaultId);
- }
-
- setEnabled(engineId: string, enabled: boolean): void {
- const engine = this.engines.find((entry) => entry.id === engineId);
- if (!engine) return;
- engine.enabled = enabled;
- if (!enabled && this.defaultEngineId === engineId) {
- void this.persistDefault(null);
- }
- }
-
- setDefaultEngine(engineId: string): Promise<void> {
- const engine = this.engines.find((entry) => entry.id === engineId);
- if (!engine) return Promise.resolve();
- if (!engine.enabled) {
- engine.enabled = true;
- }
- return this.persistDefault(engineId);
- }
-
- addCustomEngine(name: string, urlTemplate: string): string {
- const id = `custom_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
- this.engines.push({
- id,
- name,
- urlTemplate,
- enabled: true,
- isBuiltIn: false,
- });
- return id;
- }
-
- removeCustomEngine(engineId: string): void {
- const engine = this.engines.find((entry) => entry.id === engineId);
- if (!engine || engine.isBuiltIn) return;
- this.engines = this.engines.filter((entry) => entry.id !== engineId);
- if (this.defaultEngineId === engineId) {
- void this.persistDefault(null);
- }
- }
-
- updateCustomEngine(engineId: string, name: string, urlTemplate: string): void {
- const engine = this.engines.find((entry) => entry.id === engineId);
- if (!engine || engine.isBuiltIn) return;
- engine.name = name;
- engine.urlTemplate = urlTemplate;
- }
-
- buildSearchUrl(engineId: string, query: string): string {
- const engine = this.engines.find((entry) => entry.id === engineId);
- if (!engine) return '';
- return engine.urlTemplate.replace(/\{query\}/gu, encodeURIComponent(query));
- }
-
- private async persistDefault(engineId: string | null): Promise<void> {
- try {
- const current = UserSettings.getSubPreference('searchEngines');
- const next = create(SearchEngineSettingsSchema, {
- textSearchEngineId: engineId ?? undefined,
- reverseImageSearchEngineId: current?.reverseImageSearchEngineId,
- translationProviderId: current?.translationProviderId,
- });
- await UserSettings.setSubPreference('searchEngines', next);
- } catch (error) {
- logger.error('Failed to persist default web-search engine', error);
- }
- }
-}
-
-export default new SearchEngines();
+ builtIns: [
+ {id: 'google', name: 'Google', urlTemplate: 'https://www.google.com/search?q={query}'},
+ {id: 'bing', name: 'Bing', urlTemplate: 'https://www.bing.com/search?q={query}'},
+ {id: 'duckduckgo', name: 'DuckDuckGo', urlTemplate: 'https://duckduckgo.com/?q={query}'},
+ {id: 'yahoo', name: 'Yahoo', urlTemplate: 'https://search.yahoo.com/search?p={query}'},
+ {id: 'ecosia', name: 'Ecosia', urlTemplate: 'https://www.ecosia.org/search?q={query}'},
+ {id: 'brave', name: 'Brave Search', urlTemplate: 'https://search.brave.com/search?q={query}'},
+ {
+ id: 'startpage',
+ name: 'Startpage',
+ urlTemplate: 'https://www.startpage.com/do/dsearch?query={query}',
+ },
+ {id: 'yandex', name: 'Yandex', urlTemplate: 'https://yandex.com/search/?text={query}'},
+ {
+ id: 'wikipedia',
+ name: 'Wikipedia',
+ urlTemplate: 'https://en.wikipedia.org/w/index.php?search={query}',
+ },
+ {
+ id: 'youtube',
+ name: 'YouTube',
+ urlTemplate: 'https://www.youtube.com/results?search_query={query}',
+ },
+ {id: 'github', name: 'GitHub', urlTemplate: 'https://github.com/search?q={query}'},
+ {id: 'reddit', name: 'Reddit', urlTemplate: 'https://www.reddit.com/search/?q={query}'},
+ ],
+ suggestedDefaultId: 'google',
+ defaultField: 'textSearchEngineId',
+ placeholder: /\{query\}/gu,
+ persistFailureMessage: 'Failed to persist default web-search engine',
+});
diff --git a/fluxer_app/src/features/search/state/UrlTemplateProviderStore.ts b/fluxer_app/src/features/search/state/UrlTemplateProviderStore.ts
new file mode 100644
index 000000000..5ff81e58d
--- /dev/null
+++ b/fluxer_app/src/features/search/state/UrlTemplateProviderStore.ts
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {Logger} from '@app/features/platform/utils/AppLogger';
+import {initializeStore} from '@app/features/platform/utils/StoreInitialization';
+import UserSettings from '@app/features/user/state/UserSettings';
+import {create} from '@bufbuild/protobuf';
+import {SearchEngineSettingsSchema} from '@fluxer/schema/src/gen/fluxer/user/preferences/v1/preferences_pb';
+import {makeAutoObservable} from 'mobx';
+
+interface UrlTemplateProvider {
+ id: string;
+ name: string;
+ urlTemplate: string;
+ enabled: boolean;
+ isBuiltIn: boolean;
+}
+
+type DefaultProviderField = 'textSearchEngineId' | 'reverseImageSearchEngineId' | 'translationProviderId';
+
+interface UrlTemplateProviderStoreConfig {
+ name: string;
+ persist: (this: UrlTemplateProviderStore) => Promise<void>;
+ builtIns: ReadonlyArray<Omit<UrlTemplateProvider, 'enabled' | 'isBuiltIn'>>;
+ suggestedDefaultId: string;
+ defaultField: DefaultProviderField;
+ placeholder: RegExp;
+ persistFailureMessage: string;
+}
+
+export class UrlTemplateProviderStore {
+ engines: Array<UrlTemplateProvider>;
+ private readonly config: UrlTemplateProviderStoreConfig;
+ private readonly logger: Logger;
+
+ constructor(config: UrlTemplateProviderStoreConfig) {
+ this.config = config;
+ this.logger = new Logger(config.name);
+ this.engines = config.builtIns.map((engine) => ({
+ ...engine,
+ isBuiltIn: true,
+ enabled: engine.id === config.suggestedDefaultId,
+ }));
+ makeAutoObservable<this, 'config' | 'logger'>(this, {config: false, logger: false}, {autoBind: true});
+ initializeStore(this, () => config.persist.call(this));
+ }
+
+ get enabledEngines(): ReadonlyArray<UrlTemplateProvider> {
+ return this.engines.filter((engine) => engine.enabled);
+ }
+
+ get defaultEngineId(): string | null {
+ const value = UserSettings.getSubPreference('searchEngines')?.[this.config.defaultField];
+ return typeof value === 'string' && value.length > 0 ? value : null;
+ }
+
+ get defaultEngine(): UrlTemplateProvider | null {
+ const id = this.defaultEngineId;
+ if (id == null) return null;
+ const engine = this.engines.find((entry) => entry.id === id && entry.enabled);
+ return engine ?? null;
+ }
+
+ get effectiveDefaultEngine(): UrlTemplateProvider | null {
+ if (this.defaultEngine) return this.defaultEngine;
+ const enabled = this.enabledEngines;
+ return enabled.length === 1 ? enabled[0] : null;
+ }
+
+ get nonDefaultEnabledEngines(): ReadonlyArray<UrlTemplateProvider> {
+ const defaultId = this.defaultEngine?.id;
+ return this.enabledEngines.filter((engine) => engine.id !== defaultId);
+ }
+
+ setEnabled(engineId: string, enabled: boolean): void {
+ const engine = this.engines.find((entry) => entry.id === engineId);
+ if (!engine) return;
+ engine.enabled = enabled;
+ if (!enabled && this.defaultEngineId === engineId) {
+ void this.persistDefault(null);
+ }
+ }
+
+ setDefaultEngine(engineId: string): Promise<void> {
+ const engine = this.engines.find((entry) => entry.id === engineId);
+ if (!engine) return Promise.resolve();
+ if (!engine.enabled) {
+ engine.enabled = true;
+ }
+ return this.persistDefault(engineId);
+ }
+
+ addCustomEngine(name: string, urlTemplate: string): string {
+ const id = `custom_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+ this.engines.push({
+ id,
+ name,
+ urlTemplate,
+ enabled: true,
+ isBuiltIn: false,
+ });
+ return id;
+ }
+
+ removeCustomEngine(engineId: string): void {
+ const engine = this.engines.find((entry) => entry.id === engineId);
+ if (!engine || engine.isBuiltIn) return;
+ this.engines = this.engines.filter((entry) => entry.id !== engineId);
+ if (this.defaultEngineId === engineId) {
+ void this.persistDefault(null);
+ }
+ }
+
+ updateCustomEngine(engineId: string, name: string, urlTemplate: string): void {
+ const engine = this.engines.find((entry) => entry.id === engineId);
+ if (!engine || engine.isBuiltIn) return;
+ engine.name = name;
+ engine.urlTemplate = urlTemplate;
+ }
+
+ buildSearchUrl(engineId: string, query: string): string {
+ const engine = this.engines.find((entry) => entry.id === engineId);
+ if (!engine) return '';
+ return engine.urlTemplate.replace(this.config.placeholder, encodeURIComponent(query));
+ }
+
+ private async persistDefault(engineId: string | null): Promise<void> {
+ try {
+ const current = UserSettings.getSubPreference('searchEngines');
+ const next = create(SearchEngineSettingsSchema, {
+ textSearchEngineId: current?.textSearchEngineId,
+ reverseImageSearchEngineId: current?.reverseImageSearchEngineId,
+ translationProviderId: current?.translationProviderId,
+ [this.config.defaultField]: engineId ?? undefined,
+ });
+ await UserSettings.setSubPreference('searchEngines', next);
+ } catch (error) {
+ this.logger.error(this.config.persistFailureMessage, error);
+ }
+ }
+}
diff --git a/fluxer_app/src/features/theme/components/pages/ThemeRegisterPage.tsx b/fluxer_app/src/features/theme/components/pages/ThemeRegisterPage.tsx
index a49721bb8..5beff6dfe 100644
--- a/fluxer_app/src/features/theme/components/pages/ThemeRegisterPage.tsx
+++ b/fluxer_app/src/features/theme/components/pages/ThemeRegisterPage.tsx
@@ -6,9 +6,9 @@ import * as AuthenticationCommands from '@app/features/auth/commands/Authenticat
import {AuthBottomLink} from '@app/features/auth/flow/AuthBottomLink';
import {AuthErrorState} from '@app/features/auth/flow/AuthErrorState';
import {AuthLoadingState} from '@app/features/auth/flow/AuthLoadingState';
-import {AuthMinimalRegisterFormCore} from '@app/features/auth/flow/AuthMinimalRegisterFormCore';
import {AuthPageHeader} from '@app/features/auth/flow/AuthPageHeader';
import sharedStyles from '@app/features/auth/flow/AuthPageStyles.module.css';
+import {AuthRegisterFormCore} from '@app/features/auth/flow/AuthRegisterFormCore';
import {AuthRuntimeTargetGate} from '@app/features/auth/flow/AuthRuntimeTargetGate';
import {AuthRuntimeTargetResetAction} from '@app/features/auth/flow/AuthRuntimeTargetResetAction';
import {AuthSsoPanel, resolveAuthPanelSso} from '@app/features/auth/flow/AuthSsoPanel';
@@ -143,7 +143,8 @@ const ThemeRegisterPageContent = observer(function ThemeRegisterPageContent({
subtitle={i18n._(SHARED_THEME_DESCRIPTOR)}
data-flx="theme.theme-register-page.auth-page-header"
/>
- <AuthMinimalRegisterFormCore
+ <AuthRegisterFormCore
+ fields={{showUsername: false}}
submitLabel={<Trans>Create account</Trans>}
redirectPath={themePath}
onRegister={handleRegisterComplete}
diff --git a/fluxer_app/src/features/theme/state/ThemeLibrary.ts b/fluxer_app/src/features/theme/state/ThemeLibrary.ts
index cbb370b7c..2a6bf6dba 100644
--- a/fluxer_app/src/features/theme/state/ThemeLibrary.ts
+++ b/fluxer_app/src/features/theme/state/ThemeLibrary.ts
@@ -28,6 +28,7 @@ import {
updateThemeLibraryThemes,
} from '@app/features/theme/utils/ThemeLibraryDb';
import {getElectronAPI} from '@app/features/ui/utils/NativeUtils';
+import {readFileText} from '@app/features/user/components/modals/tabs/appearance_tab/theme/ThemeUtils';
import type {ThemeLinkedFileError} from '@app/types/electron.d';
import {i18n} from '@lingui/core';
import {msg} from '@lingui/core/macro';
@@ -108,15 +109,6 @@ function getFallbackThemeName(fileName: string): string {
.replace(/^./, (letter) => letter.toUpperCase());
}
-function readFileText(file: File): Promise<string> {
- return new Promise((resolve, reject) => {
- const reader = new FileReader();
- reader.onerror = () => reject(reader.error ?? new Error(`Failed to read ${file.name}`));
- reader.onload = () => resolve(String(reader.result ?? ''));
- reader.readAsText(file);
- });
-}
-
function isRecord(value: unknown): value is Record<string, unknown> {
return value !== null && typeof value === 'object';
}
diff --git a/fluxer_app/src/features/ui/action_menu/ContextMenu.tsx b/fluxer_app/src/features/ui/action_menu/ContextMenu.tsx
index f6e9d8478..2798bffc1 100644
--- a/fluxer_app/src/features/ui/action_menu/ContextMenu.tsx
+++ b/fluxer_app/src/features/ui/action_menu/ContextMenu.tsx
@@ -67,7 +67,7 @@ const CONTEXT_MENU_EDGE_PADDING = 12;
const CONTEXT_MENU_OFFSET = 4;
const SUBMENU_OFFSET = 10;
-const textValueFromNode = (node: React.ReactNode): string => {
+export const textValueFromNode = (node: React.ReactNode): string => {
if (typeof node === 'string') return node;
if (typeof node === 'number') return String(node);
if (Array.isArray(node)) return node.map(textValueFromNode).join('');
diff --git a/fluxer_app/src/features/ui/action_menu/MenuItemRadio.tsx b/fluxer_app/src/features/ui/action_menu/MenuItemRadio.tsx
index 235ecda2f..e2ad67c25 100644
--- a/fluxer_app/src/features/ui/action_menu/MenuItemRadio.tsx
+++ b/fluxer_app/src/features/ui/action_menu/MenuItemRadio.tsx
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import {SelectableMenuItem, useContextMenuClose} from '@app/features/ui/action_menu/ContextMenu';
+import {SelectableMenuItem, textValueFromNode, useContextMenuClose} from '@app/features/ui/action_menu/ContextMenu';
import styles from '@app/features/ui/action_menu/ContextMenu.module.css';
import radioStyles from '@app/features/ui/action_menu/MenuItemRadio.module.css';
import React, {useCallback} from 'react';
@@ -15,15 +15,6 @@ interface MenuItemRadioProps {
closeOnSelect?: boolean;
}
-const textValueFromNode = (node: React.ReactNode): string => {
- if (typeof node === 'string') return node;
- if (typeof node === 'number') return String(node);
- if (Array.isArray(node)) return node.map(textValueFromNode).join('');
- if (React.isValidElement(node)) {
- return textValueFromNode((node.props as {children?: React.ReactNode}).children);
- }
- return '';
-};
export const MenuItemRadio = React.forwardRef<HTMLDivElement, MenuItemRadioProps>(
({label, children, icon, selected, disabled = false, onSelect, closeOnSelect = false}, forwardedRef) => {
const closeMenu = useContextMenuClose();
diff --git a/fluxer_app/src/features/ui/components/MentionBadge.tsx b/fluxer_app/src/features/ui/components/MentionBadge.tsx
index 0b3c283c3..71539f008 100644
--- a/fluxer_app/src/features/ui/components/MentionBadge.tsx
+++ b/fluxer_app/src/features/ui/components/MentionBadge.tsx
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import Accessibility from '@app/features/accessibility/state/Accessibility';
+import {formatNumber, getCachedNumberFormat} from '@app/features/i18n/utils/IntlCache';
import styles from '@app/features/ui/components/MentionBadge.module.css';
import {
AnimePresence,
@@ -10,7 +11,6 @@ import {
createAnimeFlxElement,
} from '@app/features/ui/motion/AnimeElement';
import {getCurrentLocale} from '@app/features/user/utils/LocaleUtils';
-import {formatCompactNumber, formatNumber} from '@pkgs/number_utils/src/NumberFormatting';
import {clsx} from 'clsx';
import {observer} from 'mobx-react-lite';
@@ -51,7 +51,9 @@ const formatMentionCount = (mentionCount: number) => {
return `${formatNumber(99, locale)}+`;
}
if (mentionCount >= 1000) {
- return formatCompactNumber(mentionCount, locale, 0).replace(/\s/g, '');
+ return getCachedNumberFormat(locale, {notation: 'compact', maximumFractionDigits: 0})
+ .format(Number.isFinite(mentionCount) ? mentionCount : 0)
+ .replace(/\s/g, '');
}
return formatNumber(mentionCount, locale);
};
diff --git a/fluxer_app/src/features/ui/components/form/FormCombobox.tsx b/fluxer_app/src/features/ui/components/form/FormCombobox.tsx
index a14b1691e..0a17912b6 100644
--- a/fluxer_app/src/features/ui/components/form/FormCombobox.tsx
+++ b/fluxer_app/src/features/ui/components/form/FormCombobox.tsx
@@ -23,6 +23,19 @@ export interface ComboboxOption<V extends Primitive = string> {
isDisabled?: boolean;
}
+export function resolveNearestNumericOption(
+ inputValue: string,
+ options: ReadonlyArray<ComboboxOption<number>>,
+): number | undefined {
+ const numericMatch = inputValue.trim().match(/([0-9]+(?:\.[0-9]+)?)/);
+ if (!numericMatch) return undefined;
+ const parsedValue = Number(numericMatch[1]);
+ if (!Number.isFinite(parsedValue)) return undefined;
+ return options.reduce((nearest, option) =>
+ Math.abs(option.value - parsedValue) < Math.abs(nearest.value - parsedValue) ? option : nearest,
+ ).value;
+}
+
export interface ComboboxFilterOption<O> {
label: string;
value: string;
diff --git a/fluxer_app/src/features/updater/commands/UpdaterModalCommands.tsx b/fluxer_app/src/features/updater/commands/UpdaterModalCommands.tsx
index 1dcf84086..cae768664 100644
--- a/fluxer_app/src/features/updater/commands/UpdaterModalCommands.tsx
+++ b/fluxer_app/src/features/updater/commands/UpdaterModalCommands.tsx
@@ -4,12 +4,12 @@ import {ConfirmModal} from '@app/features/app/components/dialogs/ConfirmModal';
import {DESKTOP_DOWNLOAD_URL} from '@app/features/app/config/I18nDisplayConstants';
import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
import {CLOSE_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
-import type {UpdaterDownloadFormat, UpdaterDownloadOption} from '@app/features/platform/types/Electron';
import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
import {modal} from '@app/features/ui/commands/ModalCommands';
import {Combobox} from '@app/features/ui/components/form/FormCombobox';
import {isCanaryDesktop, openExternalUrl} from '@app/features/ui/utils/NativeUtils';
import styles from '@app/features/updater/commands/UpdaterModalCommands.module.css';
+import type {UpdaterDownloadFormat, UpdaterDownloadOption} from '@app/types/electron.d';
import {i18n, type MessageDescriptor} from '@lingui/core';
import {msg} from '@lingui/core/macro';
import {useMemo, useState} from 'react';
diff --git a/fluxer_app/src/features/updater/state/UpdaterStateMachine.ts b/fluxer_app/src/features/updater/state/UpdaterStateMachine.ts
index 015fd7805..ab4531451 100644
--- a/fluxer_app/src/features/updater/state/UpdaterStateMachine.ts
+++ b/fluxer_app/src/features/updater/state/UpdaterStateMachine.ts
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import type {UpdaterDownloadOption} from '@app/features/platform/types/Electron';
+import type {UpdaterDownloadOption} from '@app/types/electron.d';
import {assign, initialTransition, type SnapshotFrom, setup, transition} from 'xstate';
interface NativeUpdateInfo {
diff --git a/fluxer_app/src/features/updater/utils/LinuxManualUpdateOptions.ts b/fluxer_app/src/features/updater/utils/LinuxManualUpdateOptions.ts
index c1b8623b7..82956dd6c 100644
--- a/fluxer_app/src/features/updater/utils/LinuxManualUpdateOptions.ts
+++ b/fluxer_app/src/features/updater/utils/LinuxManualUpdateOptions.ts
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
-import type {UpdaterDownloadFormat, UpdaterDownloadOption} from '@app/features/platform/types/Electron';
+import type {UpdaterDownloadFormat, UpdaterDownloadOption} from '@app/types/electron.d';
type LinuxManualDownloadFormat = Extract<UpdaterDownloadFormat, 'appimage' | 'deb' | 'rpm' | 'tar_gz'>;
type LinuxDownloadArch = 'x64' | 'arm64';
diff --git a/fluxer_app/src/features/user/commands/UserCommands.ts b/fluxer_app/src/features/user/commands/UserCommands.ts
index 9c75992d5..2b9f5a755 100644
--- a/fluxer_app/src/features/user/commands/UserCommands.ts
+++ b/fluxer_app/src/features/user/commands/UserCommands.ts
@@ -18,7 +18,11 @@ import type {
} from '@fluxer/schema/src/domains/user/UserHarvestSchemas';
import type {
BackupCode,
+ EmailChangeRequestNewResponse,
+ EmailChangeVerifyOriginalResponse,
PasswordChangeCompleteResponse,
+ PasswordChangeStartResponse,
+ PasswordChangeVerifyResponse,
UserPasswordUpdateResponse,
UserPrivate,
} from '@fluxer/schema/src/domains/user/UserResponseSchemas';
@@ -53,31 +57,10 @@ interface EmailChangeStartResponse {
resend_available_at?: string | null;
}
-interface EmailChangeVerifyOriginalResponse {
- original_proof: string;
-}
-
-interface EmailChangeRequestNewResponse {
- ticket: string;
- new_email: string;
- new_code_expires_at: string;
- resend_available_at: string | null;
-}
-
interface EmailChangeVerifyNewResponse {
email_token: string;
}
-interface PasswordChangeStartResponse {
- ticket: string;
- code_expires_at: string;
- resend_available_at: string | null;
-}
-
-interface PasswordChangeVerifyResponse {
- verification_proof: string;
-}
-
type UserUpdatePayload = Partial<UserPrivate> & {
avatar?: string | null;
password?: string;
diff --git a/fluxer_app/src/features/user/components/modals/CustomStatusBottomSheet.tsx b/fluxer_app/src/features/user/components/modals/CustomStatusBottomSheet.tsx
index 4ed0bddde..cd3262ede 100644
--- a/fluxer_app/src/features/user/components/modals/CustomStatusBottomSheet.tsx
+++ b/fluxer_app/src/features/user/components/modals/CustomStatusBottomSheet.tsx
@@ -23,7 +23,7 @@ import {Input} from '@app/features/ui/components/form/FormInput';
import FocusRing from '@app/features/ui/focus_ring/FocusRing';
import * as UserSettingsCommands from '@app/features/user/commands/UserSettingsCommands';
import styles from '@app/features/user/components/modals/CustomStatusBottomSheet.module.css';
-import {type CustomStatus, normalizeCustomStatus} from '@app/features/user/state/CustomStatus';
+import {buildDraftStatus, normalizeCustomStatus} from '@app/features/user/state/CustomStatus';
import Users from '@app/features/user/state/Users';
import {handleAccountLimitedError} from '@app/features/user/utils/AccountLimitUtils';
import {msg} from '@lingui/core/macro';
@@ -67,19 +67,6 @@ interface CustomStatusBottomSheetProps {
onClose: () => void;
}
-const buildDraftStatus = (params: {
- text: string;
- emojiId: string | null;
- emojiName: string | null;
- expiresAt: string | null;
-}): CustomStatus | null => {
- return normalizeCustomStatus({
- text: params.text || null,
- emojiId: params.emojiId,
- emojiName: params.emojiName,
- expiresAt: params.expiresAt,
- });
-};
export const CustomStatusBottomSheet = observer(({isOpen, onClose}: CustomStatusBottomSheetProps) => {
const {i18n} = useLingui();
const currentUser = Users.getCurrentUser();
diff --git a/fluxer_app/src/features/user/components/modals/CustomStatusModal.tsx b/fluxer_app/src/features/user/components/modals/CustomStatusModal.tsx
index b3d7f8b93..514c687ac 100644
--- a/fluxer_app/src/features/user/components/modals/CustomStatusModal.tsx
+++ b/fluxer_app/src/features/user/components/modals/CustomStatusModal.tsx
@@ -28,7 +28,7 @@ import {getRelativeDayLabelLower} from '@app/features/ui/utils/RelativeDayLabels
import * as UserSettingsCommands from '@app/features/user/commands/UserSettingsCommands';
import styles from '@app/features/user/components/modals/CustomStatusModal.module.css';
import {ProfilePreview} from '@app/features/user/components/profile/ProfilePreview';
-import {type CustomStatus, normalizeCustomStatus} from '@app/features/user/state/CustomStatus';
+import {buildDraftStatus, type CustomStatus, normalizeCustomStatus} from '@app/features/user/state/CustomStatus';
import UserSettings from '@app/features/user/state/UserSettings';
import Users from '@app/features/user/state/Users';
import {handleAccountLimitedError} from '@app/features/user/utils/AccountLimitUtils';
@@ -129,19 +129,6 @@ const formatRelativeDayTimeLabel = (reference: Date, target: Date): TimeLabel =>
const dayLabel = getFormattedShortDate(target, getCurrentLocale());
return {dayLabel, timeString};
};
-const buildDraftStatus = (params: {
- text: string;
- emojiId: string | null;
- emojiName: string | null;
- expiresAt: string | null;
-}): CustomStatus | null => {
- return normalizeCustomStatus({
- text: params.text || null,
- emojiId: params.emojiId,
- emojiName: params.emojiName,
- expiresAt: params.expiresAt,
- });
-};
export const CustomStatusModal = observer(() => {
const {i18n} = useLingui();
const initialStatus = normalizeCustomStatus(UserSettings.customStatus);
diff --git a/fluxer_app/src/features/user/components/modals/tabs/AccessibilityTab.tsx b/fluxer_app/src/features/user/components/modals/tabs/AccessibilityTab.tsx
index ad02d6456..e29f9cbed 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/AccessibilityTab.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/AccessibilityTab.tsx
@@ -13,7 +13,7 @@ import {getCachedNumberFormat} from '@app/features/i18n/utils/IntlCache';
import {Message as MessageModel} from '@app/features/messaging/models/MessagingMessage';
import {remFromPx} from '@app/features/theme/layout/RemFromPx';
import {Button} from '@app/features/ui/button/Button';
-import type {ComboboxOption} from '@app/features/ui/components/form/FormCombobox';
+import {type ComboboxOption, resolveNearestNumericOption} from '@app/features/ui/components/form/FormCombobox';
import {Switch} from '@app/features/ui/components/form/FormSwitch';
import {MockAvatar} from '@app/features/ui/components/MockAvatar';
import MobileLayout from '@app/features/ui/state/MobileLayout';
@@ -115,18 +115,6 @@ const getNearestTtsRate = (value: number): number => {
return nearest;
};
-const resolveTtsRateInput = (
- inputValue: string,
- options: ReadonlyArray<ComboboxOption<number>>,
-): number | undefined => {
- const numericMatch = inputValue.trim().match(/([0-9]+(?:\.[0-9]+)?)/);
- if (!numericMatch) return undefined;
- const parsedValue = Number(numericMatch[1]);
- if (!Number.isFinite(parsedValue)) return undefined;
- return options.reduce((nearest, option) =>
- Math.abs(option.value - parsedValue) < Math.abs(nearest.value - parsedValue) ? option : nearest,
- ).value;
-};
const AccessibilityTabPreview = observer(() => {
const {i18n} = useLingui();
const alwaysUnderlineLinks = Accessibility.alwaysUnderlineLinks;
@@ -308,7 +296,7 @@ export const AccessibilityTtsTabContent: React.FC = observer(() => {
value={selectedTtsRate}
options={ttsRateOptions}
onChange={handleRateChange}
- autoSelectValueFromInput={resolveTtsRateInput}
+ autoSelectValueFromInput={resolveNearestNumericOption}
controlWidth="small"
dataFlx="user.accessibility-tab.accessibility-tts-tab-content.select.tts-rate"
data-flx="user.accessibility-tab.accessibility-tts-tab-content.compact-combobox-row.rate-change"
diff --git a/fluxer_app/src/features/user/components/modals/tabs/LanguageTab.tsx b/fluxer_app/src/features/user/components/modals/tabs/LanguageTab.tsx
index 2f3603a91..c5f8ec481 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/LanguageTab.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/LanguageTab.tsx
@@ -13,7 +13,6 @@ import {I18N_WEBLATE_DOMAIN, I18N_WEBLATE_URL} from '@app/features/app/config/I1
import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
import * as EmojiUtils from '@app/features/expressions/utils/EmojiUtils';
import Spellcheck from '@app/features/messaging/state/Spellcheck';
-import type {SpellcheckEngine} from '@app/features/platform/types/Electron';
import {Button} from '@app/features/ui/button/Button';
import {Combobox, type ComboboxFilterOption, type ComboboxOption} from '@app/features/ui/components/form/FormCombobox';
import {Switch} from '@app/features/ui/components/form/FormSwitch';
@@ -25,6 +24,7 @@ import * as UserSettingsCommands from '@app/features/user/commands/UserSettingsC
import styles from '@app/features/user/components/modals/tabs/LanguageTab.module.css';
import UserSettings from '@app/features/user/state/UserSettings';
import * as LocaleUtils from '@app/features/user/utils/LocaleUtils';
+import type {SpellcheckEngine} from '@app/types/electron.d';
import {TimeFormatTypes} from '@fluxer/constants/src/UserConstants';
import {getFormattedTime} from '@fluxer/date_utils/src/DateFormatting';
import {localeUses12Hour} from '@fluxer/date_utils/src/DateHourCycle';
diff --git a/fluxer_app/src/features/user/components/modals/tabs/NotificationsTab.tsx b/fluxer_app/src/features/user/components/modals/tabs/NotificationsTab.tsx
index 889d83858..0e15ce78c 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/NotificationsTab.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/NotificationsTab.tsx
@@ -10,6 +10,7 @@ import {Notifications} from '@app/features/user/components/modals/tabs/notificat
import {Sounds} from '@app/features/user/components/modals/tabs/notifications_tab/NotificationsTabSounds';
import {TextToSpeech} from '@app/features/user/components/modals/tabs/notifications_tab/TextToSpeech';
import {useSoundSettings} from '@app/features/user/components/modals/tabs/notifications_tab/useSoundSettings';
+import inlineStyles from '@app/features/user/components/modals/tabs/TabInline.module.css';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
import {observer} from 'mobx-react-lite';
@@ -23,7 +24,19 @@ const TEXT_TO_SPEECH_NOTIFICATIONS_DESCRIPTOR = msg({
message: 'Text-to-speech notifications',
comment: 'Notifications settings: section heading for text-to-speech notification behavior.',
});
-const NotificationsTab: React.FC = observer(() => {
+const CONTROL_SPEECH_COMMANDS_AND_NARRATION_FOR_INCOMING_CONTENT_DESCRIPTOR = msg({
+ message: 'Control speech commands and narration for incoming content.',
+ comment: 'Description text in the inline.',
+});
+const INLINE_MENTION_PREFERENCE_DESCRIPTOR = msg({
+ message: 'Mention preference',
+ comment: 'Short label in the inline. Keep it concise.',
+});
+const INLINE_TEXT_TO_SPEECH_NOTIFICATIONS_DESCRIPTOR = msg({
+ message: 'Text-to-speech notifications',
+ comment: 'Short label in the inline. Keep it concise.',
+});
+const NotificationsSections = observer(({inline}: {inline: boolean}) => {
const {i18n} = useLingui();
const browserNotificationsEnabled = Notification.browserNotificationsEnabled;
const unreadMessageBadgeEnabled = Notification.unreadMessageBadgeEnabled;
@@ -41,55 +54,70 @@ const NotificationsTab: React.FC = observer(() => {
handleSoundOverrideReset,
handleAllOverridesReset,
} = useSoundSettings();
+ const flx = inline ? 'user.notifications-tab.inline.notifications-inline-content' : 'user.notifications-tab';
return (
- <SettingsTabContainer data-flx="user.notifications-tab.settings-tab-container">
- <SettingsTabContent data-flx="user.notifications-tab.settings-tab-content">
- <SettingsSection
- id="notifications"
- title={i18n._(GENERAL_DESCRIPTOR)}
- data-flx="user.notifications-tab.notifications"
- >
- <Notifications
- browserNotificationsEnabled={browserNotificationsEnabled}
- unreadMessageBadgeEnabled={unreadMessageBadgeEnabled}
- data-flx="user.notifications-tab.notifications--2"
- />
- </SettingsSection>
- <SettingsSection
- id="mention-preference"
- title={i18n._(MENTION_PREFERENCE_SECTION_TITLE_DESCRIPTOR)}
- data-flx="user.notifications-tab.mention-preference"
- >
- <MentionPreferenceTabContent data-flx="user.notifications-tab.mention-preference-tab-content" />
- </SettingsSection>
- <SettingsSection id="sounds" title={i18n._(SOUNDS_DESCRIPTOR)} data-flx="user.notifications-tab.sounds">
- <Sounds
- soundSettings={soundSettings}
- soundTypeLabels={soundTypeLabels}
- customSounds={customSounds}
- isSoundEnabled={Sound.isSoundTypeEnabled}
- onToggleAllSounds={handleToggleAllSounds}
- onToggleSound={handleToggleSound}
- onPreviewSound={handlePreviewSound}
- onUploadClick={handleUploadClick}
- onCustomSoundDelete={handleCustomSoundDelete}
- onMasterVolumeChange={handleMasterVolumeChange}
- onSoundOverrideChange={handleSoundOverrideChange}
- onSoundOverrideReset={handleSoundOverrideReset}
- onAllOverridesReset={handleAllOverridesReset}
- data-flx="user.notifications-tab.sounds--2"
- />
- </SettingsSection>
- <SettingsSection
- id="text-to-speech"
- title={i18n._(TEXT_TO_SPEECH_NOTIFICATIONS_DESCRIPTOR)}
- data-flx="user.notifications-tab.text-to-speech"
- >
- <TextToSpeech data-flx="user.notifications-tab.text-to-speech--2" />
- </SettingsSection>
- </SettingsTabContent>
- </SettingsTabContainer>
+ <>
+ <SettingsSection id="notifications" title={i18n._(GENERAL_DESCRIPTOR)} data-flx={`${flx}.notifications`}>
+ <Notifications
+ browserNotificationsEnabled={browserNotificationsEnabled}
+ unreadMessageBadgeEnabled={unreadMessageBadgeEnabled}
+ data-flx={`${flx}.notifications--2`}
+ />
+ </SettingsSection>
+ <SettingsSection
+ id="mention-preference"
+ title={i18n._(inline ? INLINE_MENTION_PREFERENCE_DESCRIPTOR : MENTION_PREFERENCE_SECTION_TITLE_DESCRIPTOR)}
+ data-flx={`${flx}.mention-preference`}
+ >
+ <MentionPreferenceTabContent data-flx={`${flx}.mention-preference-tab-content`} />
+ </SettingsSection>
+ <SettingsSection id="sounds" title={i18n._(SOUNDS_DESCRIPTOR)} data-flx={`${flx}.sounds`}>
+ <Sounds
+ soundSettings={soundSettings}
+ soundTypeLabels={soundTypeLabels}
+ customSounds={customSounds}
+ isSoundEnabled={Sound.isSoundTypeEnabled}
+ onToggleAllSounds={handleToggleAllSounds}
+ onToggleSound={handleToggleSound}
+ onPreviewSound={handlePreviewSound}
+ onUploadClick={handleUploadClick}
+ onCustomSoundDelete={handleCustomSoundDelete}
+ onMasterVolumeChange={handleMasterVolumeChange}
+ onSoundOverrideChange={handleSoundOverrideChange}
+ onSoundOverrideReset={handleSoundOverrideReset}
+ onAllOverridesReset={handleAllOverridesReset}
+ data-flx={`${flx}.sounds--2`}
+ />
+ </SettingsSection>
+ <SettingsSection
+ id="text-to-speech"
+ title={i18n._(
+ inline ? INLINE_TEXT_TO_SPEECH_NOTIFICATIONS_DESCRIPTOR : TEXT_TO_SPEECH_NOTIFICATIONS_DESCRIPTOR,
+ )}
+ description={inline ? i18n._(CONTROL_SPEECH_COMMANDS_AND_NARRATION_FOR_INCOMING_CONTENT_DESCRIPTOR) : undefined}
+ data-flx={`${flx}.text-to-speech`}
+ >
+ <TextToSpeech data-flx={`${flx}.text-to-speech--2`} />
+ </SettingsSection>
+ </>
);
});
+const NotificationsTab: React.FC = () => (
+ <SettingsTabContainer data-flx="user.notifications-tab.settings-tab-container">
+ <SettingsTabContent data-flx="user.notifications-tab.settings-tab-content">
+ <NotificationsSections inline={false} data-flx="user.notifications-tab.notifications-sections" />
+ </SettingsTabContent>
+ </SettingsTabContainer>
+);
+
+export const NotificationsInlineContent: React.FC = () => (
+ <div
+ className={inlineStyles.container}
+ data-flx="user.notifications-tab.inline.notifications-inline-content.container"
+ >
+ <NotificationsSections inline={true} data-flx="user.notifications-tab.inline.notifications-sections" />
+ </div>
+);
+
export default NotificationsTab;
diff --git a/fluxer_app/src/features/user/components/modals/tabs/accessibility_tab/AccessibilityTabInline.module.css b/fluxer_app/src/features/user/components/modals/tabs/TabInline.module.css
similarity index 100%
rename from fluxer_app/src/features/user/components/modals/tabs/accessibility_tab/AccessibilityTabInline.module.css
rename to fluxer_app/src/features/user/components/modals/tabs/TabInline.module.css
diff --git a/fluxer_app/src/features/user/components/modals/tabs/accessibility_tab/AccessibilityTabInline.tsx b/fluxer_app/src/features/user/components/modals/tabs/accessibility_tab/AccessibilityTabInline.tsx
index d02ca1362..37455c0c9 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/accessibility_tab/AccessibilityTabInline.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/accessibility_tab/AccessibilityTabInline.tsx
@@ -6,11 +6,11 @@ import {
AccessibilityScreenReaderTabContent,
AccessibilityTtsTabContent,
} from '@app/features/user/components/modals/tabs/AccessibilityTab';
-import styles from '@app/features/user/components/modals/tabs/accessibility_tab/AccessibilityTabInline.module.css';
import {AnimationTabContent} from '@app/features/user/components/modals/tabs/accessibility_tab/AnimationTab';
import {KeyboardTabContent} from '@app/features/user/components/modals/tabs/accessibility_tab/KeyboardTab';
import {MotionTabContent} from '@app/features/user/components/modals/tabs/accessibility_tab/MotionTab';
import {VisualTabContent} from '@app/features/user/components/modals/tabs/accessibility_tab/VisualTab';
+import styles from '@app/features/user/components/modals/tabs/TabInline.module.css';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
import {observer} from 'mobx-react-lite';
diff --git a/fluxer_app/src/features/user/components/modals/tabs/account_security_tab/AccountSecurityTabInline.module.css b/fluxer_app/src/features/user/components/modals/tabs/account_security_tab/AccountSecurityTabInline.module.css
deleted file mode 100644
index dd9bf8e95..000000000
--- a/fluxer_app/src/features/user/components/modals/tabs/account_security_tab/AccountSecurityTabInline.module.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: AGPL-3.0-or-later */
-
-.container {
- display: flex;
- flex-direction: column;
-}
diff --git a/fluxer_app/src/features/user/components/modals/tabs/account_security_tab/AccountSecurityTabInline.tsx b/fluxer_app/src/features/user/components/modals/tabs/account_security_tab/AccountSecurityTabInline.tsx
index 5bcf724d9..bf5d1576f 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/account_security_tab/AccountSecurityTabInline.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/account_security_tab/AccountSecurityTabInline.tsx
@@ -3,7 +3,7 @@
import {StreamerModeGate} from '@app/features/streamer_mode/components/StreamerModeGate';
import StreamerMode from '@app/features/streamer_mode/state/StreamerMode';
import {AccountSecuritySections} from '@app/features/user/components/modals/tabs/account_security_tab/AccountSecuritySections';
-import styles from '@app/features/user/components/modals/tabs/account_security_tab/AccountSecurityTabInline.module.css';
+import styles from '@app/features/user/components/modals/tabs/TabInline.module.css';
import {
getAccountSectionForLegacySection,
getAccountSectionForNestedTab,
diff --git a/fluxer_app/src/features/user/components/modals/tabs/advanced_settings_tab/AdvancedAccessibilityControls.tsx b/fluxer_app/src/features/user/components/modals/tabs/advanced_settings_tab/AdvancedAccessibilityControls.tsx
index 61620d5a2..44760a1d0 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/advanced_settings_tab/AdvancedAccessibilityControls.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/advanced_settings_tab/AdvancedAccessibilityControls.tsx
@@ -8,17 +8,13 @@ import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
import {modal} from '@app/features/ui/commands/ModalCommands';
import {Switch} from '@app/features/ui/components/form/FormSwitch';
import MobileLayout from '@app/features/ui/state/MobileLayout';
-import {
- getCachedDesktopWindowBehaviorSettings,
- getDesktopWindowBehaviorSettings,
- relaunchDesktopApp,
- setDesktopWindowBehaviorSettings,
-} from '@app/features/ui/utils/DesktopWindowBehaviorUtils';
+import {relaunchDesktopApp} from '@app/features/ui/utils/DesktopWindowBehaviorUtils';
+import {useDesktopWindowBehaviorSettings} from '@app/features/user/components/modals/tabs/advanced_settings_tab/AdvancedDesktopControls';
import type {DesktopWindowBehaviorSettings} from '@app/types/electron.d';
import {msg, ph} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
import {observer} from 'mobx-react-lite';
-import {useCallback, useLayoutEffect, useState} from 'react';
+import {useCallback} from 'react';
const ENABLE_TEXT_SELECTION_DESCRIPTOR = msg({
message: 'Enable text selection',
@@ -61,45 +57,6 @@ function hasDesktopMiddleClickAutoscrollPendingRestart(settings: DesktopWindowBe
return settings !== null && settings.middleClickAutoscroll !== settings.activeMiddleClickAutoscroll;
}
-function useDesktopWindowBehaviorSettings() {
- const cachedDesktopWindowBehavior = getCachedDesktopWindowBehaviorSettings();
- const [desktopWindowBehavior, setDesktopWindowBehavior] = useState<DesktopWindowBehaviorSettings | null>(
- cachedDesktopWindowBehavior,
- );
- const [desktopWindowBehaviorBusy, setDesktopWindowBehaviorBusy] = useState(cachedDesktopWindowBehavior === null);
- useLayoutEffect(() => {
- let mounted = true;
- if (getCachedDesktopWindowBehaviorSettings() !== null) {
- setDesktopWindowBehaviorBusy(false);
- return () => {
- mounted = false;
- };
- }
- const initDesktopWindowBehavior = async () => {
- const settings = await getDesktopWindowBehaviorSettings();
- if (!mounted) return;
- if (settings !== null) {
- setDesktopWindowBehavior(settings);
- }
- setDesktopWindowBehaviorBusy(false);
- };
- void initDesktopWindowBehavior();
- return () => {
- mounted = false;
- };
- }, []);
- const updateDesktopWindowBehavior = useCallback(async (settings: Partial<DesktopWindowBehaviorSettings>) => {
- setDesktopWindowBehaviorBusy(true);
- const nextSettings = await setDesktopWindowBehaviorSettings(settings);
- if (nextSettings !== null) {
- setDesktopWindowBehavior(nextSettings);
- }
- setDesktopWindowBehaviorBusy(false);
- return nextSettings;
- }, []);
- return {desktopWindowBehavior, desktopWindowBehaviorBusy, updateDesktopWindowBehavior};
-}
-
function useChromiumScrollingRestartModal() {
const {i18n} = useLingui();
return useCallback(() => {
diff --git a/fluxer_app/src/features/user/components/modals/tabs/advanced_settings_tab/AdvancedDesktopControls.tsx b/fluxer_app/src/features/user/components/modals/tabs/advanced_settings_tab/AdvancedDesktopControls.tsx
index d2ba976b7..abe922e30 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/advanced_settings_tab/AdvancedDesktopControls.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/advanced_settings_tab/AdvancedDesktopControls.tsx
@@ -76,7 +76,7 @@ const LATER_DESCRIPTOR = msg({
comment: 'Short confirmation button label in advanced settings.',
});
-function useDesktopWindowBehaviorSettings() {
+export function useDesktopWindowBehaviorSettings() {
const cachedDesktopWindowBehavior = getCachedDesktopWindowBehaviorSettings();
const [desktopWindowBehavior, setDesktopWindowBehavior] = useState<DesktopWindowBehaviorSettings | null>(
cachedDesktopWindowBehavior,
diff --git a/fluxer_app/src/features/user/components/modals/tabs/appearance_tab/AppearanceTabInline.module.css b/fluxer_app/src/features/user/components/modals/tabs/appearance_tab/AppearanceTabInline.module.css
deleted file mode 100644
index dd9bf8e95..000000000
--- a/fluxer_app/src/features/user/components/modals/tabs/appearance_tab/AppearanceTabInline.module.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: AGPL-3.0-or-later */
-
-.container {
- display: flex;
- flex-direction: column;
-}
diff --git a/fluxer_app/src/features/user/components/modals/tabs/appearance_tab/AppearanceTabInline.tsx b/fluxer_app/src/features/user/components/modals/tabs/appearance_tab/AppearanceTabInline.tsx
index 7833b164c..30899a31e 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/appearance_tab/AppearanceTabInline.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/appearance_tab/AppearanceTabInline.tsx
@@ -7,13 +7,13 @@ import {
HdrTabContent,
shouldShowHdrSettings,
} from '@app/features/user/components/modals/tabs/appearance_tab/AppearanceTabHdrTab';
-import styles from '@app/features/user/components/modals/tabs/appearance_tab/AppearanceTabInline.module.css';
import {ChannelListTabContent} from '@app/features/user/components/modals/tabs/appearance_tab/ChannelListTab';
import {InterfaceTabContent} from '@app/features/user/components/modals/tabs/appearance_tab/InterfaceTab';
import {MessagesTabContent} from '@app/features/user/components/modals/tabs/appearance_tab/MessagesTab';
import {AppZoomLevelTabContent} from '@app/features/user/components/modals/tabs/appearance_tab/ScalingTab';
import {StreamerModeTabContent} from '@app/features/user/components/modals/tabs/appearance_tab/StreamerModeTab';
import {ThemeTabContent} from '@app/features/user/components/modals/tabs/appearance_tab/theme/ThemeTabContent';
+import styles from '@app/features/user/components/modals/tabs/TabInline.module.css';
import {shouldShowAppZoomLevel} from '@app/features/user/components/settings_utils/AppZoomLevelUtils';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
diff --git a/fluxer_app/src/features/user/components/modals/tabs/appearance_tab/MessagesTab.tsx b/fluxer_app/src/features/user/components/modals/tabs/appearance_tab/MessagesTab.tsx
index 898d50d37..3efb0eb45 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/appearance_tab/MessagesTab.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/appearance_tab/MessagesTab.tsx
@@ -12,7 +12,7 @@ import Channels from '@app/features/channel/state/Channels';
import {getCachedNumberFormat} from '@app/features/i18n/utils/IntlCache';
import {Message as MessageModel} from '@app/features/messaging/models/MessagingMessage';
import {isNewMessageGroup} from '@app/features/messaging/utils/MessageGroupingUtils';
-import type {ComboboxOption} from '@app/features/ui/components/form/FormCombobox';
+import {type ComboboxOption, resolveNearestNumericOption} from '@app/features/ui/components/form/FormCombobox';
import {Switch} from '@app/features/ui/components/form/FormSwitch';
import {canResetSliderValue, SliderResetIconButton} from '@app/features/ui/components/slider/SliderResetIconButton';
import type {RadioOption} from '@app/features/ui/radio_group/RadioGroup';
@@ -104,18 +104,6 @@ const getNearestMessageGroupSpacing = (value: number): number => {
return nearest;
};
-const resolveMessageGroupSpacingInput = (
- inputValue: string,
- options: ReadonlyArray<ComboboxOption<number>>,
-): number | undefined => {
- const numericMatch = inputValue.trim().match(/([0-9]+(?:\.[0-9]+)?)/);
- if (!numericMatch) return undefined;
- const parsedValue = Number(numericMatch[1]);
- if (!Number.isFinite(parsedValue)) return undefined;
- return options.reduce((nearest, option) =>
- Math.abs(option.value - parsedValue) < Math.abs(nearest.value - parsedValue) ? option : nearest,
- ).value;
-};
const MessagesPreview: React.FC = observer(() => {
const {i18n} = useLingui();
const {messageDisplayCompact} = UserSettings;
@@ -288,7 +276,7 @@ export const MessagesTabContent: React.FC = observer(() => {
value={selectedMessageGroupSpacing}
options={messageGroupSpacingOptions}
onChange={(value) => AccessibilityCommands.update(getMessageGroupSpacingPatch(messageDisplayCompact, value))}
- autoSelectValueFromInput={resolveMessageGroupSpacingInput}
+ autoSelectValueFromInput={resolveNearestNumericOption}
controlWidth="small"
menuMinWidth={128}
aria-label={i18n._(SPACE_BETWEEN_MESSAGE_GROUPS_DESCRIPTOR)}
diff --git a/fluxer_app/src/features/user/components/modals/tabs/appearance_tab/ScalingTab.tsx b/fluxer_app/src/features/user/components/modals/tabs/appearance_tab/ScalingTab.tsx
index 94792153a..50043f068 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/appearance_tab/ScalingTab.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/appearance_tab/ScalingTab.tsx
@@ -8,7 +8,7 @@ import Accessibility, {
} from '@app/features/accessibility/state/Accessibility';
import {APP_ZOOM_LEVEL_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
import {getCachedNumberFormat} from '@app/features/i18n/utils/IntlCache';
-import type {ComboboxOption} from '@app/features/ui/components/form/FormCombobox';
+import {type ComboboxOption, resolveNearestNumericOption} from '@app/features/ui/components/form/FormCombobox';
import {Slider} from '@app/features/ui/components/Slider';
import {canResetSliderValue, SliderResetIconButton} from '@app/features/ui/components/slider/SliderResetIconButton';
import {formatRoundedPercentage, roundPercentage} from '@app/features/ui/utils/PercentageFormatting';
@@ -52,19 +52,6 @@ const getNearestFontSize = (value: number): number => {
return nearest;
};
-const resolveFontSizeInput = (
- inputValue: string,
- options: ReadonlyArray<ComboboxOption<number>>,
-): number | undefined => {
- const numericMatch = inputValue.trim().match(/([0-9]+(?:\.[0-9]+)?)/);
- if (!numericMatch) return undefined;
- const parsedValue = Number(numericMatch[1]);
- if (!Number.isFinite(parsedValue)) return undefined;
- return options.reduce((nearest, option) =>
- Math.abs(option.value - parsedValue) < Math.abs(nearest.value - parsedValue) ? option : nearest,
- ).value;
-};
-
function canResetFontSize(): boolean {
return canResetSliderValue(Accessibility.fontSize, DEFAULT_FONT_SIZE);
}
@@ -104,7 +91,7 @@ export const FontSizeTabContent: React.FC = observer(() => {
value={selectedFontSize}
options={options}
onChange={(value) => AccessibilityCommands.update({fontSize: value})}
- autoSelectValueFromInput={resolveFontSizeInput}
+ autoSelectValueFromInput={resolveNearestNumericOption}
controlWidth="small"
menuMinWidth={128}
aria-label={i18n._(CHAT_FONT_SIZE_DESCRIPTOR)}
diff --git a/fluxer_app/src/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabInline.module.css b/fluxer_app/src/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabInline.module.css
deleted file mode 100644
index dd9bf8e95..000000000
--- a/fluxer_app/src/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabInline.module.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: AGPL-3.0-or-later */
-
-.container {
- display: flex;
- flex-direction: column;
-}
diff --git a/fluxer_app/src/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabInline.tsx b/fluxer_app/src/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabInline.tsx
index af217a467..89765e58a 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabInline.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabInline.tsx
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {SettingsSection} from '@app/features/app/components/dialogs/shared/SettingsSection';
-import styles from '@app/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabInline.module.css';
import {InputTabContent} from '@app/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabInputTab';
import {DisplayTabContent} from '@app/features/user/components/modals/tabs/chat_settings_tab/DisplayTab';
+import styles from '@app/features/user/components/modals/tabs/TabInline.module.css';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
import {observer} from 'mobx-react-lite';
diff --git a/fluxer_app/src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.module.css b/fluxer_app/src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.module.css
deleted file mode 100644
index dd9bf8e95..000000000
--- a/fluxer_app/src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.module.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: AGPL-3.0-or-later */
-
-.container {
- display: flex;
- flex-direction: column;
-}
diff --git a/fluxer_app/src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx b/fluxer_app/src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
deleted file mode 100644
index e554837a0..000000000
--- a/fluxer_app/src/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-import {SettingsSection} from '@app/features/app/components/dialogs/shared/SettingsSection';
-import {GENERAL_DESCRIPTOR, SOUNDS_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
-import Notification from '@app/features/ui/state/Notification';
-import Sound from '@app/features/ui/state/Sound';
-import {MentionPreferenceTabContent} from '@app/features/user/components/modals/tabs/notifications_tab/MentionPreferenceTab';
-import {Notifications} from '@app/features/user/components/modals/tabs/notifications_tab/Notifications';
-import styles from '@app/features/user/components/modals/tabs/notifications_tab/NotificationsTabInline.module.css';
-import {Sounds} from '@app/features/user/components/modals/tabs/notifications_tab/NotificationsTabSounds';
-import {TextToSpeech} from '@app/features/user/components/modals/tabs/notifications_tab/TextToSpeech';
-import {useSoundSettings} from '@app/features/user/components/modals/tabs/notifications_tab/useSoundSettings';
-import {msg} from '@lingui/core/macro';
-import {useLingui} from '@lingui/react/macro';
-import {observer} from 'mobx-react-lite';
-import type React from 'react';
-
-const CONTROL_SPEECH_COMMANDS_AND_NARRATION_FOR_INCOMING_CONTENT_DESCRIPTOR = msg({
- message: 'Control speech commands and narration for incoming content.',
- comment: 'Description text in the inline.',
-});
-const MENTION_PREFERENCE_DESCRIPTOR = msg({
- message: 'Mention preference',
- comment: 'Short label in the inline. Keep it concise.',
-});
-const TEXT_TO_SPEECH_NOTIFICATIONS_DESCRIPTOR = msg({
- message: 'Text-to-speech notifications',
- comment: 'Short label in the inline. Keep it concise.',
-});
-export const NotificationsInlineContent: React.FC = observer(() => {
- const {i18n} = useLingui();
- const browserNotificationsEnabled = Notification.browserNotificationsEnabled;
- const unreadMessageBadgeEnabled = Notification.unreadMessageBadgeEnabled;
- const soundSettings = Sound.settings;
- const {
- soundTypeLabels,
- customSounds,
- handleToggleAllSounds,
- handleToggleSound,
- handlePreviewSound,
- handleUploadClick,
- handleCustomSoundDelete,
- handleMasterVolumeChange,
- handleSoundOverrideChange,
- handleSoundOverrideReset,
- handleAllOverridesReset,
- } = useSoundSettings();
- return (
- <div className={styles.container} data-flx="user.notifications-tab.inline.notifications-inline-content.container">
- <SettingsSection
- id="notifications"
- title={i18n._(GENERAL_DESCRIPTOR)}
- data-flx="user.notifications-tab.inline.notifications-inline-content.notifications"
- >
- <Notifications
- browserNotificationsEnabled={browserNotificationsEnabled}
- unreadMessageBadgeEnabled={unreadMessageBadgeEnabled}
- data-flx="user.notifications-tab.inline.notifications-inline-content.notifications--2"
- />
- </SettingsSection>
- <SettingsSection
- id="mention-preference"
- title={i18n._(MENTION_PREFERENCE_DESCRIPTOR)}
- data-flx="user.notifications-tab.inline.notifications-inline-content.mention-preference"
- >
- <MentionPreferenceTabContent data-flx="user.notifications-tab.inline.notifications-inline-content.mention-preference-tab-content" />
- </SettingsSection>
- <SettingsSection
- id="sounds"
- title={i18n._(SOUNDS_DESCRIPTOR)}
- data-flx="user.notifications-tab.inline.notifications-inline-content.sounds"
- >
- <Sounds
- soundSettings={soundSettings}
- soundTypeLabels={soundTypeLabels}
- customSounds={customSounds}
- isSoundEnabled={Sound.isSoundTypeEnabled}
- onToggleAllSounds={handleToggleAllSounds}
- onToggleSound={handleToggleSound}
- onPreviewSound={handlePreviewSound}
- onUploadClick={handleUploadClick}
- onCustomSoundDelete={handleCustomSoundDelete}
- onMasterVolumeChange={handleMasterVolumeChange}
- onSoundOverrideChange={handleSoundOverrideChange}
- onSoundOverrideReset={handleSoundOverrideReset}
- onAllOverridesReset={handleAllOverridesReset}
- data-flx="user.notifications-tab.inline.notifications-inline-content.sounds--2"
- />
- </SettingsSection>
- <SettingsSection
- id="text-to-speech"
- title={i18n._(TEXT_TO_SPEECH_NOTIFICATIONS_DESCRIPTOR)}
- description={i18n._(CONTROL_SPEECH_COMMANDS_AND_NARRATION_FOR_INCOMING_CONTENT_DESCRIPTOR)}
- data-flx="user.notifications-tab.inline.notifications-inline-content.text-to-speech"
- >
- <TextToSpeech data-flx="user.notifications-tab.inline.notifications-inline-content.text-to-speech--2" />
- </SettingsSection>
- </div>
- );
-});
diff --git a/fluxer_app/src/features/user/components/modals/tabs/privacy_safety_tab/PrivacySafetyTabInline.module.css b/fluxer_app/src/features/user/components/modals/tabs/privacy_safety_tab/PrivacySafetyTabInline.module.css
deleted file mode 100644
index dd9bf8e95..000000000
--- a/fluxer_app/src/features/user/components/modals/tabs/privacy_safety_tab/PrivacySafetyTabInline.module.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: AGPL-3.0-or-later */
-
-.container {
- display: flex;
- flex-direction: column;
-}
diff --git a/fluxer_app/src/features/user/components/modals/tabs/privacy_safety_tab/PrivacySafetyTabInline.tsx b/fluxer_app/src/features/user/components/modals/tabs/privacy_safety_tab/PrivacySafetyTabInline.tsx
index b0ad33c60..53b72dcc6 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/privacy_safety_tab/PrivacySafetyTabInline.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/privacy_safety_tab/PrivacySafetyTabInline.tsx
@@ -7,9 +7,9 @@ import {CommunicationTabContent as CommunicationTab} from '@app/features/user/co
import {ConnectionsTabContent as ConnectionsTab} from '@app/features/user/components/modals/tabs/privacy_safety_tab/ConnectionsTab';
import {DataDeletionTabContent as DataDeletionTab} from '@app/features/user/components/modals/tabs/privacy_safety_tab/DataDeletionTab';
import {DataExportTabContent as DataExportTab} from '@app/features/user/components/modals/tabs/privacy_safety_tab/DataExportTab';
-import styles from '@app/features/user/components/modals/tabs/privacy_safety_tab/PrivacySafetyTabInline.module.css';
import {ProfilePrivacyTabContent as ProfilePrivacyTab} from '@app/features/user/components/modals/tabs/privacy_safety_tab/ProfilePrivacyTab';
import {SensitiveContentTabContent as SensitiveContentTab} from '@app/features/user/components/modals/tabs/privacy_safety_tab/SensitiveContentTab';
+import styles from '@app/features/user/components/modals/tabs/TabInline.module.css';
import {useUserSettingsMutationController} from '@app/features/user/hooks/useUserSettingsMutationController';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
diff --git a/fluxer_app/src/features/user/components/modals/tabs/voice_video_tab/VoiceVideoTabInline.module.css b/fluxer_app/src/features/user/components/modals/tabs/voice_video_tab/VoiceVideoTabInline.module.css
deleted file mode 100644
index dd9bf8e95..000000000
--- a/fluxer_app/src/features/user/components/modals/tabs/voice_video_tab/VoiceVideoTabInline.module.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: AGPL-3.0-or-later */
-
-.container {
- display: flex;
- flex-direction: column;
-}
diff --git a/fluxer_app/src/features/user/components/modals/tabs/voice_video_tab/VoiceVideoTabInline.tsx b/fluxer_app/src/features/user/components/modals/tabs/voice_video_tab/VoiceVideoTabInline.tsx
index 1634a0cb9..c7fe3e60b 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/voice_video_tab/VoiceVideoTabInline.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/voice_video_tab/VoiceVideoTabInline.tsx
@@ -3,9 +3,9 @@
import {SettingsSection} from '@app/features/app/components/dialogs/shared/SettingsSection';
import {AUDIO_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
import MediaPermission from '@app/features/permissions/system/state/MediaPermission';
+import styles from '@app/features/user/components/modals/tabs/TabInline.module.css';
import {VideoTab} from '@app/features/user/components/modals/tabs/UserVideoTab';
import {VoiceTab} from '@app/features/user/components/modals/tabs/UserVoiceTab';
-import styles from '@app/features/user/components/modals/tabs/voice_video_tab/VoiceVideoTabInline.module.css';
import Users from '@app/features/user/state/Users';
import VoiceSettings from '@app/features/voice/state/VoiceSettings';
import {MediaDeviceRefreshType, refreshMediaDeviceLists} from '@app/features/voice/utils/MediaDeviceRefresh';
diff --git a/fluxer_app/src/features/user/hooks/useUsernameSuggestions.ts b/fluxer_app/src/features/user/hooks/useUsernameSuggestions.ts
index 7697f3ddc..834a0b4db 100644
--- a/fluxer_app/src/features/user/hooks/useUsernameSuggestions.ts
+++ b/fluxer_app/src/features/user/hooks/useUsernameSuggestions.ts
@@ -12,6 +12,7 @@ interface UseUsernameSuggestionsOptions {
username: string;
target: InstanceHTTPTarget;
debounceMs?: number;
+ enabled?: boolean;
}
export function useUsernameSuggestions({
@@ -19,6 +20,7 @@ export function useUsernameSuggestions({
username,
target,
debounceMs = 300,
+ enabled = true,
}: UseUsernameSuggestionsOptions) {
const [suggestions, setSuggestions] = useState<Array<string>>([]);
const debounceTimerRef = useRef<NodeJS.Timeout | null>(null);
@@ -46,6 +48,9 @@ export function useUsernameSuggestions({
[target],
);
useEffect(() => {
+ if (!enabled) {
+ return;
+ }
if (username && username.trim().length > 0) {
setSuggestions([]);
return;
@@ -61,6 +66,6 @@ export function useUsernameSuggestions({
clearTimeout(debounceTimerRef.current);
}
};
- }, [globalName, username, debounceMs, fetchSuggestions]);
+ }, [enabled, globalName, username, debounceMs, fetchSuggestions]);
return {suggestions};
}
diff --git a/fluxer_app/src/features/user/state/CustomStatus.ts b/fluxer_app/src/features/user/state/CustomStatus.ts
index d60ee0f43..34a2aa3a7 100644
--- a/fluxer_app/src/features/user/state/CustomStatus.ts
+++ b/fluxer_app/src/features/user/state/CustomStatus.ts
@@ -121,3 +121,17 @@ export function customStatusToKey(status: CustomStatus | null | undefined): stri
export function getCustomStatusText(status: CustomStatus | null | undefined): string | null {
return trimToNonEmpty(status?.text);
}
+
+export const buildDraftStatus = (params: {
+ text: string;
+ emojiId: string | null;
+ emojiName: string | null;
+ expiresAt: string | null;
+}): CustomStatus | null => {
+ return normalizeCustomStatus({
+ text: params.text || null,
+ emojiId: params.emojiId,
+ emojiName: params.emojiName,
+ expiresAt: params.expiresAt,
+ });
+};
diff --git a/fluxer_app/src/features/user/state/SyncedPreferencesEngine.ts b/fluxer_app/src/features/user/state/SyncedPreferencesEngine.ts
index 654cb7aac..6d9977f87 100644
--- a/fluxer_app/src/features/user/state/SyncedPreferencesEngine.ts
+++ b/fluxer_app/src/features/user/state/SyncedPreferencesEngine.ts
@@ -1,10 +1,11 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {fromBinary, toBinary} from '@bufbuild/protobuf';
-import {type SyncedPreferences, SyncedPreferencesSchema} from '@fluxer/schema/src/domains/user/SyncedPreferencesCodec';
-import {base64ToUint8Array, uint8ArrayToBase64} from 'uint8array-extras';
-
-const EMPTY_BYTES = new Uint8Array();
+import {
+ createEmptySyncedPreferences,
+ type SyncedPreferences,
+ SyncedPreferencesSchema,
+} from '@fluxer/schema/src/domains/user/SyncedPreferencesCodec';
export type SyncedPreferencesField = Exclude<keyof SyncedPreferences, '$typeName' | '$unknown'>;
@@ -178,44 +179,6 @@ export function preferencesFromBytes(bytes: Uint8Array): SyncedPreferences {
return fromBinary(SyncedPreferencesSchema, bytes);
}
-export function createEmptySyncedPreferences(): SyncedPreferences {
- return fromBinary(SyncedPreferencesSchema, EMPTY_BYTES);
-}
-
-export function encodeSyncedPreferences(preferences: SyncedPreferences): string {
- const bytes = preferencesToBytes(preferences);
- if (bytes.byteLength === 0) return '';
- return uint8ArrayToBase64(bytes);
-}
-
-function decodeSyncedPreferencesBytes(encoded: string | null | undefined): Uint8Array {
- if (!encoded) return EMPTY_BYTES;
- try {
- return base64ToUint8Array(encoded);
- } catch (error) {
- throw new SyncedPreferencesDecodeError(
- error instanceof Error ? `invalid base64: ${error.message}` : 'invalid base64',
- );
- }
-}
-
-function decodeSyncedPreferences(encoded: string | null | undefined): SyncedPreferences {
- try {
- return preferencesFromBytes(decodeSyncedPreferencesBytes(encoded));
- } catch (error) {
- if (error instanceof SyncedPreferencesDecodeError) throw error;
- throw new SyncedPreferencesDecodeError(error instanceof Error ? error.message : 'invalid synced preferences');
- }
-}
-
-export function decodeSyncedPreferencesLenient(encoded: string | null | undefined): SyncedPreferences {
- try {
- return decodeSyncedPreferences(encoded);
- } catch {
- return createEmptySyncedPreferences();
- }
-}
-
export function changedSyncedPreferenceFields(
left: SyncedPreferences,
right: SyncedPreferences,
@@ -281,10 +244,3 @@ export function mergeIncomingSyncedPreferences(args: {
dirtyFields: toFieldNames(dirtyFieldNumbers),
};
}
-
-class SyncedPreferencesDecodeError extends Error {
- constructor(message: string) {
- super(`failed to decode synced_preferences: ${message}`);
- this.name = 'SyncedPreferencesDecodeError';
- }
-}
diff --git a/fluxer_app/src/features/user/state/UserSettings.ts b/fluxer_app/src/features/user/state/UserSettings.ts
index 740719e9b..423c568bb 100644
--- a/fluxer_app/src/features/user/state/UserSettings.ts
+++ b/fluxer_app/src/features/user/state/UserSettings.ts
@@ -29,9 +29,6 @@ import {
import {setSyncedFieldUserSettings} from '@app/features/user/state/SyncedField';
import {
changedSyncedPreferenceFields,
- createEmptySyncedPreferences,
- decodeSyncedPreferencesLenient,
- encodeSyncedPreferences,
isSyncedPreferencesField,
mergeIncomingSyncedPreferences as mergeIncomingSyncedPreferencesWithEngine,
preferencesFromBytes,
@@ -54,6 +51,11 @@ import {
ThemeTypes,
TimeFormatTypes,
} from '@fluxer/constants/src/UserConstants';
+import {
+ createEmptySyncedPreferences,
+ decodeSyncedPreferencesLenient,
+ encodeSyncedPreferences,
+} from '@fluxer/schema/src/domains/user/SyncedPreferencesCodec';
import camelCase from 'lodash/camelCase';
import isEqual from 'lodash/isEqual';
import isPlainObject from 'lodash/isPlainObject';
diff --git a/fluxer_app/src/features/user/utils/DisplayNameUtils.ts b/fluxer_app/src/features/user/utils/DisplayNameUtils.ts
index becfbc418..1653ab9de 100644
--- a/fluxer_app/src/features/user/utils/DisplayNameUtils.ts
+++ b/fluxer_app/src/features/user/utils/DisplayNameUtils.ts
@@ -8,7 +8,7 @@ import StreamerMode from '@app/features/streamer_mode/state/StreamerMode';
import type {User} from '@app/features/user/models/User';
import {formatUserTag} from '@app/features/user/utils/UserTagUtils';
-function truncateStreamerModeName(name: string): string {
+export function truncateStreamerModeName(name: string): string {
const trimmed = name.trim();
if (!trimmed) return '…';
return `${Array.from(trimmed)[0]}…`;
diff --git a/fluxer_app/src/features/user/utils/NicknameUtils.ts b/fluxer_app/src/features/user/utils/NicknameUtils.ts
index fdbb50c42..5a8bbb58f 100644
--- a/fluxer_app/src/features/user/utils/NicknameUtils.ts
+++ b/fluxer_app/src/features/user/utils/NicknameUtils.ts
@@ -8,6 +8,7 @@ import Relationships from '@app/features/relationship/state/Relationships';
import StreamerMode from '@app/features/streamer_mode/state/StreamerMode';
import {noteText} from '@app/features/theme/fonts/ScriptFontLoader';
import type {User} from '@app/features/user/models/User';
+import {truncateStreamerModeName} from '@app/features/user/utils/DisplayNameUtils';
import {formatUserTag} from '@app/features/user/utils/UserTagUtils';
import {FLUXERBOT_ID} from '@fluxer/constants/src/AppConstants';
@@ -18,12 +19,6 @@ export interface UserDisplayNameLike {
global_name?: string | null;
}
-function truncateStreamerModeName(name: string): string {
- const trimmed = name.trim();
- if (!trimmed) return '…';
- return `${Array.from(trimmed)[0]}…`;
-}
-
export function formatNameForStreamerMode(name: string): string {
return StreamerMode.shouldTruncateUsernames ? truncateStreamerModeName(name) : name;
}
diff --git a/fluxer_app/src/features/voice/components/alerts/VoiceP2pPeerFailedModal.tsx b/fluxer_app/src/features/voice/components/alerts/VoiceP2pPeerFailedModal.tsx
index 640a4a420..86c74e8b0 100644
--- a/fluxer_app/src/features/voice/components/alerts/VoiceP2pPeerFailedModal.tsx
+++ b/fluxer_app/src/features/voice/components/alerts/VoiceP2pPeerFailedModal.tsx
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import * as Modal from '@app/features/app/components/dialogs/Modal';
+import {formatList} from '@app/features/i18n/utils/IntlCache';
import {Button} from '@app/features/ui/button/Button';
import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
import {getCurrentLocale} from '@app/features/user/utils/LocaleUtils';
@@ -13,7 +14,6 @@ import {
VOICE_P2P_SWITCH_TO_STANDARD_DESCRIPTOR,
} from '@app/features/voice/utils/VoiceMessageDescriptors';
import {useLingui} from '@lingui/react/macro';
-import {formatListWithConfig} from '@pkgs/list_utils/src/ListFormatting';
import {observer} from 'mobx-react-lite';
export interface VoiceP2pPeerFailedModalProps {
@@ -26,7 +26,7 @@ export interface VoiceP2pPeerFailedModalProps {
export const VoiceP2pPeerFailedModal = observer(
({names, allowSwitch, onLeave, onSwitch}: VoiceP2pPeerFailedModalProps) => {
const {i18n} = useLingui();
- const formattedNames = formatListWithConfig(names, {
+ const formattedNames = formatList(names, {
locale: getCurrentLocale(),
style: 'long',
type: 'conjunction',
diff --git a/fluxer_app/src/features/voice/components/bottomsheets/DirectCallLobbyBottomSheet.module.css b/fluxer_app/src/features/voice/components/bottomsheets/DirectCallLobbyBottomSheet.module.css
index 29b92b87d..213d3cbeb 100644
--- a/fluxer_app/src/features/voice/components/bottomsheets/DirectCallLobbyBottomSheet.module.css
+++ b/fluxer_app/src/features/voice/components/bottomsheets/DirectCallLobbyBottomSheet.module.css
@@ -33,160 +33,3 @@
border-radius: var(--radius-lg);
overflow: hidden;
}
-
-.actionButtons {
- display: grid;
- grid-template-columns: repeat(auto-fit, minmax(min(6.25rem, 100%), 1fr));
- gap: 0.75rem;
-}
-
-.actionButton {
- display: flex;
- flex-direction: column;
- align-items: center;
- gap: 0.25rem;
- padding: 0.75rem;
- border-radius: 0.75rem;
- background-color: var(--background-secondary-alt);
- transition: background-color 0.2s ease;
- cursor: pointer;
- border: none;
-}
-
-@media (hover: hover) and (pointer: fine) {
- .actionButton:hover {
- background-color: var(--background-modifier-hover);
- }
-}
-
-.iconContainer {
- display: flex;
- align-items: center;
- justify-content: center;
- width: 3rem;
- height: 3rem;
- border-radius: 624.9375rem;
-}
-
-.iconContainerBrand {
- background-color: var(--brand-primary);
-}
-
-.iconContainerDanger {
- background-color: var(--status-danger);
-}
-
-.iconContainerTertiary {
- background-color: var(--background-tertiary);
-}
-
-.iconContainerSuccess {
- background-color: #22c55e;
-}
-
-.actionIcon {
- color: white;
-}
-
-.actionIconSecondary {
- color: var(--text-primary);
-}
-
-.actionText {
- font-weight: 500;
- color: var(--text-secondary);
- font-size: 0.75rem;
-}
-
-.connectionInfo {
- border-radius: 0.75rem;
- background-color: var(--background-secondary-alt);
- padding: 1rem;
-}
-
-.connectionHeader {
- display: flex;
- align-items: center;
- justify-content: space-between;
- gap: 0.5rem;
- margin-bottom: 0.5rem;
-}
-
-.connectionStatusInfo {
- flex: 1;
-}
-
-.connectionTitle {
- font-weight: 500;
- color: var(--text-primary);
-}
-
-.connectionSubtitle {
- font-size: 0.875rem;
- color: var(--text-primary-muted);
-}
-
-.connectionStatusDot {
- width: 0.75rem;
- height: 0.75rem;
- border-radius: 624.9375rem;
- background-color: var(--status-online);
- flex-shrink: 0;
-}
-
-.statsGrid {
- display: grid;
- grid-template-columns: 1fr;
- gap: 0.5rem;
- margin-top: 0.5rem;
- color: var(--text-primary-muted);
-}
-
-.statRow {
- display: grid;
- grid-template-columns: auto 1fr;
- align-items: center;
- gap: 0.75rem;
-}
-
-.statLabel {
- white-space: nowrap;
- font-size: 0.75rem;
- color: var(--text-secondary);
-}
-
-.statValue {
- min-width: 0;
- text-align: right;
- font-size: 0.75rem;
-}
-
-.statValuePrimary {
- font-weight: 500;
- color: var(--text-primary);
-}
-
-.endpointValue {
- display: block;
- font-family: ui-monospace, SFMono-Regular, 'SF Mono', Consolas, 'Liberation Mono', Menlo, monospace;
- font-size: 0.75rem;
- font-weight: 600;
- color: #22c55e;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
-.connectionIdValue {
- display: block;
- font-family: ui-monospace, SFMono-Regular, 'SF Mono', Consolas, 'Liberation Mono', Menlo, monospace;
- font-size: 0.75rem;
- color: var(--text-primary);
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
-.maxWidth {
- max-width: 100%;
-}
diff --git a/fluxer_app/src/features/voice/components/bottomsheets/DirectCallLobbyBottomSheet.tsx b/fluxer_app/src/features/voice/components/bottomsheets/DirectCallLobbyBottomSheet.tsx
index 82ea29c9b..733e4792f 100644
--- a/fluxer_app/src/features/voice/components/bottomsheets/DirectCallLobbyBottomSheet.tsx
+++ b/fluxer_app/src/features/voice/components/bottomsheets/DirectCallLobbyBottomSheet.tsx
@@ -6,44 +6,29 @@ import {useCallHeaderState} from '@app/features/channel/components/channel_view/
import type {Channel} from '@app/features/channel/models/Channel';
import * as ChannelUtils from '@app/features/channel/utils/ChannelUtils';
import * as VoiceStateCommands from '@app/features/devtools/commands/VoiceStateCommands';
-import {
- CAMERA_ON_DESCRIPTOR,
- INCOMING_CALL_DESCRIPTOR,
- SETTINGS_DESCRIPTOR,
-} from '@app/features/i18n/utils/CommonMessageDescriptors';
+import {INCOMING_CALL_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
import {navigateToWithMobileHistory} from '@app/features/navigation/utils/MobileNavigation';
import {Logger} from '@app/features/platform/utils/AppLogger';
-import {
- CameraOffIcon,
- CameraOnIcon,
- DeafenIcon,
- DisconnectCallIcon,
- MicrophoneOffIcon,
- MicrophoneOnIcon,
- SettingsIcon,
- UndeafenIcon,
-} from '@app/features/ui/action_menu/ContextMenuIcons';
+import {DisconnectCallIcon} from '@app/features/ui/action_menu/ContextMenuIcons';
import {BottomSheet} from '@app/features/ui/bottom_sheet/BottomSheet';
import {Button} from '@app/features/ui/button/Button';
import * as LayoutCommands from '@app/features/ui/commands/LayoutCommands';
import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
import {modal} from '@app/features/ui/commands/ModalCommands';
import MobileLayout from '@app/features/ui/state/MobileLayout';
-import {Tooltip} from '@app/features/ui/tooltip/Tooltip';
import * as CallCommands from '@app/features/voice/commands/CallCommands';
import styles from '@app/features/voice/components/bottomsheets/DirectCallLobbyBottomSheet.module.css';
+import {
+ VoiceLobbyConnectionStats,
+ VoiceLobbyControls,
+} from '@app/features/voice/components/bottomsheets/VoiceLobbyShared';
import {CompactVoiceCallView} from '@app/features/voice/components/CompactVoiceCallView';
import {CameraPreviewModalInRoom} from '@app/features/voice/components/modals/CameraPreviewModal';
-import {
- formatMilliseconds,
- formatPacketLossPercent,
-} from '@app/features/voice/components/voice_connection_status/shared';
import MediaEngine, {useMediaEngineVersion} from '@app/features/voice/engine/MediaEngineFacade';
import {VOICE_CAMERA_USER_LIMIT_REACHED_DESCRIPTOR} from '@app/features/voice/engine/media_engine_facade/shared';
import {useCameraUserCapBlocked} from '@app/features/voice/hooks/useCameraUserCapBlocked';
import LocalVoiceState from '@app/features/voice/state/LocalVoiceState';
import {
- getOpenVoiceVideoSettingsLabel,
INCOMING_CALL_ACCEPT_ACTION_DESCRIPTOR,
INCOMING_CALL_IGNORE_ACTION_DESCRIPTOR,
INCOMING_CALL_REJECT_ACTION_DESCRIPTOR,
@@ -54,9 +39,7 @@ import {
import {VOICE_CHANNEL_CAMERA_USER_LIMIT} from '@fluxer/constants/src/LimitConstants';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
-import {clsx} from 'clsx';
import {observer} from 'mobx-react-lite';
-import type React from 'react';
import {useCallback, useMemo} from 'react';
const CALL_AVAILABLE_DESCRIPTOR = msg({
@@ -271,15 +254,6 @@ export const DirectCallLobbyBottomSheet = observer(function DirectCallLobbyBotto
return i18n._(VOICE_CALL_DESCRIPTOR);
}
}, [callHeaderState.controlsVariant, callHeaderState.isDeviceInRoomForChannelCall, i18n.locale]);
- const prettyEndpoint = useMemo(() => {
- if (!voiceServerEndpoint) return null;
- try {
- const url = new URL(voiceServerEndpoint);
- return url.port ? `${url.hostname}:${url.port}` : url.hostname;
- } catch {
- return voiceServerEndpoint;
- }
- }, [voiceServerEndpoint]);
const shouldShowControls = callHeaderState.controlsVariant !== 'hidden';
const shouldShowDisconnect = callHeaderState.controlsVariant === 'inCall';
const title = useMemo(() => {
@@ -287,23 +261,6 @@ export const DirectCallLobbyBottomSheet = observer(function DirectCallLobbyBotto
const dmName = ChannelUtils.getDMDisplayName(channel);
return dmName || callStatusLabel;
}, [channel, callStatusLabel]);
- const Row = useMemo(
- () =>
- observer(({label, value, valueClassName}: {label: string; value: React.ReactNode; valueClassName?: string}) => (
- <div className={styles.statRow} data-flx="voice.direct-call-lobby-bottom-sheet.row.stat-row">
- <span className={styles.statLabel} data-flx="voice.direct-call-lobby-bottom-sheet.row.stat-label">
- {label}
- </span>
- <div
- className={clsx(styles.statValue, valueClassName)}
- data-flx="voice.direct-call-lobby-bottom-sheet.row.stat-value"
- >
- {value}
- </div>
- </div>
- )),
- [],
- );
if (!shouldShowControls) return null;
return (
<BottomSheet
@@ -380,243 +337,41 @@ export const DirectCallLobbyBottomSheet = observer(function DirectCallLobbyBotto
/>
</div>
)}
- <div className={styles.actionButtons} data-flx="voice.direct-call-lobby-bottom-sheet.action-buttons">
- <button
- type="button"
- className={styles.actionButton}
- onClick={handleToggleMute}
- aria-pressed={isMuted}
- data-flx="voice.direct-call-lobby-bottom-sheet.action-button.toggle-mute"
- >
- <div
- className={clsx(styles.iconContainer, isMuted ? styles.iconContainerDanger : styles.iconContainerBrand)}
- data-flx="voice.direct-call-lobby-bottom-sheet.icon-container"
- >
- {isMuted ? (
- <MicrophoneOffIcon
- className={styles.actionIcon}
- size={24}
- data-flx="voice.direct-call-lobby-bottom-sheet.action-icon"
- />
- ) : (
- <MicrophoneOnIcon
- className={styles.actionIcon}
- size={24}
- data-flx="voice.direct-call-lobby-bottom-sheet.action-icon--2"
- />
- )}
- </div>
- <span className={styles.actionText} data-flx="voice.direct-call-lobby-bottom-sheet.action-text">
- {isMuted ? i18n._(UNMUTE_DESCRIPTOR) : i18n._(MUTE_DESCRIPTOR)}
- </span>
- </button>
- <button
- type="button"
- className={styles.actionButton}
- onClick={handleToggleDeafen}
- aria-pressed={isDeafened}
- data-flx="voice.direct-call-lobby-bottom-sheet.action-button.toggle-deafen"
- >
- <div
- className={clsx(
- styles.iconContainer,
- isDeafened ? styles.iconContainerDanger : styles.iconContainerTertiary,
- )}
- data-flx="voice.direct-call-lobby-bottom-sheet.icon-container--2"
- >
- {isDeafened ? (
- <DeafenIcon
- className={styles.actionIconSecondary}
- size={24}
- data-flx="voice.direct-call-lobby-bottom-sheet.action-icon-secondary"
- />
- ) : (
- <UndeafenIcon
- className={styles.actionIconSecondary}
- size={24}
- data-flx="voice.direct-call-lobby-bottom-sheet.action-icon-secondary--2"
- />
- )}
- </div>
- <span className={styles.actionText} data-flx="voice.direct-call-lobby-bottom-sheet.action-text--2">
- {i18n._(isDeafened ? VOICE_UNDEAFEN_DESCRIPTOR : VOICE_DEAFEN_DESCRIPTOR)}
- </span>
- </button>
- {isConnected &&
- (() => {
- const cameraToggleButton = (
- <button
- type="button"
- className={styles.actionButton}
- onClick={cameraCapBlocked ? undefined : handleToggleCamera}
- disabled={cameraCapBlocked}
- aria-label={cameraCapBlocked ? cameraCapBlockedLabel : undefined}
- aria-pressed={isCameraOn}
- data-flx="voice.direct-call-lobby-bottom-sheet.action-button.toggle-camera"
- >
- <div
- className={clsx(
- styles.iconContainer,
- isCameraOn ? styles.iconContainerSuccess : styles.iconContainerTertiary,
- )}
- data-flx="voice.direct-call-lobby-bottom-sheet.icon-container--3"
- >
- {isCameraOn ? (
- <CameraOnIcon
- className={styles.actionIcon}
- size={24}
- data-flx="voice.direct-call-lobby-bottom-sheet.action-icon--3"
- />
- ) : (
- <CameraOffIcon
- className={styles.actionIconSecondary}
- size={24}
- data-flx="voice.direct-call-lobby-bottom-sheet.action-icon-secondary--3"
- />
- )}
- </div>
- <span className={styles.actionText} data-flx="voice.direct-call-lobby-bottom-sheet.action-text--3">
- {isCameraOn ? i18n._(CAMERA_ON_DESCRIPTOR) : i18n._(CAMERA_OFF_DESCRIPTOR)}
- </span>
- </button>
- );
- if (!cameraCapBlocked) return cameraToggleButton;
- return (
- <Tooltip
- text={cameraCapBlockedLabel}
- data-flx="voice.direct-call-lobby-bottom-sheet.tooltip.camera-cap"
- >
- {cameraToggleButton}
- </Tooltip>
- );
- })()}
- <button
- type="button"
- className={styles.actionButton}
- onClick={handleOpenVoiceSettings}
- aria-label={getOpenVoiceVideoSettingsLabel(i18n)}
- data-flx="voice.direct-call-lobby-bottom-sheet.action-button.open-voice-settings"
- >
- <div
- className={clsx(styles.iconContainer, styles.iconContainerTertiary)}
- data-flx="voice.direct-call-lobby-bottom-sheet.icon-container--4"
- >
- <SettingsIcon
- className={styles.actionIconSecondary}
- size={24}
- data-flx="voice.direct-call-lobby-bottom-sheet.action-icon-secondary--4"
- />
- </div>
- <span className={styles.actionText} data-flx="voice.direct-call-lobby-bottom-sheet.action-text--4">
- {i18n._(SETTINGS_DESCRIPTOR)}
- </span>
- </button>
- </div>
+ <VoiceLobbyControls
+ data-flx="voice.direct-call-lobby-bottom-sheet"
+ muteButtonDataFlx="voice.direct-call-lobby-bottom-sheet.action-button.toggle-mute"
+ isConnected={isConnected}
+ isMuted={isMuted}
+ isDeafened={isDeafened}
+ isCameraOn={isCameraOn}
+ muteLabel={isMuted ? i18n._(UNMUTE_DESCRIPTOR) : i18n._(MUTE_DESCRIPTOR)}
+ deafenLabel={i18n._(isDeafened ? VOICE_UNDEAFEN_DESCRIPTOR : VOICE_DEAFEN_DESCRIPTOR)}
+ cameraCapBlocked={cameraCapBlocked}
+ cameraCapBlockedLabel={cameraCapBlockedLabel}
+ cameraOffLabel={i18n._(CAMERA_OFF_DESCRIPTOR)}
+ onToggleMute={handleToggleMute}
+ onToggleDeafen={handleToggleDeafen}
+ onToggleCamera={handleToggleCamera}
+ onOpenVoiceSettings={handleOpenVoiceSettings}
+ />
{isConnected && (
- <div className={styles.connectionInfo} data-flx="voice.direct-call-lobby-bottom-sheet.connection-info">
- <div className={styles.connectionHeader} data-flx="voice.direct-call-lobby-bottom-sheet.connection-header">
- <div
- className={styles.connectionStatusInfo}
- data-flx="voice.direct-call-lobby-bottom-sheet.connection-status-info"
- >
- <div
- className={styles.connectionTitle}
- data-flx="voice.direct-call-lobby-bottom-sheet.connection-title"
- >
- {i18n._(CONNECTED_TO_CALL_DESCRIPTOR)}
- </div>
- <div
- className={styles.connectionSubtitle}
- data-flx="voice.direct-call-lobby-bottom-sheet.connection-subtitle"
- >
- {i18n._(YOU_RE_IN_THE_CALL_DESCRIPTOR)}
- </div>
- </div>
- <div
- className={styles.connectionStatusDot}
- aria-hidden="true"
- data-flx="voice.direct-call-lobby-bottom-sheet.connection-status-dot"
- />
- </div>
- <div className={styles.statsGrid} data-flx="voice.direct-call-lobby-bottom-sheet.stats-grid">
- {currentLatency !== null && (
- <Row
- label={i18n._(PING_DESCRIPTOR)}
- value={
- <span
- className={styles.statValuePrimary}
- data-flx="voice.direct-call-lobby-bottom-sheet.stat-value-primary"
- >
- {formatMilliseconds(currentLatency, i18n.locale)}
- </span>
- }
- data-flx="voice.direct-call-lobby-bottom-sheet.row"
- />
- )}
- {prettyEndpoint && (
- <Row
- label={i18n._(ENDPOINT_DESCRIPTOR)}
- value={
- <Tooltip text={prettyEndpoint} data-flx="voice.direct-call-lobby-bottom-sheet.tooltip">
- <span
- className={styles.endpointValue}
- data-flx="voice.direct-call-lobby-bottom-sheet.endpoint-value"
- >
- {prettyEndpoint}
- </span>
- </Tooltip>
- }
- valueClassName={styles.maxWidth}
- data-flx="voice.direct-call-lobby-bottom-sheet.row--2"
- />
- )}
- {connectionId && (
- <Row
- label={i18n._(CONNECTION_ID_DESCRIPTOR)}
- value={
- <Tooltip text={connectionId} data-flx="voice.direct-call-lobby-bottom-sheet.tooltip--2">
- <span
- className={styles.connectionIdValue}
- data-flx="voice.direct-call-lobby-bottom-sheet.connection-id-value"
- >
- {connectionId}
- </span>
- </Tooltip>
- }
- valueClassName={styles.maxWidth}
- data-flx="voice.direct-call-lobby-bottom-sheet.row--3"
- />
- )}
- {typeof voiceStats?.audioPacketLoss === 'number' && voiceStats.audioPacketLoss > 0 && (
- <Row
- label={i18n._(PACKET_LOSS_DESCRIPTOR)}
- value={
- <span
- className={styles.statValuePrimary}
- data-flx="voice.direct-call-lobby-bottom-sheet.stat-value-primary--2"
- >
- {formatPacketLossPercent(voiceStats.audioPacketLoss, i18n.locale)}
- </span>
- }
- data-flx="voice.direct-call-lobby-bottom-sheet.row--4"
- />
- )}
- {typeof voiceStats?.jitter === 'number' && voiceStats.jitter > 0 && (
- <Row
- label={i18n._(JITTER_DESCRIPTOR)}
- value={
- <span
- className={styles.statValuePrimary}
- data-flx="voice.direct-call-lobby-bottom-sheet.stat-value-primary--3"
- >
- {formatMilliseconds(voiceStats.jitter, i18n.locale)}
- </span>
- }
- data-flx="voice.direct-call-lobby-bottom-sheet.row--5"
- />
- )}
- </div>
- </div>
+ <VoiceLobbyConnectionStats
+ data-flx="voice.direct-call-lobby-bottom-sheet"
+ title={i18n._(CONNECTED_TO_CALL_DESCRIPTOR)}
+ subtitle={i18n._(YOU_RE_IN_THE_CALL_DESCRIPTOR)}
+ labels={{
+ ping: i18n._(PING_DESCRIPTOR),
+ endpoint: i18n._(ENDPOINT_DESCRIPTOR),
+ connectionId: i18n._(CONNECTION_ID_DESCRIPTOR),
+ packetLoss: i18n._(PACKET_LOSS_DESCRIPTOR),
+ jitter: i18n._(JITTER_DESCRIPTOR),
+ }}
+ currentLatency={currentLatency}
+ voiceServerEndpoint={voiceServerEndpoint}
+ connectionId={connectionId}
+ audioPacketLoss={voiceStats?.audioPacketLoss}
+ jitter={voiceStats?.jitter}
+ />
)}
</div>
</BottomSheet>
diff --git a/fluxer_app/src/features/voice/components/bottomsheets/VoiceLobbyBottomSheet.module.css b/fluxer_app/src/features/voice/components/bottomsheets/VoiceLobbyBottomSheet.module.css
index 6ac985bdf..68d872055 100644
--- a/fluxer_app/src/features/voice/components/bottomsheets/VoiceLobbyBottomSheet.module.css
+++ b/fluxer_app/src/features/voice/components/bottomsheets/VoiceLobbyBottomSheet.module.css
@@ -12,164 +12,7 @@
gap: 0.5rem;
}
-.actionButtons {
- display: grid;
- grid-template-columns: repeat(auto-fit, minmax(min(6.25rem, 100%), 1fr));
- gap: 0.75rem;
-}
-
-.actionButton {
- display: flex;
- flex-direction: column;
- align-items: center;
- gap: 0.25rem;
- padding: 0.75rem;
- border-radius: 0.75rem;
- background-color: var(--background-secondary-alt);
- transition: background-color 0.2s ease;
- cursor: pointer;
- border: none;
-}
-
.fullWidth {
width: 100%;
flex: 1;
}
-
-@media (hover: hover) and (pointer: fine) {
- .actionButton:hover {
- background-color: var(--background-modifier-hover);
- }
-}
-
-.iconContainer {
- display: flex;
- align-items: center;
- justify-content: center;
- width: 3rem;
- height: 3rem;
- border-radius: 624.9375rem;
-}
-
-.iconContainerBrand {
- background-color: var(--brand-primary);
-}
-
-.iconContainerDanger {
- background-color: var(--status-danger);
-}
-
-.iconContainerTertiary {
- background-color: var(--background-tertiary);
-}
-
-.iconContainerSuccess {
- background-color: #22c55e;
-}
-
-.actionIcon {
- color: white;
-}
-
-.actionIconSecondary {
- color: var(--text-primary);
-}
-
-.actionText {
- font-weight: 500;
- color: var(--text-secondary);
- font-size: 0.75rem;
-}
-
-.connectionInfo {
- border-radius: 0.75rem;
- background-color: var(--background-secondary-alt);
- padding: 1rem;
-}
-
-.connectionHeader {
- display: flex;
- align-items: center;
- justify-content: space-between;
- gap: 0.5rem;
- margin-bottom: 0.5rem;
-}
-
-.connectionStatusInfo {
- flex: 1;
-}
-
-.connectionTitle {
- font-weight: 500;
- color: var(--text-primary);
-}
-
-.connectionSubtitle {
- font-size: 0.875rem;
- color: var(--text-primary-muted);
-}
-
-.connectionStatusDot {
- width: 0.75rem;
- height: 0.75rem;
- border-radius: 624.9375rem;
- background-color: var(--status-online);
- flex-shrink: 0;
-}
-
-.statsGrid {
- display: grid;
- grid-template-columns: 1fr;
- gap: 0.5rem;
- margin-top: 0.5rem;
- color: var(--text-primary-muted);
-}
-
-.statRow {
- display: grid;
- grid-template-columns: auto 1fr;
- align-items: center;
- gap: 0.75rem;
-}
-
-.statLabel {
- white-space: nowrap;
- font-size: 0.75rem;
- color: var(--text-secondary);
-}
-
-.statValue {
- min-width: 0;
- text-align: right;
- font-size: 0.75rem;
-}
-
-.statValuePrimary {
- font-weight: 500;
- color: var(--text-primary);
-}
-
-.endpointValue {
- display: block;
- font-family: ui-monospace, SFMono-Regular, 'SF Mono', Consolas, 'Liberation Mono', Menlo, monospace;
- font-size: 0.75rem;
- font-weight: 600;
- color: #22c55e;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
-.connectionIdValue {
- display: block;
- font-family: ui-monospace, SFMono-Regular, 'SF Mono', Consolas, 'Liberation Mono', Menlo, monospace;
- font-size: 0.75rem;
- color: var(--text-primary);
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
-.maxWidth {
- max-width: 100%;
-}
diff --git a/fluxer_app/src/features/voice/components/bottomsheets/VoiceLobbyBottomSheet.tsx b/fluxer_app/src/features/voice/components/bottomsheets/VoiceLobbyBottomSheet.tsx
index 616ff8efb..b899fc399 100644
--- a/fluxer_app/src/features/voice/components/bottomsheets/VoiceLobbyBottomSheet.tsx
+++ b/fluxer_app/src/features/voice/components/bottomsheets/VoiceLobbyBottomSheet.tsx
@@ -5,39 +5,27 @@ import {UserSettingsModal} from '@app/features/app/components/dialogs/LoadableSe
import type {Channel} from '@app/features/channel/models/Channel';
import * as VoiceStateCommands from '@app/features/devtools/commands/VoiceStateCommands';
import type {Guild} from '@app/features/guild/models/Guild';
-import {CAMERA_ON_DESCRIPTOR, SETTINGS_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
import {navigateToWithMobileHistory} from '@app/features/navigation/utils/MobileNavigation';
import {Logger} from '@app/features/platform/utils/AppLogger';
-import {
- CameraOffIcon,
- CameraOnIcon,
- DeafenIcon,
- DisconnectCallIcon,
- MicrophoneOffIcon,
- MicrophoneOnIcon,
- SettingsIcon,
- UndeafenIcon,
-} from '@app/features/ui/action_menu/ContextMenuIcons';
+import {DisconnectCallIcon} from '@app/features/ui/action_menu/ContextMenuIcons';
import {BottomSheet} from '@app/features/ui/bottom_sheet/BottomSheet';
import {Button} from '@app/features/ui/button/Button';
import * as LayoutCommands from '@app/features/ui/commands/LayoutCommands';
import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
import {modal} from '@app/features/ui/commands/ModalCommands';
import MobileLayout from '@app/features/ui/state/MobileLayout';
-import {Tooltip} from '@app/features/ui/tooltip/Tooltip';
import styles from '@app/features/voice/components/bottomsheets/VoiceLobbyBottomSheet.module.css';
-import {CameraPreviewModalInRoom} from '@app/features/voice/components/modals/CameraPreviewModal';
import {
- formatMilliseconds,
- formatPacketLossPercent,
-} from '@app/features/voice/components/voice_connection_status/shared';
+ VoiceLobbyConnectionStats,
+ VoiceLobbyControls,
+} from '@app/features/voice/components/bottomsheets/VoiceLobbyShared';
+import {CameraPreviewModalInRoom} from '@app/features/voice/components/modals/CameraPreviewModal';
import MediaEngine, {useMediaEngineVersion} from '@app/features/voice/engine/MediaEngineFacade';
import {VOICE_CAMERA_USER_LIMIT_REACHED_DESCRIPTOR} from '@app/features/voice/engine/media_engine_facade/shared';
import {useCameraUserCapBlocked} from '@app/features/voice/hooks/useCameraUserCapBlocked';
import {usePendingVoiceConnection} from '@app/features/voice/hooks/usePendingVoiceConnection';
import LocalVoiceState from '@app/features/voice/state/LocalVoiceState';
import {
- getOpenVoiceVideoSettingsLabel,
getVoiceDeafenedByModeratorsStatusLabel,
VOICE_DEAFEN_DESCRIPTOR,
VOICE_DISCONNECT_DESCRIPTOR,
@@ -49,7 +37,6 @@ import {isVoicePermissionMuteActive} from '@app/features/voice/utils/VoicePermis
import {VOICE_CHANNEL_CAMERA_USER_LIMIT} from '@fluxer/constants/src/LimitConstants';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
-import {clsx} from 'clsx';
import {observer} from 'mobx-react-lite';
import {useCallback} from 'react';
@@ -216,30 +203,6 @@ export const VoiceLobbyBottomSheet = observer(function VoiceLobbyBottomSheet({
logger.error('Failed to toggle camera:', err);
}
};
- const Row = observer(
- ({label, value, valueClassName}: {label: string; value: React.ReactNode; valueClassName?: string}) => (
- <div className={styles.statRow} data-flx="voice.voice-lobby-bottom-sheet.row.stat-row">
- <span className={styles.statLabel} data-flx="voice.voice-lobby-bottom-sheet.row.stat-label">
- {label}
- </span>
- <div
- className={clsx(styles.statValue, valueClassName)}
- data-flx="voice.voice-lobby-bottom-sheet.row.stat-value"
- >
- {value}
- </div>
- </div>
- ),
- );
- const prettyEndpoint = (() => {
- if (!voiceServerEndpoint) return null;
- try {
- const url = new URL(voiceServerEndpoint);
- return url.port ? `${url.hostname}:${url.port}` : url.hostname;
- } catch {
- return voiceServerEndpoint;
- }
- })();
return (
<BottomSheet
isOpen={isOpen}
@@ -283,238 +246,45 @@ export const VoiceLobbyBottomSheet = observer(function VoiceLobbyBottomSheet({
</Button>
)}
</div>
- <div className={styles.actionButtons} data-flx="voice.voice-lobby-bottom-sheet.action-buttons">
- <button
- type="button"
- className={styles.actionButton}
- onClick={isMicLocked ? undefined : handleToggleMute}
- disabled={isMicLocked}
- aria-label={muteLabel}
- aria-pressed={isMuted}
- data-flx="voice.voice-lobby-bottom-sheet.action-button.undefined"
- >
- <div
- className={clsx(styles.iconContainer, isMuted ? styles.iconContainerDanger : styles.iconContainerBrand)}
- data-flx="voice.voice-lobby-bottom-sheet.icon-container"
- >
- {isMuted ? (
- <MicrophoneOffIcon
- className={styles.actionIcon}
- size={24}
- data-flx="voice.voice-lobby-bottom-sheet.action-icon"
- />
- ) : (
- <MicrophoneOnIcon
- className={styles.actionIcon}
- size={24}
- data-flx="voice.voice-lobby-bottom-sheet.action-icon--2"
- />
- )}
- </div>
- <span className={styles.actionText} data-flx="voice.voice-lobby-bottom-sheet.action-text">
- {muteLabel}
- </span>
- </button>
- <button
- type="button"
- className={styles.actionButton}
- onClick={isGuildDeafened ? undefined : handleToggleDeafen}
- disabled={isGuildDeafened}
- aria-label={deafenLabel}
- aria-pressed={isDeafened}
- data-flx="voice.voice-lobby-bottom-sheet.action-button.toggle-deafen"
- >
- <div
- className={clsx(
- styles.iconContainer,
- isDeafened ? styles.iconContainerDanger : styles.iconContainerTertiary,
- )}
- data-flx="voice.voice-lobby-bottom-sheet.icon-container--2"
- >
- {isDeafened ? (
- <DeafenIcon
- className={styles.actionIconSecondary}
- size={24}
- data-flx="voice.voice-lobby-bottom-sheet.action-icon-secondary"
- />
- ) : (
- <UndeafenIcon
- className={styles.actionIconSecondary}
- size={24}
- data-flx="voice.voice-lobby-bottom-sheet.action-icon-secondary--2"
- />
- )}
- </div>
- <span className={styles.actionText} data-flx="voice.voice-lobby-bottom-sheet.action-text--2">
- {deafenLabel}
- </span>
- </button>
- {isConnected &&
- (() => {
- const cameraToggleButton = (
- <button
- type="button"
- className={styles.actionButton}
- onClick={cameraCapBlocked ? undefined : handleToggleCamera}
- disabled={cameraCapBlocked}
- aria-label={cameraCapBlocked ? cameraCapBlockedLabel : undefined}
- aria-pressed={isCameraOn}
- data-flx="voice.voice-lobby-bottom-sheet.action-button.toggle-camera"
- >
- <div
- className={clsx(
- styles.iconContainer,
- isCameraOn ? styles.iconContainerSuccess : styles.iconContainerTertiary,
- )}
- data-flx="voice.voice-lobby-bottom-sheet.icon-container--3"
- >
- {isCameraOn ? (
- <CameraOnIcon
- className={styles.actionIcon}
- size={24}
- data-flx="voice.voice-lobby-bottom-sheet.action-icon--3"
- />
- ) : (
- <CameraOffIcon
- className={styles.actionIconSecondary}
- size={24}
- data-flx="voice.voice-lobby-bottom-sheet.action-icon-secondary--3"
- />
- )}
- </div>
- <span className={styles.actionText} data-flx="voice.voice-lobby-bottom-sheet.action-text--3">
- {isCameraOn ? i18n._(CAMERA_ON_DESCRIPTOR) : i18n._(CAMERA_OFF_DESCRIPTOR)}
- </span>
- </button>
- );
- if (!cameraCapBlocked) return cameraToggleButton;
- return (
- <Tooltip text={cameraCapBlockedLabel} data-flx="voice.voice-lobby-bottom-sheet.tooltip.camera-cap">
- {cameraToggleButton}
- </Tooltip>
- );
- })()}
- <button
- type="button"
- className={styles.actionButton}
- onClick={handleOpenVoiceSettings}
- aria-label={getOpenVoiceVideoSettingsLabel(i18n)}
- data-flx="voice.voice-lobby-bottom-sheet.action-button.open-voice-settings"
- >
- <div
- className={clsx(styles.iconContainer, styles.iconContainerTertiary)}
- data-flx="voice.voice-lobby-bottom-sheet.icon-container--4"
- >
- <SettingsIcon
- className={styles.actionIconSecondary}
- size={24}
- data-flx="voice.voice-lobby-bottom-sheet.action-icon-secondary--4"
- />
- </div>
- <span className={styles.actionText} data-flx="voice.voice-lobby-bottom-sheet.action-text--4">
- {i18n._(SETTINGS_DESCRIPTOR)}
- </span>
- </button>
- </div>
+ <VoiceLobbyControls
+ data-flx="voice.voice-lobby-bottom-sheet"
+ muteButtonDataFlx="voice.voice-lobby-bottom-sheet.action-button.undefined"
+ isConnected={isConnected}
+ isMuted={isMuted}
+ isDeafened={isDeafened}
+ isCameraOn={isCameraOn}
+ micLocked={isMicLocked}
+ deafenLocked={isGuildDeafened}
+ muteLabel={muteLabel}
+ muteAriaLabel={muteLabel}
+ deafenLabel={deafenLabel}
+ deafenAriaLabel={deafenLabel}
+ cameraCapBlocked={cameraCapBlocked}
+ cameraCapBlockedLabel={cameraCapBlockedLabel}
+ cameraOffLabel={i18n._(CAMERA_OFF_DESCRIPTOR)}
+ onToggleMute={handleToggleMute}
+ onToggleDeafen={handleToggleDeafen}
+ onToggleCamera={handleToggleCamera}
+ onOpenVoiceSettings={handleOpenVoiceSettings}
+ />
{isConnected && (
- <div className={styles.connectionInfo} data-flx="voice.voice-lobby-bottom-sheet.connection-info">
- <div className={styles.connectionHeader} data-flx="voice.voice-lobby-bottom-sheet.connection-header">
- <div
- className={styles.connectionStatusInfo}
- data-flx="voice.voice-lobby-bottom-sheet.connection-status-info"
- >
- <div className={styles.connectionTitle} data-flx="voice.voice-lobby-bottom-sheet.connection-title">
- {i18n._(CONNECTED_TO_VOICE_DESCRIPTOR)}
- </div>
- <div
- className={styles.connectionSubtitle}
- data-flx="voice.voice-lobby-bottom-sheet.connection-subtitle"
- >
- {i18n._(YOU_RE_IN_THE_VOICE_CHANNEL_DESCRIPTOR)}
- </div>
- </div>
- <div
- className={styles.connectionStatusDot}
- aria-hidden="true"
- data-flx="voice.voice-lobby-bottom-sheet.connection-status-dot"
- />
- </div>
- <div className={styles.statsGrid} data-flx="voice.voice-lobby-bottom-sheet.stats-grid">
- {currentLatency !== null && (
- <Row
- label={i18n._(PING_DESCRIPTOR)}
- value={
- <span
- className={styles.statValuePrimary}
- data-flx="voice.voice-lobby-bottom-sheet.stat-value-primary"
- >
- {formatMilliseconds(currentLatency, i18n.locale)}
- </span>
- }
- data-flx="voice.voice-lobby-bottom-sheet.row"
- />
- )}
- {prettyEndpoint && (
- <Row
- label={i18n._(ENDPOINT_DESCRIPTOR)}
- value={
- <Tooltip text={prettyEndpoint} data-flx="voice.voice-lobby-bottom-sheet.tooltip">
- <span className={styles.endpointValue} data-flx="voice.voice-lobby-bottom-sheet.endpoint-value">
- {prettyEndpoint}
- </span>
- </Tooltip>
- }
- valueClassName={styles.maxWidth}
- data-flx="voice.voice-lobby-bottom-sheet.row--2"
- />
- )}
- {connectionId && (
- <Row
- label={i18n._(CONNECTION_ID_DESCRIPTOR)}
- value={
- <Tooltip text={connectionId} data-flx="voice.voice-lobby-bottom-sheet.tooltip--2">
- <span
- className={styles.connectionIdValue}
- data-flx="voice.voice-lobby-bottom-sheet.connection-id-value"
- >
- {connectionId}
- </span>
- </Tooltip>
- }
- valueClassName={styles.maxWidth}
- data-flx="voice.voice-lobby-bottom-sheet.row--3"
- />
- )}
- {typeof voiceStats?.audioPacketLoss === 'number' && voiceStats.audioPacketLoss > 0 && (
- <Row
- label={i18n._(PACKET_LOSS_DESCRIPTOR)}
- value={
- <span
- className={styles.statValuePrimary}
- data-flx="voice.voice-lobby-bottom-sheet.stat-value-primary--2"
- >
- {formatPacketLossPercent(voiceStats.audioPacketLoss, i18n.locale)}
- </span>
- }
- data-flx="voice.voice-lobby-bottom-sheet.row--4"
- />
- )}
- {typeof voiceStats?.jitter === 'number' && voiceStats.jitter > 0 && (
- <Row
- label={i18n._(JITTER_DESCRIPTOR)}
- value={
- <span
- className={styles.statValuePrimary}
- data-flx="voice.voice-lobby-bottom-sheet.stat-value-primary--3"
- >
- {formatMilliseconds(voiceStats.jitter, i18n.locale)}
- </span>
- }
- data-flx="voice.voice-lobby-bottom-sheet.row--5"
- />
- )}
- </div>
- </div>
+ <VoiceLobbyConnectionStats
+ data-flx="voice.voice-lobby-bottom-sheet"
+ title={i18n._(CONNECTED_TO_VOICE_DESCRIPTOR)}
+ subtitle={i18n._(YOU_RE_IN_THE_VOICE_CHANNEL_DESCRIPTOR)}
+ labels={{
+ ping: i18n._(PING_DESCRIPTOR),
+ endpoint: i18n._(ENDPOINT_DESCRIPTOR),
+ connectionId: i18n._(CONNECTION_ID_DESCRIPTOR),
+ packetLoss: i18n._(PACKET_LOSS_DESCRIPTOR),
+ jitter: i18n._(JITTER_DESCRIPTOR),
+ }}
+ currentLatency={currentLatency}
+ voiceServerEndpoint={voiceServerEndpoint}
+ connectionId={connectionId}
+ audioPacketLoss={voiceStats?.audioPacketLoss}
+ jitter={voiceStats?.jitter}
+ />
)}
</div>
</BottomSheet>
diff --git a/fluxer_app/src/features/voice/components/bottomsheets/VoiceLobbyShared.module.css b/fluxer_app/src/features/voice/components/bottomsheets/VoiceLobbyShared.module.css
new file mode 100644
index 000000000..bbb459fa2
--- /dev/null
+++ b/fluxer_app/src/features/voice/components/bottomsheets/VoiceLobbyShared.module.css
@@ -0,0 +1,158 @@
+/* SPDX-License-Identifier: AGPL-3.0-or-later */
+
+.actionButtons {
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(min(6.25rem, 100%), 1fr));
+ gap: 0.75rem;
+}
+
+.actionButton {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ gap: 0.25rem;
+ padding: 0.75rem;
+ border-radius: 0.75rem;
+ background-color: var(--background-secondary-alt);
+ transition: background-color 0.2s ease;
+ cursor: pointer;
+ border: none;
+}
+
+@media (hover: hover) and (pointer: fine) {
+ .actionButton:hover {
+ background-color: var(--background-modifier-hover);
+ }
+}
+
+.iconContainer {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 3rem;
+ height: 3rem;
+ border-radius: 624.9375rem;
+}
+
+.iconContainerBrand {
+ background-color: var(--brand-primary);
+}
+
+.iconContainerDanger {
+ background-color: var(--status-danger);
+}
+
+.iconContainerTertiary {
+ background-color: var(--background-tertiary);
+}
+
+.iconContainerSuccess {
+ background-color: #22c55e;
+}
+
+.actionIcon {
+ color: white;
+}
+
+.actionIconSecondary {
+ color: var(--text-primary);
+}
+
+.actionText {
+ font-weight: 500;
+ color: var(--text-secondary);
+ font-size: 0.75rem;
+}
+
+.connectionInfo {
+ border-radius: 0.75rem;
+ background-color: var(--background-secondary-alt);
+ padding: 1rem;
+}
+
+.connectionHeader {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 0.5rem;
+ margin-bottom: 0.5rem;
+}
+
+.connectionStatusInfo {
+ flex: 1;
+}
+
+.connectionTitle {
+ font-weight: 500;
+ color: var(--text-primary);
+}
+
+.connectionSubtitle {
+ font-size: 0.875rem;
+ color: var(--text-primary-muted);
+}
+
+.connectionStatusDot {
+ width: 0.75rem;
+ height: 0.75rem;
+ border-radius: 624.9375rem;
+ background-color: var(--status-online);
+ flex-shrink: 0;
+}
+
+.statsGrid {
+ display: grid;
+ grid-template-columns: 1fr;
+ gap: 0.5rem;
+ margin-top: 0.5rem;
+ color: var(--text-primary-muted);
+}
+
+.statRow {
+ display: grid;
+ grid-template-columns: auto 1fr;
+ align-items: center;
+ gap: 0.75rem;
+}
+
+.statLabel {
+ white-space: nowrap;
+ font-size: 0.75rem;
+ color: var(--text-secondary);
+}
+
+.statValue {
+ min-width: 0;
+ text-align: right;
+ font-size: 0.75rem;
+}
+
+.statValuePrimary {
+ font-weight: 500;
+ color: var(--text-primary);
+}
+
+.endpointValue {
+ display: block;
+ font-family: ui-monospace, SFMono-Regular, 'SF Mono', Consolas, 'Liberation Mono', Menlo, monospace;
+ font-size: 0.75rem;
+ font-weight: 600;
+ color: #22c55e;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.connectionIdValue {
+ display: block;
+ font-family: ui-monospace, SFMono-Regular, 'SF Mono', Consolas, 'Liberation Mono', Menlo, monospace;
+ font-size: 0.75rem;
+ color: var(--text-primary);
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.maxWidth {
+ max-width: 100%;
+}
diff --git a/fluxer_app/src/features/voice/components/bottomsheets/VoiceLobbyShared.tsx b/fluxer_app/src/features/voice/components/bottomsheets/VoiceLobbyShared.tsx
new file mode 100644
index 000000000..91c2bb9c3
--- /dev/null
+++ b/fluxer_app/src/features/voice/components/bottomsheets/VoiceLobbyShared.tsx
@@ -0,0 +1,329 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {CAMERA_ON_DESCRIPTOR, SETTINGS_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
+import {
+ CameraOffIcon,
+ CameraOnIcon,
+ DeafenIcon,
+ MicrophoneOffIcon,
+ MicrophoneOnIcon,
+ SettingsIcon,
+ UndeafenIcon,
+} from '@app/features/ui/action_menu/ContextMenuIcons';
+import {Tooltip} from '@app/features/ui/tooltip/Tooltip';
+import styles from '@app/features/voice/components/bottomsheets/VoiceLobbyShared.module.css';
+import {
+ formatMilliseconds,
+ formatPacketLossPercent,
+} from '@app/features/voice/components/voice_connection_status/shared';
+import {getOpenVoiceVideoSettingsLabel} from '@app/features/voice/utils/VoiceMessageDescriptors';
+import {useLingui} from '@lingui/react/macro';
+import {clsx} from 'clsx';
+import type React from 'react';
+
+interface VoiceLobbyControlsProps {
+ 'data-flx': string;
+ muteButtonDataFlx: string;
+ isConnected: boolean;
+ isMuted: boolean;
+ isDeafened: boolean;
+ isCameraOn: boolean;
+ micLocked?: boolean;
+ deafenLocked?: boolean;
+ muteLabel: string;
+ muteAriaLabel?: string;
+ deafenLabel: string;
+ deafenAriaLabel?: string;
+ cameraCapBlocked: boolean;
+ cameraCapBlockedLabel: string;
+ cameraOffLabel: string;
+ onToggleMute: () => void;
+ onToggleDeafen: () => void;
+ onToggleCamera: () => void;
+ onOpenVoiceSettings: () => void;
+}
+
+export function VoiceLobbyControls({
+ 'data-flx': dataFlx,
+ muteButtonDataFlx,
+ isConnected,
+ isMuted,
+ isDeafened,
+ isCameraOn,
+ micLocked,
+ deafenLocked,
+ muteLabel,
+ muteAriaLabel,
+ deafenLabel,
+ deafenAriaLabel,
+ cameraCapBlocked,
+ cameraCapBlockedLabel,
+ cameraOffLabel,
+ onToggleMute,
+ onToggleDeafen,
+ onToggleCamera,
+ onOpenVoiceSettings,
+}: VoiceLobbyControlsProps) {
+ const {i18n} = useLingui();
+ return (
+ <div className={styles.actionButtons} data-flx={`${dataFlx}.action-buttons`}>
+ <button
+ type="button"
+ className={styles.actionButton}
+ onClick={micLocked ? undefined : onToggleMute}
+ disabled={micLocked}
+ aria-label={muteAriaLabel}
+ aria-pressed={isMuted}
+ data-flx={muteButtonDataFlx}
+ >
+ <div
+ className={clsx(styles.iconContainer, isMuted ? styles.iconContainerDanger : styles.iconContainerBrand)}
+ data-flx={`${dataFlx}.icon-container`}
+ >
+ {isMuted ? (
+ <MicrophoneOffIcon className={styles.actionIcon} size={24} data-flx={`${dataFlx}.action-icon`} />
+ ) : (
+ <MicrophoneOnIcon className={styles.actionIcon} size={24} data-flx={`${dataFlx}.action-icon--2`} />
+ )}
+ </div>
+ <span className={styles.actionText} data-flx={`${dataFlx}.action-text`}>
+ {muteLabel}
+ </span>
+ </button>
+ <button
+ type="button"
+ className={styles.actionButton}
+ onClick={deafenLocked ? undefined : onToggleDeafen}
+ disabled={deafenLocked}
+ aria-label={deafenAriaLabel}
+ aria-pressed={isDeafened}
+ data-flx={`${dataFlx}.action-button.toggle-deafen`}
+ >
+ <div
+ className={clsx(styles.iconContainer, isDeafened ? styles.iconContainerDanger : styles.iconContainerTertiary)}
+ data-flx={`${dataFlx}.icon-container--2`}
+ >
+ {isDeafened ? (
+ <DeafenIcon
+ className={styles.actionIconSecondary}
+ size={24}
+ data-flx={`${dataFlx}.action-icon-secondary`}
+ />
+ ) : (
+ <UndeafenIcon
+ className={styles.actionIconSecondary}
+ size={24}
+ data-flx={`${dataFlx}.action-icon-secondary--2`}
+ />
+ )}
+ </div>
+ <span className={styles.actionText} data-flx={`${dataFlx}.action-text--2`}>
+ {deafenLabel}
+ </span>
+ </button>
+ {isConnected &&
+ (() => {
+ const cameraToggleButton = (
+ <button
+ type="button"
+ className={styles.actionButton}
+ onClick={cameraCapBlocked ? undefined : onToggleCamera}
+ disabled={cameraCapBlocked}
+ aria-label={cameraCapBlocked ? cameraCapBlockedLabel : undefined}
+ aria-pressed={isCameraOn}
+ data-flx={`${dataFlx}.action-button.toggle-camera`}
+ >
+ <div
+ className={clsx(
+ styles.iconContainer,
+ isCameraOn ? styles.iconContainerSuccess : styles.iconContainerTertiary,
+ )}
+ data-flx={`${dataFlx}.icon-container--3`}
+ >
+ {isCameraOn ? (
+ <CameraOnIcon className={styles.actionIcon} size={24} data-flx={`${dataFlx}.action-icon--3`} />
+ ) : (
+ <CameraOffIcon
+ className={styles.actionIconSecondary}
+ size={24}
+ data-flx={`${dataFlx}.action-icon-secondary--3`}
+ />
+ )}
+ </div>
+ <span className={styles.actionText} data-flx={`${dataFlx}.action-text--3`}>
+ {isCameraOn ? i18n._(CAMERA_ON_DESCRIPTOR) : cameraOffLabel}
+ </span>
+ </button>
+ );
+ if (!cameraCapBlocked) return cameraToggleButton;
+ return (
+ <Tooltip text={cameraCapBlockedLabel} data-flx={`${dataFlx}.tooltip.camera-cap`}>
+ {cameraToggleButton}
+ </Tooltip>
+ );
+ })()}
+ <button
+ type="button"
+ className={styles.actionButton}
+ onClick={onOpenVoiceSettings}
+ aria-label={getOpenVoiceVideoSettingsLabel(i18n)}
+ data-flx={`${dataFlx}.action-button.open-voice-settings`}
+ >
+ <div
+ className={clsx(styles.iconContainer, styles.iconContainerTertiary)}
+ data-flx={`${dataFlx}.icon-container--4`}
+ >
+ <SettingsIcon
+ className={styles.actionIconSecondary}
+ size={24}
+ data-flx={`${dataFlx}.action-icon-secondary--4`}
+ />
+ </div>
+ <span className={styles.actionText} data-flx={`${dataFlx}.action-text--4`}>
+ {i18n._(SETTINGS_DESCRIPTOR)}
+ </span>
+ </button>
+ </div>
+ );
+}
+
+function Row({
+ label,
+ value,
+ valueClassName,
+ dataFlx,
+}: {
+ label: string;
+ value: React.ReactNode;
+ valueClassName?: string;
+ dataFlx: string;
+}) {
+ return (
+ <div className={styles.statRow} data-flx={`${dataFlx}.row.stat-row`}>
+ <span className={styles.statLabel} data-flx={`${dataFlx}.row.stat-label`}>
+ {label}
+ </span>
+ <div className={clsx(styles.statValue, valueClassName)} data-flx={`${dataFlx}.row.stat-value`}>
+ {value}
+ </div>
+ </div>
+ );
+}
+
+interface VoiceLobbyConnectionStatsProps {
+ 'data-flx': string;
+ title: string;
+ subtitle: string;
+ labels: {ping: string; endpoint: string; connectionId: string; packetLoss: string; jitter: string};
+ currentLatency: number | null;
+ voiceServerEndpoint: string | null;
+ connectionId: string | null;
+ audioPacketLoss: number | undefined;
+ jitter: number | undefined;
+}
+
+export function VoiceLobbyConnectionStats({
+ 'data-flx': dataFlx,
+ title,
+ subtitle,
+ labels,
+ currentLatency,
+ voiceServerEndpoint,
+ connectionId,
+ audioPacketLoss,
+ jitter,
+}: VoiceLobbyConnectionStatsProps) {
+ const {i18n} = useLingui();
+ const prettyEndpoint = (() => {
+ if (!voiceServerEndpoint) return null;
+ try {
+ const url = new URL(voiceServerEndpoint);
+ return url.port ? `${url.hostname}:${url.port}` : url.hostname;
+ } catch {
+ return voiceServerEndpoint;
+ }
+ })();
+ return (
+ <div className={styles.connectionInfo} data-flx={`${dataFlx}.connection-info`}>
+ <div className={styles.connectionHeader} data-flx={`${dataFlx}.connection-header`}>
+ <div className={styles.connectionStatusInfo} data-flx={`${dataFlx}.connection-status-info`}>
+ <div className={styles.connectionTitle} data-flx={`${dataFlx}.connection-title`}>
+ {title}
+ </div>
+ <div className={styles.connectionSubtitle} data-flx={`${dataFlx}.connection-subtitle`}>
+ {subtitle}
+ </div>
+ </div>
+ <div className={styles.connectionStatusDot} aria-hidden="true" data-flx={`${dataFlx}.connection-status-dot`} />
+ </div>
+ <div className={styles.statsGrid} data-flx={`${dataFlx}.stats-grid`}>
+ {currentLatency !== null && (
+ <Row
+ dataFlx={dataFlx}
+ label={labels.ping}
+ value={
+ <span className={styles.statValuePrimary} data-flx={`${dataFlx}.stat-value-primary`}>
+ {formatMilliseconds(currentLatency, i18n.locale)}
+ </span>
+ }
+ data-flx={`${dataFlx}.row`}
+ />
+ )}
+ {prettyEndpoint && (
+ <Row
+ dataFlx={dataFlx}
+ label={labels.endpoint}
+ value={
+ <Tooltip text={prettyEndpoint} data-flx={`${dataFlx}.tooltip`}>
+ <span className={styles.endpointValue} data-flx={`${dataFlx}.endpoint-value`}>
+ {prettyEndpoint}
+ </span>
+ </Tooltip>
+ }
+ valueClassName={styles.maxWidth}
+ data-flx={`${dataFlx}.row--2`}
+ />
+ )}
+ {connectionId && (
+ <Row
+ dataFlx={dataFlx}
+ label={labels.connectionId}
+ value={
+ <Tooltip text={connectionId} data-flx={`${dataFlx}.tooltip--2`}>
+ <span className={styles.connectionIdValue} data-flx={`${dataFlx}.connection-id-value`}>
+ {connectionId}
+ </span>
+ </Tooltip>
+ }
+ valueClassName={styles.maxWidth}
+ data-flx={`${dataFlx}.row--3`}
+ />
+ )}
+ {typeof audioPacketLoss === 'number' && audioPacketLoss > 0 && (
+ <Row
+ dataFlx={dataFlx}
+ label={labels.packetLoss}
+ value={
+ <span className={styles.statValuePrimary} data-flx={`${dataFlx}.stat-value-primary--2`}>
+ {formatPacketLossPercent(audioPacketLoss, i18n.locale)}
+ </span>
+ }
+ data-flx={`${dataFlx}.row--4`}
+ />
+ )}
+ {typeof jitter === 'number' && jitter > 0 && (
+ <Row
+ dataFlx={dataFlx}
+ label={labels.jitter}
+ value={
+ <span className={styles.statValuePrimary} data-flx={`${dataFlx}.stat-value-primary--3`}>
+ {formatMilliseconds(jitter, i18n.locale)}
+ </span>
+ }
+ data-flx={`${dataFlx}.row--5`}
+ />
+ )}
+ </div>
+ </div>
+ );
+}
diff --git a/fluxer_app/src/features/voice/components/media_player/components/MediaVerticalVolumeControl.tsx b/fluxer_app/src/features/voice/components/media_player/components/MediaVerticalVolumeControl.tsx
index 7aafedead..cb3a49216 100644
--- a/fluxer_app/src/features/voice/components/media_player/components/MediaVerticalVolumeControl.tsx
+++ b/fluxer_app/src/features/voice/components/media_player/components/MediaVerticalVolumeControl.tsx
@@ -1,17 +1,17 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {VOLUME_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
-import {getExtendedDocument} from '@app/features/platform/types/Browser';
+import {getFullscreenElement} from '@app/features/platform/utils/FullscreenMediaUtils';
import {remFromPx} from '@app/features/theme/layout/RemFromPx';
import {Slider} from '@app/features/ui/components/Slider';
import FocusRing from '@app/features/ui/focus_ring/FocusRing';
import {usePortalHost} from '@app/features/ui/overlay/PortalHostContext';
import {appZoomLayoutPx} from '@app/features/ui/utils/AppZoomUtils';
import {formatRoundedPercentage} from '@app/features/ui/utils/PercentageFormatting';
+import {getVolumeIcon} from '@app/features/voice/components/media_player/components/MediaVolumeControl';
import styles from '@app/features/voice/components/media_player/MediaVerticalVolumeControl.module.css';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
-import {SpeakerHighIcon, SpeakerLowIcon, SpeakerNoneIcon, SpeakerXIcon} from '@phosphor-icons/react';
import {clsx} from 'clsx';
import type React from 'react';
import {useCallback, useEffect, useLayoutEffect, useRef, useState} from 'react';
@@ -32,17 +32,6 @@ const VOLUME_CONTROL_DESCRIPTOR = msg({
comment: 'Aria label for the volume control container in the media player.',
});
-function getActiveFullscreenElement(): Element | null {
- const doc = getExtendedDocument();
- return (
- document.fullscreenElement ||
- doc.webkitFullscreenElement ||
- doc.mozFullScreenElement ||
- doc.msFullscreenElement ||
- null
- );
-}
-
interface MediaVerticalVolumeControlProps {
volume: number;
isMuted: boolean;
@@ -55,19 +44,6 @@ interface MediaVerticalVolumeControlProps {
ariaLabel?: string;
}
-function getVolumeIcon(volume: number, isMuted: boolean) {
- if (isMuted || volume === 0) {
- return SpeakerXIcon;
- }
- if (volume < 0.33) {
- return SpeakerNoneIcon;
- }
- if (volume < 0.67) {
- return SpeakerLowIcon;
- }
- return SpeakerHighIcon;
-}
-
const POPOUT_GAP = 8;
export function MediaVerticalVolumeControl({
@@ -98,7 +74,7 @@ export function MediaVerticalVolumeControl({
setPortalTarget(portalHost);
return;
}
- const fsElement = getActiveFullscreenElement();
+ const fsElement = getFullscreenElement();
const button = buttonRef.current;
if (fsElement && button && fsElement.contains(button)) {
setPortalTarget(fsElement);
diff --git a/fluxer_app/src/features/voice/components/media_player/components/MediaVolumeControl.tsx b/fluxer_app/src/features/voice/components/media_player/components/MediaVolumeControl.tsx
index 054a434f7..7ae96e687 100644
--- a/fluxer_app/src/features/voice/components/media_player/components/MediaVolumeControl.tsx
+++ b/fluxer_app/src/features/voice/components/media_player/components/MediaVolumeControl.tsx
@@ -43,7 +43,7 @@ interface MediaVolumeControlProps {
className?: string;
}
-function getVolumeIcon(volume: number, isMuted: boolean) {
+export function getVolumeIcon(volume: number, isMuted: boolean) {
if (isMuted || volume === 0) {
return SpeakerXIcon;
}
diff --git a/fluxer_app/src/features/voice/components/useStatsForNerds.ts b/fluxer_app/src/features/voice/components/useStatsForNerds.ts
index 34cb549c0..e08ed8e15 100644
--- a/fluxer_app/src/features/voice/components/useStatsForNerds.ts
+++ b/fluxer_app/src/features/voice/components/useStatsForNerds.ts
@@ -3,7 +3,6 @@
import assert from 'node:assert/strict';
import Config from '@app/features/app/config/Config';
import {getCachedDesktopTroubleshootingSettings} from '@app/features/devtools/utils/DesktopTroubleshootingUtils';
-import type {AppMetricsSnapshot, DesktopInfo, GpuInfo} from '@app/features/platform/types/Electron';
import {getElectronAPI} from '@app/features/ui/utils/NativeUtils';
import MediaEngine, {useMediaEngineVersion} from '@app/features/voice/engine/MediaEngineFacade';
import ScreenShareCodecNegotiation, {
@@ -20,6 +19,7 @@ import {
collectScreenShareAudioPublicationDiagnostics,
type StatsForNerdsData,
} from '@app/features/voice/utils/VoiceStatsForNerdsPresenter';
+import type {AppMetricsSnapshot, DesktopInfo, GpuInfo} from '@app/types/electron.d';
import {useEffect, useRef, useState} from 'react';
export type {StatsForNerdsData} from '@app/features/voice/utils/VoiceStatsForNerdsPresenter';
diff --git a/fluxer_app/src/features/voice/components/useVoiceCallAppFullscreen.ts b/fluxer_app/src/features/voice/components/useVoiceCallAppFullscreen.ts
index 28a5326c9..8aa561557 100644
--- a/fluxer_app/src/features/voice/components/useVoiceCallAppFullscreen.ts
+++ b/fluxer_app/src/features/voice/components/useVoiceCallAppFullscreen.ts
@@ -7,6 +7,7 @@ import {
supportsWebkitRequestFullscreen,
} from '@app/features/platform/types/Browser';
import {Logger} from '@app/features/platform/utils/AppLogger';
+import {getFullscreenElement} from '@app/features/platform/utils/FullscreenMediaUtils';
import {setActivePortalHost} from '@app/features/ui/overlay/PortalHostContext';
import Modal from '@app/features/ui/state/Modal';
import VoiceCallFullscreen from '@app/features/voice/state/VoiceCallFullscreen';
@@ -28,17 +29,6 @@ interface UseVoiceCallAppFullscreenReturn {
toggleFullscreen: () => Promise<void>;
}
-function getVoiceCallFullscreenElement(): Element | null {
- const doc = getExtendedDocument();
- return (
- document.fullscreenElement ||
- doc.webkitFullscreenElement ||
- doc.mozFullScreenElement ||
- doc.msFullscreenElement ||
- null
- );
-}
-
function supportsFullscreenAPI(): boolean {
const doc = getExtendedDocument();
return !!(
@@ -97,7 +87,7 @@ export function useVoiceCallAppFullscreen(options: UseVoiceCallAppFullscreenOpti
const [supportsFullscreen] = useState(() => supportsFullscreenAPI());
const initiatedFullscreenRef = useRef(false);
const handleFullscreenChange = useCallback(() => {
- const fullscreenElement = getVoiceCallFullscreenElement();
+ const fullscreenElement = getFullscreenElement();
if (!fullscreenElement) {
setIsFullscreen(false);
initiatedFullscreenRef.current = false;
@@ -128,7 +118,7 @@ export function useVoiceCallAppFullscreen(options: UseVoiceCallAppFullscreenOpti
if (!supportsFullscreenAPI()) return;
const container = containerRef.current;
if (!container) return;
- const fullscreenElement = getVoiceCallFullscreenElement();
+ const fullscreenElement = getFullscreenElement();
if (fullscreenElement === container && initiatedFullscreenRef.current) {
setIsFullscreen(true);
return;
@@ -145,7 +135,7 @@ export function useVoiceCallAppFullscreen(options: UseVoiceCallAppFullscreenOpti
}
}, [containerRef]);
const exitFullscreen = useCallback(async () => {
- const fullscreenElement = getVoiceCallFullscreenElement();
+ const fullscreenElement = getFullscreenElement();
if (!fullscreenElement) {
setIsFullscreen(false);
return;
@@ -167,7 +157,7 @@ export function useVoiceCallAppFullscreen(options: UseVoiceCallAppFullscreenOpti
}, [enterFullscreen, exitFullscreen, isFullscreen]);
useEffect(() => {
return () => {
- if (!initiatedFullscreenRef.current || getVoiceCallFullscreenElement() !== containerRef.current) {
+ if (!initiatedFullscreenRef.current || getFullscreenElement() !== containerRef.current) {
return;
}
void exitFullscreen();
@@ -219,7 +209,7 @@ export function useVoiceCallFullscreenViewState({
const closeFullscreenView = useCallback(() => {
const wasActive = VoiceCallFullscreen.isScopeActive(scopeKey);
VoiceCallFullscreen.close(scopeKey);
- if (!wasActive || !getVoiceCallFullscreenElement()) return;
+ if (!wasActive || !getFullscreenElement()) return;
void exitFullscreenAPI().catch((error) => {
logger.error('Failed to exit voice call fullscreen view:', error);
});
@@ -242,7 +232,7 @@ export function useVoiceCallFullscreenViewState({
useEffect(() => {
if (!showFullscreenView) return;
const handleFullscreenChange = () => {
- if (getVoiceCallFullscreenElement()) return;
+ if (getFullscreenElement()) return;
VoiceCallFullscreen.close(scopeKey);
};
document.addEventListener('fullscreenchange', handleFullscreenChange);
diff --git a/fluxer_app/src/features/voice/diagnostics/VoiceDebugStatsHtml.tsx b/fluxer_app/src/features/voice/diagnostics/VoiceDebugStatsHtml.tsx
index 556a271fa..93369be87 100644
--- a/fluxer_app/src/features/voice/diagnostics/VoiceDebugStatsHtml.tsx
+++ b/fluxer_app/src/features/voice/diagnostics/VoiceDebugStatsHtml.tsx
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import type {AppMetricsSnapshot} from '@app/features/platform/types/Electron';
import type {StatsForNerdsData} from '@app/features/voice/utils/VoiceStatsForNerdsPresenter';
+import type {AppMetricsSnapshot} from '@app/types/electron.d';
import type {VoiceEngineV2PerTrackStats} from '@fluxer/voice_engine_v2';
import {renderToStaticMarkup} from 'react-dom/server';
diff --git a/fluxer_app/src/features/voice/engine/PublicationSubscriptionManager.ts b/fluxer_app/src/features/voice/engine/PublicationSubscriptionManager.ts
new file mode 100644
index 000000000..777023079
--- /dev/null
+++ b/fluxer_app/src/features/voice/engine/PublicationSubscriptionManager.ts
@@ -0,0 +1,171 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import type {Logger} from '@app/features/platform/utils/AppLogger';
+import {Store} from '@app/features/voice/engine/Store';
+import {
+ selectVoiceMediaGraphSubscriptionEntry,
+ type VoiceMediaGraphSubscriptionCommand,
+ type VoiceMediaGraphSubscriptionEntry,
+ type VoiceMediaGraphSubscriptionEvent,
+ type VoiceMediaGraphVideoQuality,
+} from '@app/features/voice/engine/VoiceMediaGraph';
+import {voiceMediaGraphStore} from '@app/features/voice/engine/VoiceMediaGraphStore';
+import type {VoiceTrackSource} from '@app/features/voice/engine/VoiceTrackSource';
+import {
+ getScreenShareWatchFailureForPublicationOperation,
+ type ScreenSharePublicationOperation,
+ ScreenShareWatchErrorCode,
+} from '@app/features/voice/state/ScreenShareWatchFailures';
+import type {RemoteTrackPublication, Room} from 'livekit-client';
+
+export abstract class PublicationSubscriptionManager extends Store {
+ protected room: Room | null = null;
+ private observers = new Map<string, IntersectionObserver>();
+ private readonly intersectionOptions: IntersectionObserverInit = {
+ root: null,
+ rootMargin: '50px',
+ threshold: [0, 0.1],
+ };
+ protected abstract readonly source: VoiceTrackSource;
+ protected abstract readonly logger: Logger;
+ protected abstract readonly publicationCommandFailedMessage: string;
+
+ protected abstract hasPublicationForIdentity(participantIdentity: string): boolean;
+
+ protected abstract applyCommand(command: VoiceMediaGraphSubscriptionCommand): void;
+
+ cleanup(): void {
+ this.transition({type: 'subscription.cleanup', source: this.source});
+ }
+
+ protected runPublicationOperation(
+ participantIdentity: string,
+ publication: RemoteTrackPublication,
+ operation: ScreenSharePublicationOperation,
+ apply: () => void,
+ ): boolean {
+ try {
+ apply();
+ return true;
+ } catch (error) {
+ this.logger.error(this.publicationCommandFailedMessage, {
+ participantIdentity,
+ trackSid: publication.trackSid,
+ operation,
+ error,
+ });
+ const failure = getScreenShareWatchFailureForPublicationOperation(operation);
+ this.reportCommandFailed(participantIdentity, failure.code, failure.reason);
+ return false;
+ }
+ }
+
+ protected reportActualChanged(
+ participantIdentity: string,
+ changes: {
+ subscribed?: boolean | null;
+ enabled?: boolean | null;
+ quality?: VoiceMediaGraphVideoQuality | null;
+ trackSid?: string | null;
+ },
+ ): void {
+ voiceMediaGraphStore.transition({
+ type: 'subscription.actualChanged',
+ participantIdentity,
+ source: this.source,
+ at: voiceMediaGraphStore.nowMs(),
+ ...changes,
+ });
+ }
+
+ protected reportCommandFailed(participantIdentity: string, code: number, reason: string): void {
+ voiceMediaGraphStore.transition({
+ type: 'subscription.commandFailed',
+ participantIdentity,
+ source: this.source,
+ at: voiceMediaGraphStore.nowMs(),
+ code,
+ reason,
+ });
+ }
+
+ protected reportPublicationObserved(participantIdentity: string, trackSid: string | null): void {
+ voiceMediaGraphStore.transition({
+ type: 'publication.observed',
+ participantIdentity,
+ source: this.source,
+ trackSid,
+ at: voiceMediaGraphStore.nowMs(),
+ });
+ }
+
+ private createObserver(participantIdentity: string, element: HTMLElement): IntersectionObserver {
+ const observer = new IntersectionObserver((entries) => {
+ for (const entry of entries) {
+ const isIntersecting = entry.isIntersecting;
+ if (!this.getSubscriptionEntry(participantIdentity)) continue;
+ this.transition({
+ type: 'subscription.intersection',
+ participantIdentity,
+ source: this.source,
+ hasPublication: this.hasPublicationForIdentity(participantIdentity),
+ isIntersecting,
+ });
+ this.logger.debug('Intersection changed', {participantIdentity, isIntersecting});
+ }
+ }, this.intersectionOptions);
+ observer.observe(element);
+ return observer;
+ }
+
+ protected attachObserver(participantIdentity: string, element: HTMLElement): void {
+ try {
+ this.observers.set(participantIdentity, this.createObserver(participantIdentity, element));
+ } catch (error) {
+ this.logger.error('Failed to attach intersection observer', {participantIdentity, error});
+ this.reportCommandFailed(
+ participantIdentity,
+ ScreenShareWatchErrorCode.ObserverAttachFailed,
+ 'observer-attach-failed',
+ );
+ }
+ }
+
+ protected detachObserver(participantIdentity: string): void {
+ const observer = this.observers.get(participantIdentity);
+ this.observers.delete(participantIdentity);
+ if (!observer) return;
+ try {
+ observer.disconnect();
+ } catch (error) {
+ this.logger.error('Failed to detach intersection observer', {participantIdentity, error});
+ this.reportCommandFailed(
+ participantIdentity,
+ ScreenShareWatchErrorCode.ObserverDetachFailed,
+ 'observer-detach-failed',
+ );
+ }
+ }
+
+ protected getSubscriptionEntry(participantIdentity: string): VoiceMediaGraphSubscriptionEntry | null {
+ return selectVoiceMediaGraphSubscriptionEntry(
+ voiceMediaGraphStore.getGraphSnapshot(),
+ participantIdentity,
+ this.source,
+ );
+ }
+
+ applyReconciledCommand(command: VoiceMediaGraphSubscriptionCommand): void {
+ this.applyCommand(command);
+ }
+
+ protected transition(event: VoiceMediaGraphSubscriptionEvent): void {
+ let commands: Array<VoiceMediaGraphSubscriptionCommand> = [];
+ this.update(() => {
+ commands = voiceMediaGraphStore.takeSubscriptionCommands(event);
+ });
+ for (const command of commands) {
+ this.applyCommand(command);
+ }
+ }
+}
diff --git a/fluxer_app/src/features/voice/engine/ScreenShareSubscriptionManager.ts b/fluxer_app/src/features/voice/engine/ScreenShareSubscriptionManager.ts
index 6c8223376..d6bcc8419 100644
--- a/fluxer_app/src/features/voice/engine/ScreenShareSubscriptionManager.ts
+++ b/fluxer_app/src/features/voice/engine/ScreenShareSubscriptionManager.ts
@@ -1,23 +1,15 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {Logger} from '@app/features/platform/utils/AppLogger';
+import {PublicationSubscriptionManager} from '@app/features/voice/engine/PublicationSubscriptionManager';
import ScreenSharePublicationMigration from '@app/features/voice/engine/ScreenSharePublicationMigration';
-import {Store} from '@app/features/voice/engine/Store';
-import {
- selectVoiceMediaGraphSubscriptionEntry,
- type VoiceMediaGraphSubscriptionCommand,
- type VoiceMediaGraphSubscriptionContext,
- type VoiceMediaGraphSubscriptionEntry,
- type VoiceMediaGraphSubscriptionEvent,
- type VoiceMediaGraphVideoQuality,
+import type {
+ VoiceMediaGraphSubscriptionCommand,
+ VoiceMediaGraphSubscriptionContext,
+ VoiceMediaGraphVideoQuality,
} from '@app/features/voice/engine/VoiceMediaGraph';
import {voiceMediaGraphStore} from '@app/features/voice/engine/VoiceMediaGraphStore';
import {asVoiceTrackSource, VoiceTrackSource} from '@app/features/voice/engine/VoiceTrackSource';
-import {
- getScreenShareWatchFailureForPublicationOperation,
- type ScreenSharePublicationOperation,
- ScreenShareWatchErrorCode,
-} from '@app/features/voice/state/ScreenShareWatchFailures';
import {
clearScreenShareViewerDemand,
resolveScreenSharePublicationVideoRequest,
@@ -41,18 +33,15 @@ const graphQualityMap = new Map<VideoQuality, VoiceMediaGraphVideoQuality>(
]),
);
-export class ScreenShareSubscriptionManager extends Store {
- private room: Room | null = null;
- private observers = new Map<string, IntersectionObserver>();
+export class ScreenShareSubscriptionManager extends PublicationSubscriptionManager {
+ protected readonly source = VoiceTrackSource.ScreenShare;
+ protected readonly logger = logger;
+ protected readonly publicationCommandFailedMessage = 'Screen share publication command failed';
+
private reattachPublicationTargets = new Map<string, RemoteTrackPublication>();
private resubscribePulseTokens = new Map<string, number>();
private resubscribePulseSequence = 0;
private pendingResubscribePulses = new Set<string>();
- private readonly intersectionOptions: IntersectionObserverInit = {
- root: null,
- rootMargin: '50px',
- threshold: [0, 0.1],
- };
setRoom(room: Room | null): void {
clearScreenShareViewerDemand();
@@ -61,10 +50,6 @@ export class ScreenShareSubscriptionManager extends Store {
});
}
- cleanup(): void {
- this.transition({type: 'subscription.cleanup', source: VoiceTrackSource.ScreenShare});
- }
-
subscribeToParticipant(
participantIdentity: string,
element: HTMLElement | null,
@@ -119,7 +104,7 @@ export class ScreenShareSubscriptionManager extends Store {
type: 'subscription.setContext',
participantIdentity,
source: VoiceTrackSource.ScreenShare,
- hasPublication: this.hasScreenSharePublicationForIdentity(participantIdentity),
+ hasPublication: this.hasPublicationForIdentity(participantIdentity),
context,
});
}
@@ -145,7 +130,7 @@ export class ScreenShareSubscriptionManager extends Store {
type: 'subscription.reattachAfterPublish',
participantIdentity,
source: VoiceTrackSource.ScreenShare,
- hasPublication: publication != null || this.hasScreenSharePublicationForIdentity(participantIdentity),
+ hasPublication: publication != null || this.hasPublicationForIdentity(participantIdentity),
forceResubscribe: true,
});
} finally {
@@ -171,7 +156,7 @@ export class ScreenShareSubscriptionManager extends Store {
return this.findScreenSharePublication(this.getParticipant(participantIdentity));
}
- private hasScreenSharePublicationForIdentity(participantIdentity: string): boolean {
+ protected hasPublicationForIdentity(participantIdentity: string): boolean {
return this.findScreenSharePublicationForIdentity(participantIdentity) != null;
}
@@ -226,67 +211,6 @@ export class ScreenShareSubscriptionManager extends Store {
return this.getSubscriptionEntry(participantIdentity)?.subscribed ?? false;
}
- private runPublicationOperation(
- participantIdentity: string,
- publication: RemoteTrackPublication,
- operation: ScreenSharePublicationOperation,
- apply: () => void,
- ): boolean {
- try {
- apply();
- return true;
- } catch (error) {
- logger.error('Screen share publication command failed', {
- participantIdentity,
- trackSid: publication.trackSid,
- operation,
- error,
- });
- const failure = getScreenShareWatchFailureForPublicationOperation(operation);
- this.reportCommandFailed(participantIdentity, failure.code, failure.reason);
- return false;
- }
- }
-
- private reportActualChanged(
- participantIdentity: string,
- changes: {
- subscribed?: boolean | null;
- enabled?: boolean | null;
- quality?: VoiceMediaGraphVideoQuality | null;
- trackSid?: string | null;
- },
- ): void {
- voiceMediaGraphStore.transition({
- type: 'subscription.actualChanged',
- participantIdentity,
- source: VoiceTrackSource.ScreenShare,
- at: voiceMediaGraphStore.nowMs(),
- ...changes,
- });
- }
-
- private reportCommandFailed(participantIdentity: string, code: number, reason: string): void {
- voiceMediaGraphStore.transition({
- type: 'subscription.commandFailed',
- participantIdentity,
- source: VoiceTrackSource.ScreenShare,
- at: voiceMediaGraphStore.nowMs(),
- code,
- reason,
- });
- }
-
- private reportPublicationObserved(participantIdentity: string, trackSid: string | null): void {
- voiceMediaGraphStore.transition({
- type: 'publication.observed',
- participantIdentity,
- source: VoiceTrackSource.ScreenShare,
- trackSid,
- at: voiceMediaGraphStore.nowMs(),
- });
- }
-
private reportPublicationLost(participantIdentity: string): void {
voiceMediaGraphStore.transition({
type: 'publication.lost',
@@ -313,77 +237,7 @@ export class ScreenShareSubscriptionManager extends Store {
return graphQualityMap.get(request.quality) ?? null;
}
- private createObserver(participantIdentity: string, element: HTMLElement): IntersectionObserver {
- const observer = new IntersectionObserver((entries) => {
- for (const entry of entries) {
- const isIntersecting = entry.isIntersecting;
- if (!this.getSubscriptionEntry(participantIdentity)) continue;
- this.transition({
- type: 'subscription.intersection',
- participantIdentity,
- source: VoiceTrackSource.ScreenShare,
- hasPublication: this.hasScreenSharePublicationForIdentity(participantIdentity),
- isIntersecting,
- });
- logger.debug('Intersection changed', {participantIdentity, isIntersecting});
- }
- }, this.intersectionOptions);
- observer.observe(element);
- return observer;
- }
-
- private attachObserver(participantIdentity: string, element: HTMLElement): void {
- try {
- this.observers.set(participantIdentity, this.createObserver(participantIdentity, element));
- } catch (error) {
- logger.error('Failed to attach intersection observer', {participantIdentity, error});
- this.reportCommandFailed(
- participantIdentity,
- ScreenShareWatchErrorCode.ObserverAttachFailed,
- 'observer-attach-failed',
- );
- }
- }
-
- private detachObserver(participantIdentity: string): void {
- const observer = this.observers.get(participantIdentity);
- this.observers.delete(participantIdentity);
- if (!observer) return;
- try {
- observer.disconnect();
- } catch (error) {
- logger.error('Failed to detach intersection observer', {participantIdentity, error});
- this.reportCommandFailed(
- participantIdentity,
- ScreenShareWatchErrorCode.ObserverDetachFailed,
- 'observer-detach-failed',
- );
- }
- }
-
- private getSubscriptionEntry(participantIdentity: string): VoiceMediaGraphSubscriptionEntry | null {
- return selectVoiceMediaGraphSubscriptionEntry(
- voiceMediaGraphStore.getGraphSnapshot(),
- participantIdentity,
- VoiceTrackSource.ScreenShare,
- );
- }
-
- applyReconciledCommand(command: VoiceMediaGraphSubscriptionCommand): void {
- this.applyCommand(command);
- }
-
- private transition(event: VoiceMediaGraphSubscriptionEvent): void {
- let commands: Array<VoiceMediaGraphSubscriptionCommand> = [];
- this.update(() => {
- commands = voiceMediaGraphStore.takeSubscriptionCommands(event);
- });
- for (const command of commands) {
- this.applyCommand(command);
- }
- }
-
- private applyCommand(command: VoiceMediaGraphSubscriptionCommand): void {
+ protected applyCommand(command: VoiceMediaGraphSubscriptionCommand): void {
if (command.source !== VoiceTrackSource.ScreenShare) return;
switch (command.type) {
case 'subscribePublication':
diff --git a/fluxer_app/src/features/voice/engine/VideoSubscriptionManager.ts b/fluxer_app/src/features/voice/engine/VideoSubscriptionManager.ts
index ef3e33188..7f9834237 100644
--- a/fluxer_app/src/features/voice/engine/VideoSubscriptionManager.ts
+++ b/fluxer_app/src/features/voice/engine/VideoSubscriptionManager.ts
@@ -1,21 +1,12 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {Logger} from '@app/features/platform/utils/AppLogger';
-import {Store} from '@app/features/voice/engine/Store';
-import {
- selectVoiceMediaGraphSubscriptionEntry,
- type VoiceMediaGraphSubscriptionCommand,
- type VoiceMediaGraphSubscriptionEntry,
- type VoiceMediaGraphSubscriptionEvent,
- type VoiceMediaGraphVideoQuality,
+import {PublicationSubscriptionManager} from '@app/features/voice/engine/PublicationSubscriptionManager';
+import type {
+ VoiceMediaGraphSubscriptionCommand,
+ VoiceMediaGraphVideoQuality,
} from '@app/features/voice/engine/VoiceMediaGraph';
-import {voiceMediaGraphStore} from '@app/features/voice/engine/VoiceMediaGraphStore';
import {asVoiceTrackSource, VoiceTrackSource} from '@app/features/voice/engine/VoiceTrackSource';
-import {
- getScreenShareWatchFailureForPublicationOperation,
- type ScreenSharePublicationOperation,
- ScreenShareWatchErrorCode,
-} from '@app/features/voice/state/ScreenShareWatchFailures';
import type {RemoteParticipant, RemoteTrackPublication, Room} from 'livekit-client';
import {VideoQuality} from 'livekit-client';
@@ -27,14 +18,10 @@ const qualityMap: Record<VoiceMediaGraphVideoQuality, VideoQuality> = {
high: VideoQuality.HIGH,
};
-export class VideoSubscriptionManager extends Store {
- private room: Room | null = null;
- private observers = new Map<string, IntersectionObserver>();
- private readonly intersectionOptions: IntersectionObserverInit = {
- root: null,
- rootMargin: '50px',
- threshold: [0, 0.1],
- };
+export class VideoSubscriptionManager extends PublicationSubscriptionManager {
+ protected readonly source = VoiceTrackSource.Camera;
+ protected readonly logger = logger;
+ protected readonly publicationCommandFailedMessage = 'Video publication command failed';
setRoom(room: Room | null): void {
this.update(() => {
@@ -42,10 +29,6 @@ export class VideoSubscriptionManager extends Store {
});
}
- cleanup(): void {
- this.transition({type: 'subscription.cleanup', source: VoiceTrackSource.Camera});
- }
-
subscribeToParticipant(
participantIdentity: string,
element: HTMLElement | null,
@@ -101,7 +84,7 @@ export class VideoSubscriptionManager extends Store {
type: 'subscription.setEnabled',
participantIdentity,
source: VoiceTrackSource.Camera,
- hasPublication: this.hasCameraPublicationForIdentity(participantIdentity),
+ hasPublication: this.hasPublicationForIdentity(participantIdentity),
enabled,
});
}
@@ -120,7 +103,7 @@ export class VideoSubscriptionManager extends Store {
type: 'subscription.setQuality',
participantIdentity,
source: VoiceTrackSource.Camera,
- hasPublication: this.hasCameraPublicationForIdentity(participantIdentity),
+ hasPublication: this.hasPublicationForIdentity(participantIdentity),
quality,
});
}
@@ -139,71 +122,10 @@ export class VideoSubscriptionManager extends Store {
return this.findCameraPublication(this.room?.remoteParticipants.get(participantIdentity) ?? null);
}
- private hasCameraPublicationForIdentity(participantIdentity: string): boolean {
+ protected hasPublicationForIdentity(participantIdentity: string): boolean {
return this.findCameraPublicationForIdentity(participantIdentity) != null;
}
- private runPublicationOperation(
- participantIdentity: string,
- publication: RemoteTrackPublication,
- operation: ScreenSharePublicationOperation,
- apply: () => void,
- ): boolean {
- try {
- apply();
- return true;
- } catch (error) {
- logger.error('Video publication command failed', {
- participantIdentity,
- trackSid: publication.trackSid,
- operation,
- error,
- });
- const failure = getScreenShareWatchFailureForPublicationOperation(operation);
- this.reportCommandFailed(participantIdentity, failure.code, failure.reason);
- return false;
- }
- }
-
- private reportActualChanged(
- participantIdentity: string,
- changes: {
- subscribed?: boolean | null;
- enabled?: boolean | null;
- quality?: VoiceMediaGraphVideoQuality | null;
- trackSid?: string | null;
- },
- ): void {
- voiceMediaGraphStore.transition({
- type: 'subscription.actualChanged',
- participantIdentity,
- source: VoiceTrackSource.Camera,
- at: voiceMediaGraphStore.nowMs(),
- ...changes,
- });
- }
-
- private reportCommandFailed(participantIdentity: string, code: number, reason: string): void {
- voiceMediaGraphStore.transition({
- type: 'subscription.commandFailed',
- participantIdentity,
- source: VoiceTrackSource.Camera,
- at: voiceMediaGraphStore.nowMs(),
- code,
- reason,
- });
- }
-
- private reportPublicationObserved(participantIdentity: string, trackSid: string | null): void {
- voiceMediaGraphStore.transition({
- type: 'publication.observed',
- participantIdentity,
- source: VoiceTrackSource.Camera,
- trackSid,
- at: voiceMediaGraphStore.nowMs(),
- });
- }
-
private applyQuality(
participantIdentity: string,
publication: RemoteTrackPublication,
@@ -214,77 +136,7 @@ export class VideoSubscriptionManager extends Store {
});
}
- private createObserver(participantIdentity: string, element: HTMLElement): IntersectionObserver {
- const observer = new IntersectionObserver((entries) => {
- for (const entry of entries) {
- const isIntersecting = entry.isIntersecting;
- if (!this.getSubscriptionEntry(participantIdentity)) continue;
- this.transition({
- type: 'subscription.intersection',
- participantIdentity,
- source: VoiceTrackSource.Camera,
- hasPublication: this.hasCameraPublicationForIdentity(participantIdentity),
- isIntersecting,
- });
- logger.debug('Intersection changed', {participantIdentity, isIntersecting});
- }
- }, this.intersectionOptions);
- observer.observe(element);
- return observer;
- }
-
- private attachObserver(participantIdentity: string, element: HTMLElement): void {
- try {
- this.observers.set(participantIdentity, this.createObserver(participantIdentity, element));
- } catch (error) {
- logger.error('Failed to attach intersection observer', {participantIdentity, error});
- this.reportCommandFailed(
- participantIdentity,
- ScreenShareWatchErrorCode.ObserverAttachFailed,
- 'observer-attach-failed',
- );
- }
- }
-
- private detachObserver(participantIdentity: string): void {
- const observer = this.observers.get(participantIdentity);
- this.observers.delete(participantIdentity);
- if (!observer) return;
- try {
- observer.disconnect();
- } catch (error) {
- logger.error('Failed to detach intersection observer', {participantIdentity, error});
- this.reportCommandFailed(
- participantIdentity,
- ScreenShareWatchErrorCode.ObserverDetachFailed,
- 'observer-detach-failed',
- );
- }
- }
-
- private getSubscriptionEntry(participantIdentity: string): VoiceMediaGraphSubscriptionEntry | null {
- return selectVoiceMediaGraphSubscriptionEntry(
- voiceMediaGraphStore.getGraphSnapshot(),
- participantIdentity,
- VoiceTrackSource.Camera,
- );
- }
-
- applyReconciledCommand(command: VoiceMediaGraphSubscriptionCommand): void {
- this.applyCommand(command);
- }
-
- private transition(event: VoiceMediaGraphSubscriptionEvent): void {
- let commands: Array<VoiceMediaGraphSubscriptionCommand> = [];
- this.update(() => {
- commands = voiceMediaGraphStore.takeSubscriptionCommands(event);
- });
- for (const command of commands) {
- this.applyCommand(command);
- }
- }
-
- private applyCommand(command: VoiceMediaGraphSubscriptionCommand): void {
+ protected applyCommand(command: VoiceMediaGraphSubscriptionCommand): void {
if (command.source !== VoiceTrackSource.Camera) return;
switch (command.type) {
case 'subscribePublication':
diff --git a/fluxer_app/src/features/voice/engine/v2/VoiceEngineV2AppSystemPermissionAdapter.ts b/fluxer_app/src/features/voice/engine/v2/VoiceEngineV2AppSystemPermissionAdapter.ts
index 65c651ac8..5788a7428 100644
--- a/fluxer_app/src/features/voice/engine/v2/VoiceEngineV2AppSystemPermissionAdapter.ts
+++ b/fluxer_app/src/features/voice/engine/v2/VoiceEngineV2AppSystemPermissionAdapter.ts
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import type {MediaAccessStatus, MediaAccessType} from '@app/features/platform/types/Electron';
import {getElectronAPI} from '@app/features/ui/utils/NativeUtils';
+import type {MediaAccessStatus, MediaAccessType} from '@app/types/electron.d';
import {
createVoiceEngineV2PermissionResult,
type PermissionPort,
diff --git a/fluxer_app/src/features/voice/engine/voice_screen_share_manager/shared.ts b/fluxer_app/src/features/voice/engine/voice_screen_share_manager/shared.ts
index 31b29647a..42908244d 100644
--- a/fluxer_app/src/features/voice/engine/voice_screen_share_manager/shared.ts
+++ b/fluxer_app/src/features/voice/engine/voice_screen_share_manager/shared.ts
@@ -15,6 +15,7 @@ import {
} from '@app/features/voice/utils/CodecCapabilityDetector';
import {loadGpuEncoderReport} from '@app/features/voice/utils/GpuEncoderCapabilities';
import {loadNativeHardwareEncoderCapabilities} from '@app/features/voice/utils/NativeHardwareEncoderCapabilities';
+import {getVideoCodecFromMimeType} from '@app/features/voice/utils/ScreenShareCodecDiagnostics';
import {
buildScreenShareSenderParameters,
classifyScreenShareLimit,
@@ -552,18 +553,6 @@ function codecMatchesTarget(mimeType: string | undefined, codec: VideoCodec | un
return lower === `video/${codec}`;
}
-function getVideoCodecFromMimeType(mimeType: string | undefined): VideoCodec | null {
- const lower = mimeType?.toLowerCase();
- if (!lower?.startsWith('video/')) return null;
- const codec = lower.slice('video/'.length);
- if (codec === 'av1' || codec === 'av1x') return 'av1';
- if (codec === 'h265' || codec === 'hevc') return 'h265';
- if (codec === 'h264') return 'h264';
- if (codec === 'vp9') return 'vp9';
- if (codec === 'vp8') return 'vp8';
- return null;
-}
-
function finiteNumber(value: unknown): number | null {
return typeof value === 'number' && Number.isFinite(value) ? value : null;
}
diff --git a/fluxer_app/src/features/voice/utils/ScreenShareCodecDiagnostics.ts b/fluxer_app/src/features/voice/utils/ScreenShareCodecDiagnostics.ts
index bce7fedef..6c4edf0e3 100644
--- a/fluxer_app/src/features/voice/utils/ScreenShareCodecDiagnostics.ts
+++ b/fluxer_app/src/features/voice/utils/ScreenShareCodecDiagnostics.ts
@@ -90,7 +90,7 @@ function getCodecLabel(mimeType: string | undefined): string | null {
return mimeType.replace(/^video\//i, '').toUpperCase();
}
-function getVideoCodecFromMimeType(mimeType: string | undefined): VideoCodec | null {
+export function getVideoCodecFromMimeType(mimeType: string | undefined): VideoCodec | null {
const lower = mimeType?.toLowerCase();
if (!lower?.startsWith('video/')) return null;
const codec = lower.slice('video/'.length);
diff --git a/fluxer_app/src/features/voice/utils/VoiceStatsForNerdsPresenter.ts b/fluxer_app/src/features/voice/utils/VoiceStatsForNerdsPresenter.ts
index 680e6cb75..f644d145f 100644
--- a/fluxer_app/src/features/voice/utils/VoiceStatsForNerdsPresenter.ts
+++ b/fluxer_app/src/features/voice/utils/VoiceStatsForNerdsPresenter.ts
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import type {AppMetricsSnapshot, DesktopInfo, GpuInfo} from '@app/features/platform/types/Electron';
import {
isScreenShareAudioPublicationLike,
type VoiceTrackPublicationSourceLike,
VoiceTrackSource,
} from '@app/features/voice/engine/VoiceTrackSource';
import type {VoiceNoiseSuppressionBackend} from '@app/features/voice/utils/noise_suppression/NoiseSuppressionBackends';
+import type {AppMetricsSnapshot, DesktopInfo, GpuInfo} from '@app/types/electron.d';
import {
classifyVoiceEngineV2TrackStats,
selectVoiceEngineV2StatsPresentationProjection,
diff --git a/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectCustomFrameSource.ts b/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectCustomFrameSource.ts
index a46f2f940..2f3db7d06 100644
--- a/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectCustomFrameSource.ts
+++ b/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectCustomFrameSource.ts
@@ -476,7 +476,7 @@ function closeFrameImages(images: ReadonlyArray<WebCameraEffectCustomFrameImage>
return failures;
}
-function throwCleanupFailures(failures: ReadonlyArray<unknown>, message: string): void {
+export function throwCleanupFailures(failures: ReadonlyArray<unknown>, message: string): void {
if (failures.length === 0) return;
if (failures.length === 1) throw failures[0];
throw new AggregateError(failures, message);
@@ -496,7 +496,7 @@ async function settledFailures(promises: ReadonlyArray<Promise<unknown>>): Promi
return failures;
}
-function waitForAbortablePromise<T>(promise: Promise<T>, signal: AbortSignal): Promise<T> {
+export function waitForAbortablePromise<T>(promise: Promise<T>, signal: AbortSignal): Promise<T> {
if (signal.aborted) return Promise.reject(signal.reason);
return new Promise<T>((resolve, reject) => {
const handleAbort = (): void => reject(signal.reason);
diff --git a/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectCustomImage.ts b/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectCustomImage.ts
index c6916f03d..87bb6a190 100644
--- a/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectCustomImage.ts
+++ b/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectCustomImage.ts
@@ -72,7 +72,7 @@ function normalizedMediaType(value: string): string {
return value.split(';', 1)[0]?.trim().toLowerCase() ?? '';
}
-function bytesEqualAt(bytes: Uint8Array, offset: number, expected: ReadonlyArray<number>): boolean {
+export function bytesEqualAt(bytes: Uint8Array, offset: number, expected: ReadonlyArray<number>): boolean {
if (bytes.byteLength < offset + expected.length) return false;
for (let index = 0; index < expected.length; index += 1) {
if (bytes[offset + index] !== expected[index]) return false;
diff --git a/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectVideoFrameSource.ts b/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectVideoFrameSource.ts
index dde4355c9..764c81b9d 100644
--- a/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectVideoFrameSource.ts
+++ b/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectVideoFrameSource.ts
@@ -2,6 +2,11 @@
import {runWithResponseDeadline} from '@app/features/voice/utils/camera-effects/BoundedResponse';
import {
+ throwCleanupFailures,
+ waitForAbortablePromise,
+} from '@app/features/voice/utils/camera-effects/WebCameraEffectCustomFrameSource';
+import {
+ bytesEqualAt,
readWebCameraEffectCustomMediaBlob,
requireWebCameraEffectCustomMediaURL,
WEB_CAMERA_EFFECT_CUSTOM_MEDIA_OPERATION_TIMEOUT_MS,
@@ -264,14 +269,6 @@ function normalizedMediaType(value: string): string {
return value.split(';', 1)[0]?.trim().toLowerCase() ?? '';
}
-function bytesEqualAt(bytes: Uint8Array, offset: number, expected: ReadonlyArray<number>): boolean {
- if (bytes.byteLength < offset + expected.length) return false;
- for (let index = 0; index < expected.length; index += 1) {
- if (bytes[offset + index] !== expected[index]) return false;
- }
- return true;
-}
-
function isEBMLDocTypeByte(byte: number): boolean {
if (byte >= 0x30 && byte <= 0x39) return true;
if (byte >= 0x41 && byte <= 0x5a) return true;
@@ -369,34 +366,10 @@ function waitForVideoMetadata(video: HTMLVideoElement, signal: AbortSignal): Pro
});
}
-function waitForAbortablePromise<T>(promise: Promise<T>, signal: AbortSignal): Promise<T> {
- if (signal.aborted) return Promise.reject(signal.reason);
- return new Promise<T>((resolve, reject) => {
- const handleAbort = (): void => reject(signal.reason);
- signal.addEventListener('abort', handleAbort, {once: true});
- promise.then(
- (value) => {
- signal.removeEventListener('abort', handleAbort);
- resolve(value);
- },
- (error: unknown) => {
- signal.removeEventListener('abort', handleAbort);
- reject(error);
- },
- );
- });
-}
-
function throwIfAborted(signal: AbortSignal): void {
if (signal.aborted) throw signal.reason ?? new Error('Custom camera background video operation was aborted');
}
-function throwCleanupFailures(failures: ReadonlyArray<unknown>, message: string): void {
- if (failures.length === 0) return;
- if (failures.length === 1) throw failures[0];
- throw new AggregateError(failures, message);
-}
-
export async function createWebCameraEffectVideoFrameProducer(
mediaURL: string,
): Promise<WebCameraEffectVideoFrameProducer> {
diff --git a/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectWebGPURenderer.ts b/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectWebGPURenderer.ts
index 1ee4a4c89..ec59c37c1 100644
--- a/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectWebGPURenderer.ts
+++ b/fluxer_app/src/features/voice/utils/camera-effects/WebCameraEffectWebGPURenderer.ts
@@ -33,6 +33,7 @@ import {
type WebCameraEffectWebGPUPipelines,
} from '@app/features/voice/utils/camera-effects/WebCameraEffectWebGPUPipelines';
import {
+ collectInferenceOutputDisposalFailures,
loadWebSelfieRuntime,
MissingSegmentationAlphasOutputError,
SEG_INPUT_EDGE,
@@ -176,20 +177,6 @@ function destroyCustomTexture(customTexture: CustomTexture | null): void {
customTexture.texture.destroy();
}
-function collectInferenceOutputDisposalFailures(
- outputs: Readonly<Record<string, OrtNamespace.Tensor>>,
-): ReadonlyArray<unknown> {
- const failures: Array<unknown> = [];
- for (const output of Object.values(outputs)) {
- try {
- output.dispose();
- } catch (error) {
- failures.push(error);
- }
- }
- return failures;
-}
-
async function collectWebGPUInitializationCleanupFailures(
renderer: WebCameraEffectWebGPURenderer | null,
session: OrtNamespace.InferenceSession | null,
diff --git a/fluxer_app/src/features/voice/utils/camera-effects/WebSelfieSegmenter.ts b/fluxer_app/src/features/voice/utils/camera-effects/WebSelfieSegmenter.ts
index 687bb83ba..97ab4a898 100644
--- a/fluxer_app/src/features/voice/utils/camera-effects/WebSelfieSegmenter.ts
+++ b/fluxer_app/src/features/voice/utils/camera-effects/WebSelfieSegmenter.ts
@@ -175,7 +175,7 @@ function requireFloatMask(output: OrtNamespace.Tensor): Float32Array {
return data;
}
-function collectInferenceOutputDisposalFailures(
+export function collectInferenceOutputDisposalFailures(
outputs: Readonly<Record<string, OrtNamespace.Tensor>>,
): ReadonlyArray<unknown> {
const failures: Array<unknown> = [];
diff --git a/fluxer_app/src/features/window/hooks/useFluxerDocumentTitle.ts b/fluxer_app/src/features/window/hooks/useFluxerDocumentTitle.ts
index 67370fddc..6b1541e71 100644
--- a/fluxer_app/src/features/window/hooks/useFluxerDocumentTitle.ts
+++ b/fluxer_app/src/features/window/hooks/useFluxerDocumentTitle.ts
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {PRODUCT_NAME} from '@app/features/app/config/I18nDisplayConstants';
+import {formatNumber} from '@app/features/i18n/utils/IntlCache';
import {getCurrentLocale} from '@app/features/user/utils/LocaleUtils';
-import {formatNumber} from '@pkgs/number_utils/src/NumberFormatting';
import {useEffect} from 'react';
type TitlePart = string | null | undefined;
diff --git a/fluxer_app/src/types/electron.d.ts b/fluxer_app/src/types/electron.d.ts
index 2381b96c9..14f9ab424 100644
--- a/fluxer_app/src/types/electron.d.ts
+++ b/fluxer_app/src/types/electron.d.ts
@@ -371,6 +371,9 @@ export interface DisplayMediaRequestInfo {
export type DisplayMediaPortalSurfacePreference = 'window' | 'monitor';
+export type MediaAccessType = 'microphone' | 'camera' | 'screen' | 'audio-capture';
+export type MediaAccessStatus = 'granted' | 'denied' | 'not-determined' | 'restricted' | 'unknown';
+
export interface UpdaterEvent {
type: 'checking' | 'available' | 'not-available' | 'downloaded' | 'progress' | 'error' | 'unsupported';
context?: 'user' | 'background' | 'focus';
@@ -557,12 +560,10 @@ export interface ElectronAPI {
requestInputMonitoringPermission?(): Promise<InputMonitoringPermissionStatus>;
getScreenRecordingPermissionStatus?(): Promise<InputMonitoringPermissionStatus>;
requestScreenRecordingPermission?(): Promise<InputMonitoringPermissionStatus>;
- checkMediaAccess(
- type: 'screen' | 'camera' | 'microphone' | 'audio-capture',
- ): Promise<'granted' | 'denied' | 'restricted' | 'not-determined'>;
- requestMediaAccess(type: 'screen' | 'camera' | 'microphone' | 'audio-capture'): Promise<boolean>;
+ checkMediaAccess(type: MediaAccessType): Promise<Exclude<MediaAccessStatus, 'unknown'>>;
+ requestMediaAccess(type: MediaAccessType): Promise<boolean>;
openInputMonitoringSettings(): Promise<void>;
- openMediaAccessSettings(type: 'screen' | 'camera' | 'microphone' | 'audio-capture'): Promise<void>;
+ openMediaAccessSettings(type: MediaAccessType): Promise<void>;
onDisplayMediaRequested?(callback: (requestId: string, info: DisplayMediaRequestInfo) => void): () => void;
getAccessibilitySupportEnabled?(): Promise<boolean>;
onAccessibilitySupportChanged?(callback: (enabled: boolean) => void): () => void;
@@ -629,6 +630,7 @@ export interface ElectronAPI {
localAppUpload?: DesktopLocalAppUploadAPI;
localApp?: DesktopLocalAppInfo;
nativeGatewayTransport?: NativeGatewayTransportAPI;
+ setZoomFactor(factor: number): void;
}
export type VirtmicUnavailableReason =
diff --git a/fluxer_app_proxy/Dockerfile b/fluxer_app_proxy/Dockerfile
index 2f0d8d7f2..c83d90a3a 100644
--- a/fluxer_app_proxy/Dockerfile
+++ b/fluxer_app_proxy/Dockerfile
@@ -43,8 +43,6 @@ COPY packages/limits/package.json ./packages/limits/
COPY packages/schema/package.json ./packages/schema/
COPY packages/snowflake/package.json ./packages/snowflake/
COPY packages/voice_engine_v2/package.json ./packages/voice_engine_v2/
-COPY fluxer_app/pkgs/list_utils/package.json ./fluxer_app/pkgs/list_utils/
-COPY fluxer_app/pkgs/number_utils/package.json ./fluxer_app/pkgs/number_utils/
COPY fluxer_app/pkgs/livekit-client/package.json ./fluxer_app/pkgs/livekit-client/
RUN pnpm install --frozen-lockfile --filter fluxer_app...
@@ -68,8 +66,6 @@ COPY packages/markdown_parser/rust/benches/parser.rs ./packages/markdown_parser/
COPY packages/markdown_parser/rust/src/ ./packages/markdown_parser/rust/src/
COPY tools/ci/ ./tools/ci/
COPY fluxer_app/index.html fluxer_app/lingui.config.js fluxer_app/package.json fluxer_app/postcss.config.js fluxer_app/rspack.config.mjs fluxer_app/tsconfig.base.json fluxer_app/tsconfig.json ./fluxer_app/
-COPY fluxer_app/pkgs/list_utils/ ./fluxer_app/pkgs/list_utils/
-COPY fluxer_app/pkgs/number_utils/ ./fluxer_app/pkgs/number_utils/
COPY fluxer_app/pkgs/livekit-client/ ./fluxer_app/pkgs/livekit-client/
COPY fluxer_app/rust/ ./fluxer_app/rust/
COPY fluxer_app/scripts/ ./fluxer_app/scripts/
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 046156029..a48ccb587 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1416,12 +1416,6 @@ importers:
'@phosphor-icons/react':
specifier: 'catalog:'
version: 2.1.10(patch_hash=9b0b481de857aa7a7525f023baea9da72be4574ff72825e39d959e6979d78eea)([email protected]([email protected]))([email protected])
- '@pkgs/list_utils':
- specifier: workspace:*
- version: link:pkgs/list_utils
- '@pkgs/number_utils':
- specifier: workspace:*
- version: link:pkgs/number_utils
'@radix-ui/react-checkbox':
specifier: 'catalog:'
@@ -1563,9 +1557,6 @@ importers:
tiny-invariant:
specifier: 'catalog:'
version: 1.3.3
- uint8array-extras:
- specifier: 'catalog:'
- version: 1.5.0
unique-names-generator:
specifier: 'catalog:'
version: 4.7.1
@@ -1670,12 +1661,6 @@ importers:
specifier: 'catalog:'
- fluxer_app/pkgs/list_utils:
- dependencies:
- '@fluxer/constants':
- specifier: workspace:*
- version: link:../../../packages/constants
-
fluxer_app/pkgs/livekit-client:
dependencies:
'@livekit/mutex':
@@ -1716,12 +1701,6 @@ importers:
specifier: 'catalog:'
- fluxer_app/pkgs/number_utils:
- dependencies:
- '@fluxer/constants':
- specifier: workspace:*
- version: link:../../../packages/constants
-
fluxer_desktop:
dependencies:
'@fluxer/constants':