A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
feat(app): drop the compact attachments media size preference (#1872)
Hampus844952db51dd
diff --git a/fluxer_api/src/api/channel/services/message/MessageValidationService.ts b/fluxer_api/src/api/channel/services/message/MessageValidationService.tsindex 098aa677c..213559d69 100644--- a/fluxer_api/src/api/channel/services/message/MessageValidationService.ts+++ b/fluxer_api/src/api/channel/services/message/MessageValidationService.ts@@ -160,12 +160,8 @@ export class MessageValidationService {}}- calculateMessageFlags(data: {flags?: number; favorite_meme_id?: bigint | null}): number {- let flags = data.flags ? data.flags & SENDABLE_MESSAGE_FLAGS : 0;- if (data.favorite_meme_id) {- flags |= MessageFlags.COMPACT_ATTACHMENTS;- }- return flags;+ calculateMessageFlags(data: {flags?: number}): number {+ return data.flags ? data.flags & SENDABLE_MESSAGE_FLAGS : 0;}validateTotalAttachmentSize(diff --git a/fluxer_app/src/features/accessibility/state/Accessibility.ts b/fluxer_app/src/features/accessibility/state/Accessibility.tsindex f34a12a36..4c460724a 100644--- a/fluxer_app/src/features/accessibility/state/Accessibility.ts+++ b/fluxer_app/src/features/accessibility/state/Accessibility.ts@@ -23,7 +23,6 @@ import {ChannelTypingIndicatorMode as ProtoChannelTypingIndicatorMode,DmMessagePreviewMode as ProtoDmMessagePreviewMode,HdrDisplayMode as ProtoHdrDisplayMode,- MediaDimensionSize as ProtoMediaDimensionSize,} from '@fluxer/schema/src/gen/fluxer/user/preferences/v1/accessibility_pb';import {makeAutoObservable, reaction, runInAction} from 'mobx';@@ -513,11 +512,6 @@ export enum GuildChannelPresenceIndicatorMode {HIDDEN = 2,}-export enum MediaDimensionSize {- SMALL = 'small',- LARGE = 'large',-}-export enum DMMessagePreviewMode {ALL = 0,UNREAD_ONLY = 1,@@ -582,8 +576,6 @@ export interface AccessibilitySettings {showCustomEmojisInExpressionAutocomplete: boolean;showStickersInExpressionAutocomplete: boolean;showMemesInExpressionAutocomplete: boolean;- attachmentMediaDimensionSize: MediaDimensionSize;- embedMediaDimensionSize: MediaDimensionSize;voiceChannelJoinRequiresDoubleClick: boolean;customThemeCss: string | null;customThemeCssSyncAcrossDevices: boolean;@@ -631,15 +623,6 @@ const DM_PREVIEW_FROM_PROTO: Record<ProtoDmMessagePreviewMode, DMMessagePreviewM[ProtoDmMessagePreviewMode.UNREAD_ONLY]: DMMessagePreviewMode.UNREAD_ONLY,[ProtoDmMessagePreviewMode.NONE]: DMMessagePreviewMode.NONE,};-const MEDIA_DIMENSION_TO_PROTO: Record<MediaDimensionSize, ProtoMediaDimensionSize> = {- [MediaDimensionSize.SMALL]: ProtoMediaDimensionSize.SMALL,- [MediaDimensionSize.LARGE]: ProtoMediaDimensionSize.LARGE,-};-const MEDIA_DIMENSION_FROM_PROTO: Record<ProtoMediaDimensionSize, MediaDimensionSize> = {- [ProtoMediaDimensionSize.UNSPECIFIED]: MediaDimensionSize.SMALL,- [ProtoMediaDimensionSize.SMALL]: MediaDimensionSize.SMALL,- [ProtoMediaDimensionSize.LARGE]: MediaDimensionSize.LARGE,-};const HDR_TO_PROTO: Record<HdrDisplayMode, ProtoHdrDisplayMode> = {[HdrDisplayMode.FULL]: ProtoHdrDisplayMode.FULL,[HdrDisplayMode.STANDARD]: ProtoHdrDisplayMode.STANDARD,@@ -697,8 +680,6 @@ class Accessibility {showCustomEmojisInExpressionAutocomplete = true;showStickersInExpressionAutocomplete = true;showMemesInExpressionAutocomplete = true;- attachmentMediaDimensionSize = MediaDimensionSize.LARGE;- embedMediaDimensionSize = MediaDimensionSize.SMALL;voiceChannelJoinRequiresDoubleClick = false;systemReducedMotion = false;customThemeCss: string | null = null;@@ -811,8 +792,6 @@ class Accessibility {'showCustomEmojisInExpressionAutocomplete','showStickersInExpressionAutocomplete','showMemesInExpressionAutocomplete',- 'attachmentMediaDimensionSize',- 'embedMediaDimensionSize','voiceChannelJoinRequiresDoubleClick','customThemeCssSyncAcrossDevices','showFavorites',@@ -871,8 +850,6 @@ class Accessibility {showCustomEmojisInAutocomplete: s.showCustomEmojisInExpressionAutocomplete,showStickersInAutocomplete: s.showStickersInExpressionAutocomplete,showMemesInAutocomplete: s.showMemesInExpressionAutocomplete,- attachmentMediaDimensionSize: MEDIA_DIMENSION_TO_PROTO[s.attachmentMediaDimensionSize],- embedMediaDimensionSize: MEDIA_DIMENSION_TO_PROTO[s.embedMediaDimensionSize],voiceChannelJoinRequiresDoubleClick: s.voiceChannelJoinRequiresDoubleClick,customThemeCss: s.customThemeCssSyncAcrossDevices ? (s.customThemeCss ?? '') : (s.serverCustomThemeCss ?? ''),showFavorites: s.showFavorites,@@ -948,8 +925,6 @@ class Accessibility {if (m.showStickersInAutocomplete !== undefined)s.showStickersInExpressionAutocomplete = m.showStickersInAutocomplete;if (m.showMemesInAutocomplete !== undefined) s.showMemesInExpressionAutocomplete = m.showMemesInAutocomplete;- s.attachmentMediaDimensionSize = MEDIA_DIMENSION_FROM_PROTO[m.attachmentMediaDimensionSize];- s.embedMediaDimensionSize = MEDIA_DIMENSION_FROM_PROTO[m.embedMediaDimensionSize];if (m.voiceChannelJoinRequiresDoubleClick !== undefined)s.voiceChannelJoinRequiresDoubleClick = m.voiceChannelJoinRequiresDoubleClick;if (m.customThemeCss !== undefined) {@@ -1278,10 +1253,6 @@ class Accessibility {this.showStickersInExpressionAutocomplete = validated.showStickersInExpressionAutocomplete;if (validated.showMemesInExpressionAutocomplete !== undefined)this.showMemesInExpressionAutocomplete = validated.showMemesInExpressionAutocomplete;- if (validated.attachmentMediaDimensionSize !== undefined)- this.attachmentMediaDimensionSize = validated.attachmentMediaDimensionSize;- if (validated.embedMediaDimensionSize !== undefined)- this.embedMediaDimensionSize = validated.embedMediaDimensionSize;if (validated.voiceChannelJoinRequiresDoubleClick !== undefined)this.voiceChannelJoinRequiresDoubleClick = validated.voiceChannelJoinRequiresDoubleClick;if (hasCustomThemeCssUpdate) {@@ -1390,8 +1361,6 @@ class Accessibility {data.showStickersInExpressionAutocomplete ?? this.showStickersInExpressionAutocomplete,showMemesInExpressionAutocomplete:data.showMemesInExpressionAutocomplete ?? this.showMemesInExpressionAutocomplete,- attachmentMediaDimensionSize: data.attachmentMediaDimensionSize ?? this.attachmentMediaDimensionSize,- embedMediaDimensionSize: data.embedMediaDimensionSize ?? this.embedMediaDimensionSize,voiceChannelJoinRequiresDoubleClick:data.voiceChannelJoinRequiresDoubleClick ?? this.voiceChannelJoinRequiresDoubleClick,customThemeCss: data.customThemeCss !== undefined ? data.customThemeCss : this.customThemeCss,diff --git a/fluxer_app/src/features/channel/components/embeds/attachments/Attachment.tsx b/fluxer_app/src/features/channel/components/embeds/attachments/Attachment.tsxindex df63f22d0..0a61b6d6e 100644--- a/fluxer_app/src/features/channel/components/embeds/attachments/Attachment.tsx+++ b/fluxer_app/src/features/channel/components/embeds/attachments/Attachment.tsx@@ -106,7 +106,7 @@ const VideoAttachment: FC<AttachmentMediaProps & {message?: Message; isPreview?:const embedUrl = attachment.url ?? '';const proxyUrl = attachment.proxy_url ?? embedUrl;const nsfw = attachment.nsfw || (attachment.flags & MessageAttachmentFlags.CONTAINS_EXPLICIT_MEDIA) !== 0;- const attachmentDimensions = getAttachmentMediaDimensions(message);+ const attachmentDimensions = getAttachmentMediaDimensions();const videoLayoutConstraints = getInlineVideoLayoutConstraints(attachmentDimensions);return (<FocusRing@@ -250,7 +250,7 @@ const AttachmentMedia: FC<AttachmentMediaProps & {message?: Message; isPreview?:/>);}- const attachmentDimensions = getAttachmentMediaDimensions(message);+ const attachmentDimensions = getAttachmentMediaDimensions();const mediaCalculator = createCalculator({maxWidth: attachmentDimensions.maxWidth,maxHeight: attachmentDimensions.maxHeight,diff --git a/fluxer_app/src/features/channel/components/embeds/attachments/AttachmentGridItem.tsx b/fluxer_app/src/features/channel/components/embeds/attachments/AttachmentGridItem.tsxindex bcb74471b..50e55377b 100644--- a/fluxer_app/src/features/channel/components/embeds/attachments/AttachmentGridItem.tsx+++ b/fluxer_app/src/features/channel/components/embeds/attachments/AttachmentGridItem.tsx@@ -128,7 +128,7 @@ export const AttachmentGridItem: FC<AttachmentGridItemProps> = observer() : (node);- const mosaicDimensions = getMosaicMediaDimensions(message);+ const mosaicDimensions = getMosaicMediaDimensions();const maxMosaicWidth = mosaicDimensions.maxWidth;let targetWidth = maxMosaicWidth;let targetHeight = maxMosaicWidth;diff --git a/fluxer_app/src/features/channel/components/embeds/attachments/AttachmentMosaic.tsx b/fluxer_app/src/features/channel/components/embeds/attachments/AttachmentMosaic.tsxindex d8bf2dfe7..2ccc969ed 100644--- a/fluxer_app/src/features/channel/components/embeds/attachments/AttachmentMosaic.tsx+++ b/fluxer_app/src/features/channel/components/embeds/attachments/AttachmentMosaic.tsx@@ -54,7 +54,7 @@ const AttachmentMosaicComponent: FC<AttachmentMosaicProps> = observer(({attachments, message, hideExpiryFootnote, isPreview, snapshotIndex, onDelete}) => {const {i18n} = useLingui();const mediaAttachments = useMemo(() => attachments.filter(isMediaAttachment), [attachments]);- const mosaicDimensions = getMosaicMediaDimensions(message);+ const mosaicDimensions = getMosaicMediaDimensions();const mosaicStyle: AttachmentMosaicStyle = {'--attachment-media-max-height': remFromPx(mosaicDimensions.maxHeight),'--attachment-media-max-width': remFromPx(mosaicDimensions.maxWidth),diff --git a/fluxer_app/src/features/channel/components/embeds/attachments/AttachmentSingleMedia.tsx b/fluxer_app/src/features/channel/components/embeds/attachments/AttachmentSingleMedia.tsxindex 8abfc1a50..4c94913c6 100644--- a/fluxer_app/src/features/channel/components/embeds/attachments/AttachmentSingleMedia.tsx+++ b/fluxer_app/src/features/channel/components/embeds/attachments/AttachmentSingleMedia.tsx@@ -61,7 +61,7 @@ export const AttachmentSingleMedia: FC<AttachmentSingleMediaProps> = observer();const naturalWidth = attachment.width!;const naturalHeight = attachment.height!;- const attachmentDimensions = getAttachmentMediaDimensions(message);+ const attachmentDimensions = getAttachmentMediaDimensions();const videoLayoutConstraints = getInlineVideoLayoutConstraints(attachmentDimensions);const standaloneMediaCalculator = createCalculator({maxWidth: attachmentDimensions.maxWidth,diff --git a/fluxer_app/src/features/messaging/commands/ScheduledMessageCommands.tsx b/fluxer_app/src/features/messaging/commands/ScheduledMessageCommands.tsxindex 9a645704e..2fd139692 100644--- a/fluxer_app/src/features/messaging/commands/ScheduledMessageCommands.tsx+++ b/fluxer_app/src/features/messaging/commands/ScheduledMessageCommands.tsx@@ -133,13 +133,12 @@ function claimScheduleAttachments(params: ScheduleMessageParams, nonce: string):params.content,params.messageReference,params.replyMentioning,- params.favoriteMemeId,);}async function prepareScheduledMessage(params: ScheduleMessageParams): Promise<PreparedScheduledMessage> {const nonce = SnowflakeUtils.fromTimestamp(Date.now());- const normalized = normalizeMessageContent(params.content, params.favoriteMemeId);+ const normalized = normalizeMessageContent(params.content);claimScheduleAttachments(params, nonce);let attachments: Array<ApiAttachmentMetadata> | undefined;let files: Array<File> | undefined;diff --git a/fluxer_app/src/features/messaging/hooks/useMessageSubmission.tsx b/fluxer_app/src/features/messaging/hooks/useMessageSubmission.tsxindex 7f161699d..9577a9992 100644--- a/fluxer_app/src/features/messaging/hooks/useMessageSubmission.tsx+++ b/fluxer_app/src/features/messaging/hooks/useMessageSubmission.tsx@@ -105,7 +105,6 @@ export const useMessageSubmission = ({channel, referencedMessage, replyingMessagcontent,messageReference,replyingMessage?.mentioning,- favoriteMemeId,),{formatMultipleFileLabel: (count) => formatUploadingAttachmentSummary(i18n, count),diff --git a/fluxer_app/src/features/messaging/utils/MediaDimensionConfig.ts b/fluxer_app/src/features/messaging/utils/MediaDimensionConfig.tsindex ae4bd3289..235dbc7f9 100644--- a/fluxer_app/src/features/messaging/utils/MediaDimensionConfig.ts+++ b/fluxer_app/src/features/messaging/utils/MediaDimensionConfig.ts@@ -1,36 +1,55 @@// SPDX-License-Identifier: AGPL-3.0-or-later-import Accessibility, {MediaDimensionSize} from '@app/features/accessibility/state/Accessibility';-import type {Message} from '@app/features/messaging/models/MessagingMessage';+import {fitMediaWithinBounds} from '@app/features/ui/utils/DimensionUtils';import type {MediaDimensions} from '@app/lib/branded-types';-import {MessageFlags} from '@fluxer/constants/src/ChannelConstants';interface MediaDimensionConstraints extends MediaDimensions {}-const DIMENSION_PRESETS = {- SMALL: {- maxWidth: 400,- maxHeight: 300,- },- LARGE: {- maxWidth: 550,- maxHeight: 400,- },-} as const;--export function getAttachmentMediaDimensions(message?: Message): MediaDimensionConstraints {- if (message && (message.flags & MessageFlags.COMPACT_ATTACHMENTS) !== 0) {- return DIMENSION_PRESETS.SMALL;- }- const size = Accessibility.attachmentMediaDimensionSize;- return size === MediaDimensionSize.SMALL ? DIMENSION_PRESETS.SMALL : DIMENSION_PRESETS.LARGE;+export const ATTACHMENT_MAX_WIDTH = 550;+export const ATTACHMENT_MAX_HEIGHT = 350;+export const EMBED_MAX_WIDTH = 400;+export const EMBED_MAX_HEIGHT = 300;+export const EMBED_TALL_MAX_HEIGHT = 450;+export const MIN_USEFUL_MEDIA_SIZE = 40;++const ATTACHMENT_DIMENSIONS: MediaDimensionConstraints = {+ maxWidth: ATTACHMENT_MAX_WIDTH,+ maxHeight: ATTACHMENT_MAX_HEIGHT,+};++const EMBED_DIMENSIONS: MediaDimensionConstraints = {+ maxWidth: EMBED_MAX_WIDTH,+ maxHeight: EMBED_MAX_HEIGHT,+};++const EMBED_TALL_DIMENSIONS: MediaDimensionConstraints = {+ maxWidth: EMBED_MAX_WIDTH,+ maxHeight: EMBED_TALL_MAX_HEIGHT,+};++export function getAttachmentMediaDimensions(): MediaDimensionConstraints {+ return ATTACHMENT_DIMENSIONS;+}++export function getEmbedMediaDimensions(isTallMedia = false): MediaDimensionConstraints {+ return isTallMedia ? EMBED_TALL_DIMENSIONS : EMBED_DIMENSIONS;}-export function getEmbedMediaDimensions(): MediaDimensionConstraints {- const size = Accessibility.embedMediaDimensionSize;- return size === MediaDimensionSize.SMALL ? DIMENSION_PRESETS.SMALL : DIMENSION_PRESETS.LARGE;+export function getMosaicMediaDimensions(): MediaDimensionConstraints {+ return ATTACHMENT_DIMENSIONS;}-export function getMosaicMediaDimensions(message?: Message): MediaDimensionConstraints {- return getAttachmentMediaDimensions(message);+export function isUsefulVisualMediaSize(+ naturalWidth: number,+ naturalHeight: number,+ constraints: MediaDimensionConstraints = ATTACHMENT_DIMENSIONS,+): boolean {+ if (!(naturalWidth > 0) || !(naturalHeight > 0)) return false;+ const fitted = fitMediaWithinBounds({+ width: naturalWidth,+ height: naturalHeight,+ maxWidth: constraints.maxWidth,+ maxHeight: constraints.maxHeight,+ });+ return fitted.width >= MIN_USEFUL_MEDIA_SIZE && fitted.height >= MIN_USEFUL_MEDIA_SIZE;}diff --git a/fluxer_app/src/features/messaging/utils/MessageRequestUtils.ts b/fluxer_app/src/features/messaging/utils/MessageRequestUtils.tsindex 1766624b0..d6b4a5478 100644--- a/fluxer_app/src/features/messaging/utils/MessageRequestUtils.ts+++ b/fluxer_app/src/features/messaging/utils/MessageRequestUtils.ts@@ -74,12 +74,12 @@ export interface NormalizedMessageContent {flags: number;}-export function normalizeMessageContent(content: string, favoriteMemeId?: string): NormalizedMessageContent {+export function normalizeMessageContent(content: string): NormalizedMessageContent {const withoutSilent = removeSilentFlag(content);const converted = applyOutgoingEmoticonConversion(withoutSilent);const sanitized = maybeSanitizeOutgoingMessage(converted);const normalizedContent = hasVisibleMessageContent(sanitized) ? sanitized : '';- const flags = getMessageFlags(content, favoriteMemeId);+ const flags = getMessageFlags(content);return {content: normalizedContent, flags};}@@ -130,14 +130,11 @@ const removeSilentFlag = (content: string): string => {const applyOutgoingEmoticonConversion = (content: string): string => {return ChatInputSettings.convertEmoticons ? convertEmoticonsToEmoji(content) : content;};-const getMessageFlags = (content: string, favoriteMemeId?: string): number => {+const getMessageFlags = (content: string): number => {let flags = 0;if (isSilentMessage(content)) {flags |= MessageFlags.SUPPRESS_NOTIFICATIONS;}- if (favoriteMemeId) {- flags |= MessageFlags.COMPACT_ATTACHMENTS;- }return flags;};const shouldIncludeAllowedMentions = (allowedMentions?: AllowedMentions): boolean => {diff --git a/fluxer_app/src/features/messaging/utils/MessageSubmitUtils.ts b/fluxer_app/src/features/messaging/utils/MessageSubmitUtils.tsindex 87cf85587..446c23d5e 100644--- a/fluxer_app/src/features/messaging/utils/MessageSubmitUtils.ts+++ b/fluxer_app/src/features/messaging/utils/MessageSubmitUtils.ts@@ -40,7 +40,7 @@ export function createUploadingAttachments(}export function createOptimisticMessage(data: MessageSubmitData, attachments: Array<MessageAttachment>): Message {- const normalized = normalizeMessageContent(data.content, data.favoriteMemeId);+ const normalized = normalizeMessageContent(data.content);const content = normalized.content;const flags = normalized.flags;return new Message({@@ -77,14 +77,13 @@ export function claimMessageAttachments(content: string,messageReference?: MessageReference,replyMentioning?: boolean,- favoriteMemeId?: string,): Array<{filename: string;file: {size: number;};}> {- const normalized = normalizeMessageContent(content, favoriteMemeId);+ const normalized = normalizeMessageContent(content);const allowedMentions: AllowedMentions = {replied_user: replyMentioning ?? true};return CloudUpload.claimAttachmentsForMessage(channelId, nonce, undefined, {content: normalized.content,diff --git a/fluxer_app/src/features/user/components/modals/tabs/ChatSettingsTab.tsx b/fluxer_app/src/features/user/components/modals/tabs/ChatSettingsTab.tsxindex fe8018bca..812866367 100644--- a/fluxer_app/src/features/user/components/modals/tabs/ChatSettingsTab.tsx+++ b/fluxer_app/src/features/user/components/modals/tabs/ChatSettingsTab.tsx@@ -2,9 +2,7 @@import {SettingsSection} from '@app/features/app/components/dialogs/shared/SettingsSection';import {SettingsTabContainer, SettingsTabContent} from '@app/features/app/components/dialogs/shared/SettingsTabLayout';-import {MEDIA_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';import {InputTabContent} from '@app/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabInputTab';-import {MediaTabContent} from '@app/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabMediaTab';import {DisplayTabContent} from '@app/features/user/components/modals/tabs/chat_settings_tab/DisplayTab';import {msg} from '@lingui/core/macro';import {useLingui} from '@lingui/react/macro';@@ -30,9 +28,6 @@ const ChatSettingsTab: React.FC = observer(() => {<SettingsSection id="input" title={i18n._(INPUT_DESCRIPTOR)} data-flx="user.chat-settings-tab.input"><InputTabContent data-flx="user.chat-settings-tab.input-tab-content" /></SettingsSection>- <SettingsSection id="media" title={i18n._(MEDIA_DESCRIPTOR)} data-flx="user.chat-settings-tab.media">- <MediaTabContent data-flx="user.chat-settings-tab.media-tab-content" />- </SettingsSection></SettingsTabContent></SettingsTabContainer>);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.tsxindex e5a6d0f58..19597d09d 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,10 +1,8 @@// SPDX-License-Identifier: AGPL-3.0-or-laterimport {SettingsSection} from '@app/features/app/components/dialogs/shared/SettingsSection';-import {MEDIA_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';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 {MediaTabContent} from '@app/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabMediaTab';import {DisplayTabContent} from '@app/features/user/components/modals/tabs/chat_settings_tab/DisplayTab';import {msg} from '@lingui/core/macro';import {useLingui} from '@lingui/react/macro';@@ -37,13 +35,6 @@ export const ChatSettingsInlineContent: React.FC = observer(() => {><InputTabContent data-flx="user.chat-settings-tab.inline.chat-settings-inline-content.input-tab-content" /></SettingsSection>- <SettingsSection- id="media"- title={i18n._(MEDIA_DESCRIPTOR)}- data-flx="user.chat-settings-tab.inline.chat-settings-inline-content.media"- >- <MediaTabContent data-flx="user.chat-settings-tab.inline.chat-settings-inline-content.media-tab-content" />- </SettingsSection></div>);});diff --git a/fluxer_app/src/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabMediaTab.module.css b/fluxer_app/src/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabMediaTab.module.cssdeleted file mode 100644index 3d94fe213..000000000--- a/fluxer_app/src/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabMediaTab.module.css+++ /dev/null@@ -1,137 +0,0 @@-/* SPDX-License-Identifier: AGPL-3.0-or-later */--.sectionContent {- margin-top: 0.5rem;-}--.radioSections {- margin-top: 0.5rem;- display: flex;- flex-direction: column;- gap: 1.5rem;-}--.radioSection {- display: flex;- flex-direction: column;- gap: 0.75rem;-}--.radioLabelContainer {- display: flex;- flex-direction: column;- gap: 0.25rem;-}--.radioLabel {- display: block;- font-weight: 500;- font-size: 0.875rem;- color: var(--text-primary);-}--.previewContainer {- margin-bottom: 1.5rem;- display: flex;- flex-direction: column;- align-items: center;- gap: 0.25rem;-}--.previewWrapper {- position: relative;- display: inline-flex;- flex-direction: column;- align-items: stretch;- gap: 0.35rem;- max-width: 28rem;- width: 20rem;-}--.previewBox {- position: relative;- display: flex;- aspect-ratio: 16 / 9;- width: 100%;- align-items: center;- justify-content: center;- overflow: hidden;- border-radius: 0.25rem;- background-color: var(--background-tertiary);-}--.previewIcon {- height: 4rem;- width: 4rem;- color: var(--text-tertiary);-}--.gifIndicator {- position: absolute;- top: 0.5rem;- left: 0.5rem;- z-index: 10;- border-radius: 0.25rem;- background-color: rgba(0, 0, 0, 0.6);- padding: 0.125rem 0.375rem;- font-weight: 600;- font-size: 0.8125rem;- line-height: 1.1;- color: white;-}--.actionButtons {- position: absolute;- top: 0.5rem;- right: 0.5rem;- z-index: 10;- display: flex;- gap: 0.25rem;-}--.actionButton {- display: flex;- height: 2rem;- width: 2rem;- align-items: center;- justify-content: center;- border-radius: 0.25rem;- border: 0.0625rem solid var(--background-modifier-accent);- background-color: var(--background-primary);- box-shadow:- 0 0.25rem 0.375rem -0.0625rem rgba(0, 0, 0, 0.1),- 0 0.125rem 0.25rem -0.0625rem rgba(0, 0, 0, 0.06);- cursor: pointer;-}--.actionButtonIcon {- color: var(--text-primary);-}--.suppressButton {- position: absolute;- top: 0.25rem;- right: -2rem;- display: flex;- height: 1.5rem;- width: 1.5rem;- align-items: center;- justify-content: center;- border-radius: 0.25rem;- background: transparent;- border: none;- color: var(--text-tertiary);- transition:- background-color 0.15s,- color 0.15s;- cursor: pointer;- padding: 0;-}--.suppressButton:hover {- color: var(--status-danger);-}--.expiryFootnotePreview {- width: 100%;-}diff --git a/fluxer_app/src/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabMediaTab.tsx b/fluxer_app/src/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabMediaTab.tsxdeleted file mode 100644index 1d6b61195..000000000--- a/fluxer_app/src/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabMediaTab.tsx+++ /dev/null@@ -1,101 +0,0 @@-// SPDX-License-Identifier: AGPL-3.0-or-later--import * as AccessibilityCommands from '@app/features/accessibility/commands/AccessibilityCommands';-import Accessibility, {MediaDimensionSize} from '@app/features/accessibility/state/Accessibility';-import type {RadioOption} from '@app/features/ui/radio_group/RadioGroup';-import {RadioGroup} from '@app/features/ui/radio_group/RadioGroup';-import styles from '@app/features/user/components/modals/tabs/chat_settings_tab/ChatSettingsTabMediaTab.module.css';-import {msg} from '@lingui/core/macro';-import {Trans, useLingui} from '@lingui/react/macro';-import {observer} from 'mobx-react-lite';-import type React from 'react';-import {useMemo} from 'react';--const COMPACT_400X300_DESCRIPTOR = msg({- message: 'Compact (400x300)',- comment: 'Short label in the media tab. Keep it concise.',-});-const SMALLER_MEDIA_SIZE_DESCRIPTOR = msg({- message: 'Smaller media size',- comment: 'Short label in the media tab. Keep it concise.',-});-const COMFORTABLE_550X400_DESCRIPTOR = msg({- message: 'Comfortable (550x400)',- comment: 'Short label in the media tab. Keep it concise.',-});-const LARGER_MEDIA_SIZE_WITH_MORE_DETAIL_DESCRIPTOR = msg({- message: 'Larger media size with more detail',- comment: 'Description text in the media tab.',-});-const SELECT_MEDIA_SIZE_FOR_EMBEDDED_CONTENT_FROM_LINKS_DESCRIPTOR = msg({- message: 'Select media size for embedded content from links',- comment: 'Button or menu action label in the media tab. Keep it concise.',-});-const SELECT_MEDIA_SIZE_FOR_UPLOADED_ATTACHMENTS_DESCRIPTOR = msg({- message: 'Select media size for uploaded attachments',- comment: 'Button or menu action label in the media tab. Keep it concise.',-});--export const MediaTabContent: React.FC = observer(() => {- const {i18n} = useLingui();- const {embedMediaDimensionSize, attachmentMediaDimensionSize} = Accessibility;- const mediaSizeOptions = useMemo(- (): ReadonlyArray<RadioOption<MediaDimensionSize>> => [- {- value: MediaDimensionSize.SMALL,- name: i18n._(COMPACT_400X300_DESCRIPTOR),- desc: i18n._(SMALLER_MEDIA_SIZE_DESCRIPTOR),- },- {- value: MediaDimensionSize.LARGE,- name: i18n._(COMFORTABLE_550X400_DESCRIPTOR),- desc: i18n._(LARGER_MEDIA_SIZE_WITH_MORE_DETAIL_DESCRIPTOR),- },- ],- [i18n.locale],- );- return (- <div className={styles.radioSections} data-flx="user.chat-settings-tab.media-tab.media-tab-content.radio-sections">- <div className={styles.radioSection} data-flx="user.chat-settings-tab.media-tab.media-tab-content.radio-section">- <div- className={styles.radioLabelContainer}- data-flx="user.chat-settings-tab.media-tab.media-tab-content.radio-label-container"- >- <div className={styles.radioLabel} data-flx="user.chat-settings-tab.media-tab.media-tab-content.radio-label">- <Trans>Media from links (embeds)</Trans>- </div>- </div>- <RadioGroup- options={mediaSizeOptions}- value={embedMediaDimensionSize}- onChange={(value) => AccessibilityCommands.update({embedMediaDimensionSize: value})}- aria-label={i18n._(SELECT_MEDIA_SIZE_FOR_EMBEDDED_CONTENT_FROM_LINKS_DESCRIPTOR)}- data-flx="user.chat-settings-tab.media-tab.media-tab-content.radio-group.update"- />- </div>- <div- className={styles.radioSection}- data-flx="user.chat-settings-tab.media-tab.media-tab-content.radio-section--2"- >- <div- className={styles.radioLabelContainer}- data-flx="user.chat-settings-tab.media-tab.media-tab-content.radio-label-container--2"- >- <div- className={styles.radioLabel}- data-flx="user.chat-settings-tab.media-tab.media-tab-content.radio-label--2"- >- <Trans>Uploaded attachments</Trans>- </div>- </div>- <RadioGroup- options={mediaSizeOptions}- value={attachmentMediaDimensionSize}- onChange={(value) => AccessibilityCommands.update({attachmentMediaDimensionSize: value})}- aria-label={i18n._(SELECT_MEDIA_SIZE_FOR_UPLOADED_ATTACHMENTS_DESCRIPTOR)}- data-flx="user.chat-settings-tab.media-tab.media-tab-content.radio-group.update--2"- />- </div>- </div>- );-});diff --git a/packages/constants/src/ChannelConstants.ts b/packages/constants/src/ChannelConstants.tsindex c1f892111..1f143fc97 100644--- a/packages/constants/src/ChannelConstants.ts+++ b/packages/constants/src/ChannelConstants.ts@@ -93,19 +93,14 @@ export const MessageFlags = {SUPPRESS_EMBEDS: 1 << 2,SUPPRESS_NOTIFICATIONS: 1 << 12,VOICE_MESSAGE: 1 << 13,- COMPACT_ATTACHMENTS: 1 << 17,} as const;export const MessageFlagsDescriptions: Record<keyof typeof MessageFlags, string> = {SUPPRESS_EMBEDS: 'Do not include embeds when serialising this message',SUPPRESS_NOTIFICATIONS: 'This message will not trigger push or desktop notifications',VOICE_MESSAGE: 'This message is a voice message',- COMPACT_ATTACHMENTS: 'Display attachments in a compact format',};export const SENDABLE_MESSAGE_FLAGS =- MessageFlags.SUPPRESS_EMBEDS |- MessageFlags.SUPPRESS_NOTIFICATIONS |- MessageFlags.COMPACT_ATTACHMENTS |- MessageFlags.VOICE_MESSAGE;+ MessageFlags.SUPPRESS_EMBEDS | MessageFlags.SUPPRESS_NOTIFICATIONS | MessageFlags.VOICE_MESSAGE;export const MessageAttachmentFlags = {IS_SPOILER: 1 << 3,CONTAINS_EXPLICIT_MEDIA: 1 << 4,diff --git a/packages/schema/proto/fluxer/user/preferences/v1/accessibility.proto b/packages/schema/proto/fluxer/user/preferences/v1/accessibility.protoindex 71fd41990..86b18527c 100644--- a/packages/schema/proto/fluxer/user/preferences/v1/accessibility.proto+++ b/packages/schema/proto/fluxer/user/preferences/v1/accessibility.proto@@ -54,8 +54,8 @@ message AccessibilitySettings {optional bool show_stickers_in_autocomplete = 40;optional bool show_memes_in_autocomplete = 41;- MediaDimensionSize attachment_media_dimension_size = 42;- MediaDimensionSize embed_media_dimension_size = 43;+ reserved 42, 43;+ reserved "attachment_media_dimension_size", "embed_media_dimension_size";optional bool voice_channel_join_requires_double_click = 44;optional string custom_theme_css = 45;@@ -93,12 +93,6 @@ enum ChannelTypingIndicatorMode {CHANNEL_TYPING_INDICATOR_MODE_HIDDEN = 3;}-enum MediaDimensionSize {- MEDIA_DIMENSION_SIZE_UNSPECIFIED = 0;- MEDIA_DIMENSION_SIZE_SMALL = 1;- MEDIA_DIMENSION_SIZE_LARGE = 2;-}-enum DmMessagePreviewMode {DM_MESSAGE_PREVIEW_MODE_UNSPECIFIED = 0;DM_MESSAGE_PREVIEW_MODE_ALL = 1;diff --git a/packages/schema/src/gen/fluxer/user/preferences/v1/accessibility_pb.ts b/packages/schema/src/gen/fluxer/user/preferences/v1/accessibility_pb.tsindex 00f2cb0cc..5531c7486 100644--- a/packages/schema/src/gen/fluxer/user/preferences/v1/accessibility_pb.ts+++ b/packages/schema/src/gen/fluxer/user/preferences/v1/accessibility_pb.ts@@ -6,7 +6,7 @@ import type { Message } from "@bufbuild/protobuf";* Describes the file fluxer/user/preferences/v1/accessibility.proto.*/export const file_fluxer_user_preferences_v1_accessibility: GenFile = /*@__PURE__*/- fileDesc("Ci5mbHV4ZXIvdXNlci9wcmVmZXJlbmNlcy92MS9hY2Nlc3NpYmlsaXR5LnByb3RvEhpmbHV4ZXIudXNlci5wcmVmZXJlbmNlcy52MSLrIgoVQWNjZXNzaWJpbGl0eVNldHRpbmdzEh4KEXNhdHVyYXRpb25fZmFjdG9yGAEgASgBSACIAQESHgoWYWx3YXlzX3VuZGVybGluZV9saW5rcxgCIAEoCBIiChVlbmFibGVfdGV4dF9zZWxlY3Rpb24YAyABKAhIAYgBARIlChhzaG93X21lc3NhZ2Vfc2VuZF9idXR0b24YBCABKAhIAogBARIlChhzaG93X3RleHRhcmVhX2ZvY3VzX3JpbmcYBSABKAhIA4gBARIbChNoaWRlX2tleWJvYXJkX2hpbnRzGAYgASgIEicKGmVzY2FwZV9leGl0c19rZXlib2FyZF9tb2RlGAcgASgISASIAQESLAofc3luY19yZWR1Y2VkX21vdGlvbl93aXRoX3N5c3RlbRgIIAEoCEgFiAEBEiQKF3JlZHVjZWRfbW90aW9uX292ZXJyaWRlGAkgASgISAaIAQESIgoVbWVzc2FnZV9ncm91cF9zcGFjaW5nGAogASgBSAeIAQESGwoObWVzc2FnZV9ndXR0ZXIYCyABKAFICIgBARIWCglmb250X3NpemUYDCABKAFICYgBARIuCiFzaG93X3VzZXJfYXZhdGFyc19pbl9jb21wYWN0X21vZGUYDSABKAhICogBARIrCiNtb2JpbGVfc3RpY2tlcl9hbmltYXRpb25fb3ZlcnJpZGRlbhgOIAEoCBImCh5tb2JpbGVfZ2lmX2F1dG9wbGF5X292ZXJyaWRkZW4YDyABKAgSJwofbW9iaWxlX2FuaW1hdGVfZW1vamlfb3ZlcnJpZGRlbhgQIAEoCBIrCh5tb2JpbGVfc3RpY2tlcl9hbmltYXRpb25fdmFsdWUYESABKAVIC4gBARImChltb2JpbGVfZ2lmX2F1dG9wbGF5X3ZhbHVlGBIgASgISAyIAQESJwoabW9iaWxlX2FuaW1hdGVfZW1vamlfdmFsdWUYEyABKAhIDYgBARIcChRhdXRvX3NlbmRfa2xpcHlfZ2lmcxgUIAEoCBIcCg9zaG93X2dpZl9idXR0b24YFSABKAhIDogBARIeChFzaG93X21lbWVzX2J1dHRvbhgWIAEoCEgPiAEBEiEKFHNob3dfc3RpY2tlcnNfYnV0dG9uGBcgASgISBCIAQESHgoRc2hvd19lbW9qaV9idXR0b24YGCABKAhIEYgBARInChpzaG93X21lZGlhX2Zhdm9yaXRlX2J1dHRvbhgZIAEoCEgSiAEBEicKGnNob3dfbWVkaWFfZG93bmxvYWRfYnV0dG9uGBogASgISBOIAQESJQoYc2hvd19tZWRpYV9kZWxldGVfYnV0dG9uGBsgASgISBSIAQESKAobc2hvd19zdXBwcmVzc19lbWJlZHNfYnV0dG9uGBwgASgISBWIAQESHwoSc2hvd19naWZfaW5kaWNhdG9yGB0gASgISBaIAQESLQogc2hvd19hdHRhY2htZW50X2V4cGlyeV9pbmRpY2F0b3IYHiABKAhIF4gBARIvCiJ1c2VfYnJvd3Nlcl9sb2NhbGVfZm9yX3RpbWVfZm9ybWF0GB8gASgISBiIAQESXQodY2hhbm5lbF90eXBpbmdfaW5kaWNhdG9yX21vZGUYICABKA4yNi5mbHV4ZXIudXNlci5wcmVmZXJlbmNlcy52MS5DaGFubmVsVHlwaW5nSW5kaWNhdG9yTW9kZRIzCiZzaG93X3NlbGVjdGVkX2NoYW5uZWxfdHlwaW5nX2luZGljYXRvchghIAEoCEgZiAEBEiQKF3Nob3dfbWVzc2FnZV9hY3Rpb25fYmFyGCIgASgISBqIAQESNAonc2hvd19tZXNzYWdlX2FjdGlvbl9iYXJfcXVpY2tfcmVhY3Rpb25zGCMgASgISBuIAQESMQokc2hvd19tZXNzYWdlX2FjdGlvbl9iYXJfc2hpZnRfZXhwYW5kGCQgASgISByIAQESNQooc2hvd19tZXNzYWdlX2FjdGlvbl9iYXJfb25seV9tb3JlX2J1dHRvbhglIAEoCEgdiAEBEjAKI3Nob3dfZGVmYXVsdF9lbW9qaXNfaW5fYXV0b2NvbXBsZXRlGCYgASgISB6IAQESLwoic2hvd19jdXN0b21fZW1vamlzX2luX2F1dG9jb21wbGV0ZRgnIAEoCEgfiAEBEioKHXNob3dfc3RpY2tlcnNfaW5fYXV0b2NvbXBsZXRlGCggASgISCCIAQESJwoac2hvd19tZW1lc19pbl9hdXRvY29tcGxldGUYKSABKAhIIYgBARJXCh9hdHRhY2htZW50X21lZGlhX2RpbWVuc2lvbl9zaXplGCogASgOMi4uZmx1eGVyLnVzZXIucHJlZmVyZW5jZXMudjEuTWVkaWFEaW1lbnNpb25TaXplElIKGmVtYmVkX21lZGlhX2RpbWVuc2lvbl9zaXplGCsgASgOMi4uZmx1eGVyLnVzZXIucHJlZmVyZW5jZXMudjEuTWVkaWFEaW1lbnNpb25TaXplEjUKKHZvaWNlX2NoYW5uZWxfam9pbl9yZXF1aXJlc19kb3VibGVfY2xpY2sYLCABKAhIIogBARIdChBjdXN0b21fdGhlbWVfY3NzGC0gASgJSCOIAQESGwoOc2hvd19mYXZvcml0ZXMYLiABKAhIJIgBARIXCgp6b29tX2xldmVsGC8gASgBSCWIAQESUQoXZG1fbWVzc2FnZV9wcmV2aWV3X21vZGUYMCABKA4yMC5mbHV4ZXIudXNlci5wcmVmZXJlbmNlcy52MS5EbU1lc3NhZ2VQcmV2aWV3TW9kZRIfChJlbmFibGVfdHRzX2NvbW1hbmQYMSABKAhIJogBARIVCgh0dHNfcmF0ZRgyIAEoAUgniAEBEjAKI3Nob3dfZmFkZWRfdW5yZWFkX29uX211dGVkX2NoYW5uZWxzGDMgASgISCiIAQESKAobc2hvd19jb250ZXh0X21lbnVfc2hvcnRjdXRzGDQgASgISCmIAQESKgodY29uZmlybV9iZWZvcmVfc3RhcnRpbmdfY2FsbHMYNSABKAhIKogBARJEChBoZHJfZGlzcGxheV9tb2RlGDYgASgOMiouZmx1eGVyLnVzZXIucHJlZmVyZW5jZXMudjEuSGRyRGlzcGxheU1vZGUSIAoTcHJlc2VydmVfZWRpdF9kcmFmdBg3IAEoCEgriAEBEiwKH3N0YXlfaW50ZXJhY3RpdmVfd2hlbl91bmZvY3VzZWQYOCABKAhILIgBARIyCiVjb25maXJtX2JlZm9yZV9qb2luaW5nX3ZvaWNlX2NoYW5uZWxzGDkgASgISC2IAQESMAojc2NyZWVuX3JlYWRlcl9hbm5vdW5jZV9uZXdfbWVzc2FnZXMYOiABKAhILogBARI0CidmaXJzdF9jbGlja19wYXNzX3Rocm91Z2hfd2hlbl91bmZvY3VzZWQYOyABKAhIL4gBARIqCh1jb21wYWN0X21lc3NhZ2VfZ3JvdXBfc3BhY2luZxg8IAEoAUgwiAEBEi0KIHNjcm9sbF90b19ib3R0b21fb25fbWVzc2FnZV9zZW5kGD0gASgISDGIAQESIwoWZGltX3N0cmlrZXRocm91Z2hfdGV4dBg+IAEoCEgyiAEBEiEKFHNlcXVlbnRpYWxfZmlsZV9zZW5kGD8gASgISDOIAQESKQocbW9iaWxlX3NwbGFzaF96b29tX2FuaW1hdGlvbhhAIAEoCEg0iAEBQhQKEl9zYXR1cmF0aW9uX2ZhY3RvckIYChZfZW5hYmxlX3RleHRfc2VsZWN0aW9uQhsKGV9zaG93X21lc3NhZ2Vfc2VuZF9idXR0b25CGwoZX3Nob3dfdGV4dGFyZWFfZm9jdXNfcmluZ0IdChtfZXNjYXBlX2V4aXRzX2tleWJvYXJkX21vZGVCIgogX3N5bmNfcmVkdWNlZF9tb3Rpb25fd2l0aF9zeXN0ZW1CGgoYX3JlZHVjZWRfbW90aW9uX292ZXJyaWRlQhgKFl9tZXNzYWdlX2dyb3VwX3NwYWNpbmdCEQoPX21lc3NhZ2VfZ3V0dGVyQgwKCl9mb250X3NpemVCJAoiX3Nob3dfdXNlcl9hdmF0YXJzX2luX2NvbXBhY3RfbW9kZUIhCh9fbW9iaWxlX3N0aWNrZXJfYW5pbWF0aW9uX3ZhbHVlQhwKGl9tb2JpbGVfZ2lmX2F1dG9wbGF5X3ZhbHVlQh0KG19tb2JpbGVfYW5pbWF0ZV9lbW9qaV92YWx1ZUISChBfc2hvd19naWZfYnV0dG9uQhQKEl9zaG93X21lbWVzX2J1dHRvbkIXChVfc2hvd19zdGlja2Vyc19idXR0b25CFAoSX3Nob3dfZW1vamlfYnV0dG9uQh0KG19zaG93X21lZGlhX2Zhdm9yaXRlX2J1dHRvbkIdChtfc2hvd19tZWRpYV9kb3dubG9hZF9idXR0b25CGwoZX3Nob3dfbWVkaWFfZGVsZXRlX2J1dHRvbkIeChxfc2hvd19zdXBwcmVzc19lbWJlZHNfYnV0dG9uQhUKE19zaG93X2dpZl9pbmRpY2F0b3JCIwohX3Nob3dfYXR0YWNobWVudF9leHBpcnlfaW5kaWNhdG9yQiUKI191c2VfYnJvd3Nlcl9sb2NhbGVfZm9yX3RpbWVfZm9ybWF0QikKJ19zaG93X3NlbGVjdGVkX2NoYW5uZWxfdHlwaW5nX2luZGljYXRvckIaChhfc2hvd19tZXNzYWdlX2FjdGlvbl9iYXJCKgooX3Nob3dfbWVzc2FnZV9hY3Rpb25fYmFyX3F1aWNrX3JlYWN0aW9uc0InCiVfc2hvd19tZXNzYWdlX2FjdGlvbl9iYXJfc2hpZnRfZXhwYW5kQisKKV9zaG93X21lc3NhZ2VfYWN0aW9uX2Jhcl9vbmx5X21vcmVfYnV0dG9uQiYKJF9zaG93X2RlZmF1bHRfZW1vamlzX2luX2F1dG9jb21wbGV0ZUIlCiNfc2hvd19jdXN0b21fZW1vamlzX2luX2F1dG9jb21wbGV0ZUIgCh5fc2hvd19zdGlja2Vyc19pbl9hdXRvY29tcGxldGVCHQobX3Nob3dfbWVtZXNfaW5fYXV0b2NvbXBsZXRlQisKKV92b2ljZV9jaGFubmVsX2pvaW5fcmVxdWlyZXNfZG91YmxlX2NsaWNrQhMKEV9jdXN0b21fdGhlbWVfY3NzQhEKD19zaG93X2Zhdm9yaXRlc0INCgtfem9vbV9sZXZlbEIVChNfZW5hYmxlX3R0c19jb21tYW5kQgsKCV90dHNfcmF0ZUImCiRfc2hvd19mYWRlZF91bnJlYWRfb25fbXV0ZWRfY2hhbm5lbHNCHgocX3Nob3dfY29udGV4dF9tZW51X3Nob3J0Y3V0c0IgCh5fY29uZmlybV9iZWZvcmVfc3RhcnRpbmdfY2FsbHNCFgoUX3ByZXNlcnZlX2VkaXRfZHJhZnRCIgogX3N0YXlfaW50ZXJhY3RpdmVfd2hlbl91bmZvY3VzZWRCKAomX2NvbmZpcm1fYmVmb3JlX2pvaW5pbmdfdm9pY2VfY2hhbm5lbHNCJgokX3NjcmVlbl9yZWFkZXJfYW5ub3VuY2VfbmV3X21lc3NhZ2VzQioKKF9maXJzdF9jbGlja19wYXNzX3Rocm91Z2hfd2hlbl91bmZvY3VzZWRCIAoeX2NvbXBhY3RfbWVzc2FnZV9ncm91cF9zcGFjaW5nQiMKIV9zY3JvbGxfdG9fYm90dG9tX29uX21lc3NhZ2Vfc2VuZEIZChdfZGltX3N0cmlrZXRocm91Z2hfdGV4dEIXChVfc2VxdWVudGlhbF9maWxlX3NlbmRCHwodX21vYmlsZV9zcGxhc2hfem9vbV9hbmltYXRpb24icQoWQWNjZXNzaWJpbGl0eU92ZXJyaWRlcxIaChJnaWZfYXV0b3BsYXlfZGlydHkYASABKAgSGwoTYW5pbWF0ZV9lbW9qaV9kaXJ0eRgCIAEoCBIeChZhbmltYXRlX3N0aWNrZXJzX2RpcnR5GAMgASgIKtIBChpDaGFubmVsVHlwaW5nSW5kaWNhdG9yTW9kZRItCilDSEFOTkVMX1RZUElOR19JTkRJQ0FUT1JfTU9ERV9VTlNQRUNJRklFRBAAEikKJUNIQU5ORUxfVFlQSU5HX0lORElDQVRPUl9NT0RFX0FWQVRBUlMQARIwCixDSEFOTkVMX1RZUElOR19JTkRJQ0FUT1JfTU9ERV9JTkRJQ0FUT1JfT05MWRACEigKJENIQU5ORUxfVFlQSU5HX0lORElDQVRPUl9NT0RFX0hJRERFThADKnoKEk1lZGlhRGltZW5zaW9uU2l6ZRIkCiBNRURJQV9ESU1FTlNJT05fU0laRV9VTlNQRUNJRklFRBAAEh4KGk1FRElBX0RJTUVOU0lPTl9TSVpFX1NNQUxMEAESHgoaTUVESUFfRElNRU5TSU9OX1NJWkVfTEFSR0UQAiqrAQoURG1NZXNzYWdlUHJldmlld01vZGUSJwojRE1fTUVTU0FHRV9QUkVWSUVXX01PREVfVU5TUEVDSUZJRUQQABIfChtETV9NRVNTQUdFX1BSRVZJRVdfTU9ERV9BTEwQARInCiNETV9NRVNTQUdFX1BSRVZJRVdfTU9ERV9VTlJFQURfT05MWRACEiAKHERNX01FU1NBR0VfUFJFVklFV19NT0RFX05PTkUQAypsCg5IZHJEaXNwbGF5TW9kZRIgChxIRFJfRElTUExBWV9NT0RFX1VOU1BFQ0lGSUVEEAASGQoVSERSX0RJU1BMQVlfTU9ERV9GVUxMEAESHQoZSERSX0RJU1BMQVlfTU9ERV9TVEFOREFSRBACYgZwcm90bzM");+ fileDesc("Ci5mbHV4ZXIvdXNlci9wcmVmZXJlbmNlcy92MS9hY2Nlc3NpYmlsaXR5LnByb3RvEhpmbHV4ZXIudXNlci5wcmVmZXJlbmNlcy52MSKHIgoVQWNjZXNzaWJpbGl0eVNldHRpbmdzEh4KEXNhdHVyYXRpb25fZmFjdG9yGAEgASgBSACIAQESHgoWYWx3YXlzX3VuZGVybGluZV9saW5rcxgCIAEoCBIiChVlbmFibGVfdGV4dF9zZWxlY3Rpb24YAyABKAhIAYgBARIlChhzaG93X21lc3NhZ2Vfc2VuZF9idXR0b24YBCABKAhIAogBARIlChhzaG93X3RleHRhcmVhX2ZvY3VzX3JpbmcYBSABKAhIA4gBARIbChNoaWRlX2tleWJvYXJkX2hpbnRzGAYgASgIEicKGmVzY2FwZV9leGl0c19rZXlib2FyZF9tb2RlGAcgASgISASIAQESLAofc3luY19yZWR1Y2VkX21vdGlvbl93aXRoX3N5c3RlbRgIIAEoCEgFiAEBEiQKF3JlZHVjZWRfbW90aW9uX292ZXJyaWRlGAkgASgISAaIAQESIgoVbWVzc2FnZV9ncm91cF9zcGFjaW5nGAogASgBSAeIAQESGwoObWVzc2FnZV9ndXR0ZXIYCyABKAFICIgBARIWCglmb250X3NpemUYDCABKAFICYgBARIuCiFzaG93X3VzZXJfYXZhdGFyc19pbl9jb21wYWN0X21vZGUYDSABKAhICogBARIrCiNtb2JpbGVfc3RpY2tlcl9hbmltYXRpb25fb3ZlcnJpZGRlbhgOIAEoCBImCh5tb2JpbGVfZ2lmX2F1dG9wbGF5X292ZXJyaWRkZW4YDyABKAgSJwofbW9iaWxlX2FuaW1hdGVfZW1vamlfb3ZlcnJpZGRlbhgQIAEoCBIrCh5tb2JpbGVfc3RpY2tlcl9hbmltYXRpb25fdmFsdWUYESABKAVIC4gBARImChltb2JpbGVfZ2lmX2F1dG9wbGF5X3ZhbHVlGBIgASgISAyIAQESJwoabW9iaWxlX2FuaW1hdGVfZW1vamlfdmFsdWUYEyABKAhIDYgBARIcChRhdXRvX3NlbmRfa2xpcHlfZ2lmcxgUIAEoCBIcCg9zaG93X2dpZl9idXR0b24YFSABKAhIDogBARIeChFzaG93X21lbWVzX2J1dHRvbhgWIAEoCEgPiAEBEiEKFHNob3dfc3RpY2tlcnNfYnV0dG9uGBcgASgISBCIAQESHgoRc2hvd19lbW9qaV9idXR0b24YGCABKAhIEYgBARInChpzaG93X21lZGlhX2Zhdm9yaXRlX2J1dHRvbhgZIAEoCEgSiAEBEicKGnNob3dfbWVkaWFfZG93bmxvYWRfYnV0dG9uGBogASgISBOIAQESJQoYc2hvd19tZWRpYV9kZWxldGVfYnV0dG9uGBsgASgISBSIAQESKAobc2hvd19zdXBwcmVzc19lbWJlZHNfYnV0dG9uGBwgASgISBWIAQESHwoSc2hvd19naWZfaW5kaWNhdG9yGB0gASgISBaIAQESLQogc2hvd19hdHRhY2htZW50X2V4cGlyeV9pbmRpY2F0b3IYHiABKAhIF4gBARIvCiJ1c2VfYnJvd3Nlcl9sb2NhbGVfZm9yX3RpbWVfZm9ybWF0GB8gASgISBiIAQESXQodY2hhbm5lbF90eXBpbmdfaW5kaWNhdG9yX21vZGUYICABKA4yNi5mbHV4ZXIudXNlci5wcmVmZXJlbmNlcy52MS5DaGFubmVsVHlwaW5nSW5kaWNhdG9yTW9kZRIzCiZzaG93X3NlbGVjdGVkX2NoYW5uZWxfdHlwaW5nX2luZGljYXRvchghIAEoCEgZiAEBEiQKF3Nob3dfbWVzc2FnZV9hY3Rpb25fYmFyGCIgASgISBqIAQESNAonc2hvd19tZXNzYWdlX2FjdGlvbl9iYXJfcXVpY2tfcmVhY3Rpb25zGCMgASgISBuIAQESMQokc2hvd19tZXNzYWdlX2FjdGlvbl9iYXJfc2hpZnRfZXhwYW5kGCQgASgISByIAQESNQooc2hvd19tZXNzYWdlX2FjdGlvbl9iYXJfb25seV9tb3JlX2J1dHRvbhglIAEoCEgdiAEBEjAKI3Nob3dfZGVmYXVsdF9lbW9qaXNfaW5fYXV0b2NvbXBsZXRlGCYgASgISB6IAQESLwoic2hvd19jdXN0b21fZW1vamlzX2luX2F1dG9jb21wbGV0ZRgnIAEoCEgfiAEBEioKHXNob3dfc3RpY2tlcnNfaW5fYXV0b2NvbXBsZXRlGCggASgISCCIAQESJwoac2hvd19tZW1lc19pbl9hdXRvY29tcGxldGUYKSABKAhIIYgBARI1Cih2b2ljZV9jaGFubmVsX2pvaW5fcmVxdWlyZXNfZG91YmxlX2NsaWNrGCwgASgISCKIAQESHQoQY3VzdG9tX3RoZW1lX2NzcxgtIAEoCUgjiAEBEhsKDnNob3dfZmF2b3JpdGVzGC4gASgISCSIAQESFwoKem9vbV9sZXZlbBgvIAEoAUgliAEBElEKF2RtX21lc3NhZ2VfcHJldmlld19tb2RlGDAgASgOMjAuZmx1eGVyLnVzZXIucHJlZmVyZW5jZXMudjEuRG1NZXNzYWdlUHJldmlld01vZGUSHwoSZW5hYmxlX3R0c19jb21tYW5kGDEgASgISCaIAQESFQoIdHRzX3JhdGUYMiABKAFIJ4gBARIwCiNzaG93X2ZhZGVkX3VucmVhZF9vbl9tdXRlZF9jaGFubmVscxgzIAEoCEgoiAEBEigKG3Nob3dfY29udGV4dF9tZW51X3Nob3J0Y3V0cxg0IAEoCEgpiAEBEioKHWNvbmZpcm1fYmVmb3JlX3N0YXJ0aW5nX2NhbGxzGDUgASgISCqIAQESRAoQaGRyX2Rpc3BsYXlfbW9kZRg2IAEoDjIqLmZsdXhlci51c2VyLnByZWZlcmVuY2VzLnYxLkhkckRpc3BsYXlNb2RlEiAKE3ByZXNlcnZlX2VkaXRfZHJhZnQYNyABKAhIK4gBARIsCh9zdGF5X2ludGVyYWN0aXZlX3doZW5fdW5mb2N1c2VkGDggASgISCyIAQESMgolY29uZmlybV9iZWZvcmVfam9pbmluZ192b2ljZV9jaGFubmVscxg5IAEoCEgtiAEBEjAKI3NjcmVlbl9yZWFkZXJfYW5ub3VuY2VfbmV3X21lc3NhZ2VzGDogASgISC6IAQESNAonZmlyc3RfY2xpY2tfcGFzc190aHJvdWdoX3doZW5fdW5mb2N1c2VkGDsgASgISC+IAQESKgodY29tcGFjdF9tZXNzYWdlX2dyb3VwX3NwYWNpbmcYPCABKAFIMIgBARItCiBzY3JvbGxfdG9fYm90dG9tX29uX21lc3NhZ2Vfc2VuZBg9IAEoCEgxiAEBEiMKFmRpbV9zdHJpa2V0aHJvdWdoX3RleHQYPiABKAhIMogBARIhChRzZXF1ZW50aWFsX2ZpbGVfc2VuZBg/IAEoCEgziAEBEikKHG1vYmlsZV9zcGxhc2hfem9vbV9hbmltYXRpb24YQCABKAhINIgBAUIUChJfc2F0dXJhdGlvbl9mYWN0b3JCGAoWX2VuYWJsZV90ZXh0X3NlbGVjdGlvbkIbChlfc2hvd19tZXNzYWdlX3NlbmRfYnV0dG9uQhsKGV9zaG93X3RleHRhcmVhX2ZvY3VzX3JpbmdCHQobX2VzY2FwZV9leGl0c19rZXlib2FyZF9tb2RlQiIKIF9zeW5jX3JlZHVjZWRfbW90aW9uX3dpdGhfc3lzdGVtQhoKGF9yZWR1Y2VkX21vdGlvbl9vdmVycmlkZUIYChZfbWVzc2FnZV9ncm91cF9zcGFjaW5nQhEKD19tZXNzYWdlX2d1dHRlckIMCgpfZm9udF9zaXplQiQKIl9zaG93X3VzZXJfYXZhdGFyc19pbl9jb21wYWN0X21vZGVCIQofX21vYmlsZV9zdGlja2VyX2FuaW1hdGlvbl92YWx1ZUIcChpfbW9iaWxlX2dpZl9hdXRvcGxheV92YWx1ZUIdChtfbW9iaWxlX2FuaW1hdGVfZW1vamlfdmFsdWVCEgoQX3Nob3dfZ2lmX2J1dHRvbkIUChJfc2hvd19tZW1lc19idXR0b25CFwoVX3Nob3dfc3RpY2tlcnNfYnV0dG9uQhQKEl9zaG93X2Vtb2ppX2J1dHRvbkIdChtfc2hvd19tZWRpYV9mYXZvcml0ZV9idXR0b25CHQobX3Nob3dfbWVkaWFfZG93bmxvYWRfYnV0dG9uQhsKGV9zaG93X21lZGlhX2RlbGV0ZV9idXR0b25CHgocX3Nob3dfc3VwcHJlc3NfZW1iZWRzX2J1dHRvbkIVChNfc2hvd19naWZfaW5kaWNhdG9yQiMKIV9zaG93X2F0dGFjaG1lbnRfZXhwaXJ5X2luZGljYXRvckIlCiNfdXNlX2Jyb3dzZXJfbG9jYWxlX2Zvcl90aW1lX2Zvcm1hdEIpCidfc2hvd19zZWxlY3RlZF9jaGFubmVsX3R5cGluZ19pbmRpY2F0b3JCGgoYX3Nob3dfbWVzc2FnZV9hY3Rpb25fYmFyQioKKF9zaG93X21lc3NhZ2VfYWN0aW9uX2Jhcl9xdWlja19yZWFjdGlvbnNCJwolX3Nob3dfbWVzc2FnZV9hY3Rpb25fYmFyX3NoaWZ0X2V4cGFuZEIrCilfc2hvd19tZXNzYWdlX2FjdGlvbl9iYXJfb25seV9tb3JlX2J1dHRvbkImCiRfc2hvd19kZWZhdWx0X2Vtb2ppc19pbl9hdXRvY29tcGxldGVCJQojX3Nob3dfY3VzdG9tX2Vtb2ppc19pbl9hdXRvY29tcGxldGVCIAoeX3Nob3dfc3RpY2tlcnNfaW5fYXV0b2NvbXBsZXRlQh0KG19zaG93X21lbWVzX2luX2F1dG9jb21wbGV0ZUIrCilfdm9pY2VfY2hhbm5lbF9qb2luX3JlcXVpcmVzX2RvdWJsZV9jbGlja0ITChFfY3VzdG9tX3RoZW1lX2Nzc0IRCg9fc2hvd19mYXZvcml0ZXNCDQoLX3pvb21fbGV2ZWxCFQoTX2VuYWJsZV90dHNfY29tbWFuZEILCglfdHRzX3JhdGVCJgokX3Nob3dfZmFkZWRfdW5yZWFkX29uX211dGVkX2NoYW5uZWxzQh4KHF9zaG93X2NvbnRleHRfbWVudV9zaG9ydGN1dHNCIAoeX2NvbmZpcm1fYmVmb3JlX3N0YXJ0aW5nX2NhbGxzQhYKFF9wcmVzZXJ2ZV9lZGl0X2RyYWZ0QiIKIF9zdGF5X2ludGVyYWN0aXZlX3doZW5fdW5mb2N1c2VkQigKJl9jb25maXJtX2JlZm9yZV9qb2luaW5nX3ZvaWNlX2NoYW5uZWxzQiYKJF9zY3JlZW5fcmVhZGVyX2Fubm91bmNlX25ld19tZXNzYWdlc0IqCihfZmlyc3RfY2xpY2tfcGFzc190aHJvdWdoX3doZW5fdW5mb2N1c2VkQiAKHl9jb21wYWN0X21lc3NhZ2VfZ3JvdXBfc3BhY2luZ0IjCiFfc2Nyb2xsX3RvX2JvdHRvbV9vbl9tZXNzYWdlX3NlbmRCGQoXX2RpbV9zdHJpa2V0aHJvdWdoX3RleHRCFwoVX3NlcXVlbnRpYWxfZmlsZV9zZW5kQh8KHV9tb2JpbGVfc3BsYXNoX3pvb21fYW5pbWF0aW9uSgQIKhArSgQIKxAsUh9hdHRhY2htZW50X21lZGlhX2RpbWVuc2lvbl9zaXplUhplbWJlZF9tZWRpYV9kaW1lbnNpb25fc2l6ZSJxChZBY2Nlc3NpYmlsaXR5T3ZlcnJpZGVzEhoKEmdpZl9hdXRvcGxheV9kaXJ0eRgBIAEoCBIbChNhbmltYXRlX2Vtb2ppX2RpcnR5GAIgASgIEh4KFmFuaW1hdGVfc3RpY2tlcnNfZGlydHkYAyABKAgq0gEKGkNoYW5uZWxUeXBpbmdJbmRpY2F0b3JNb2RlEi0KKUNIQU5ORUxfVFlQSU5HX0lORElDQVRPUl9NT0RFX1VOU1BFQ0lGSUVEEAASKQolQ0hBTk5FTF9UWVBJTkdfSU5ESUNBVE9SX01PREVfQVZBVEFSUxABEjAKLENIQU5ORUxfVFlQSU5HX0lORElDQVRPUl9NT0RFX0lORElDQVRPUl9PTkxZEAISKAokQ0hBTk5FTF9UWVBJTkdfSU5ESUNBVE9SX01PREVfSElEREVOEAMqqwEKFERtTWVzc2FnZVByZXZpZXdNb2RlEicKI0RNX01FU1NBR0VfUFJFVklFV19NT0RFX1VOU1BFQ0lGSUVEEAASHwobRE1fTUVTU0FHRV9QUkVWSUVXX01PREVfQUxMEAESJwojRE1fTUVTU0FHRV9QUkVWSUVXX01PREVfVU5SRUFEX09OTFkQAhIgChxETV9NRVNTQUdFX1BSRVZJRVdfTU9ERV9OT05FEAMqbAoOSGRyRGlzcGxheU1vZGUSIAocSERSX0RJU1BMQVlfTU9ERV9VTlNQRUNJRklFRBAAEhkKFUhEUl9ESVNQTEFZX01PREVfRlVMTBABEh0KGUhEUl9ESVNQTEFZX01PREVfU1RBTkRBUkQQAmIGcHJvdG8z");/*** @generated from message fluxer.user.preferences.v1.AccessibilitySettings@@ -217,16 +217,6 @@ export type AccessibilitySettings = Message<"fluxer.user.preferences.v1.Accessib*/showMemesInAutocomplete?: boolean | undefined;- /**- * @generated from field: fluxer.user.preferences.v1.MediaDimensionSize attachment_media_dimension_size = 42;- */- attachmentMediaDimensionSize: MediaDimensionSize;-- /**- * @generated from field: fluxer.user.preferences.v1.MediaDimensionSize embed_media_dimension_size = 43;- */- embedMediaDimensionSize: MediaDimensionSize;-/*** @generated from field: optional bool voice_channel_join_requires_double_click = 44;*/@@ -398,32 +388,6 @@ export enum ChannelTypingIndicatorMode {export const ChannelTypingIndicatorModeSchema: GenEnum<ChannelTypingIndicatorMode> = /*@__PURE__*/enumDesc(file_fluxer_user_preferences_v1_accessibility, 0);-/**- * @generated from enum fluxer.user.preferences.v1.MediaDimensionSize- */-export enum MediaDimensionSize {- /**- * @generated from enum value: MEDIA_DIMENSION_SIZE_UNSPECIFIED = 0;- */- UNSPECIFIED = 0,-- /**- * @generated from enum value: MEDIA_DIMENSION_SIZE_SMALL = 1;- */- SMALL = 1,-- /**- * @generated from enum value: MEDIA_DIMENSION_SIZE_LARGE = 2;- */- LARGE = 2,-}--/**- * Describes the enum fluxer.user.preferences.v1.MediaDimensionSize.- */-export const MediaDimensionSizeSchema: GenEnum<MediaDimensionSize> = /*@__PURE__*/- enumDesc(file_fluxer_user_preferences_v1_accessibility, 1);-/*** @generated from enum fluxer.user.preferences.v1.DmMessagePreviewMode*/@@ -453,7 +417,7 @@ export enum DmMessagePreviewMode {* Describes the enum fluxer.user.preferences.v1.DmMessagePreviewMode.*/export const DmMessagePreviewModeSchema: GenEnum<DmMessagePreviewMode> = /*@__PURE__*/- enumDesc(file_fluxer_user_preferences_v1_accessibility, 2);+ enumDesc(file_fluxer_user_preferences_v1_accessibility, 1);/*** @generated from enum fluxer.user.preferences.v1.HdrDisplayMode@@ -479,4 +443,4 @@ export enum HdrDisplayMode {* Describes the enum fluxer.user.preferences.v1.HdrDisplayMode.*/export const HdrDisplayModeSchema: GenEnum<HdrDisplayMode> = /*@__PURE__*/- enumDesc(file_fluxer_user_preferences_v1_accessibility, 3);+ enumDesc(file_fluxer_user_preferences_v1_accessibility, 2);