diff --git a/src/analytics/features/types.ts b/src/analytics/features/types.ts index 39df48e532..c8a8cd72d9 100644 --- a/src/analytics/features/types.ts +++ b/src/analytics/features/types.ts @@ -9,8 +9,6 @@ export enum Features { ImportContactsOnboardingDisable = 'import_contacts:onboarding:disable', ImportContactsSettingsDisable = 'import_contacts:settings:disable', LiveNowBetaDisable = 'live_now_beta:disable', - ImageUploadsHighResolution = 'image_uploads:high_resolution', - ImageUploadsBlobSize2mbEnabled = 'image_uploads:blob_size_2mb:enabled', GroupChatsEnable = 'group_chats:enable', GroupChatsHasBeenReleased = 'group_chats:has_been_released', DmsNewMessageComposerEnable = 'dms:new_message_composer:enable', diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts index 1edc8c8016..d9a026ca83 100644 --- a/src/lib/api/index.ts +++ b/src/lib/api/index.ts @@ -51,16 +51,10 @@ interface PostOpts { langs?: string[] } -type FeatureFlags = { - highResolutionImages?: boolean - increasedBlobSizeLimit?: boolean -} - export async function post( agent: BskyAgent, queryClient: QueryClient, opts: PostOpts, - featureFlags?: FeatureFlags, ) { const thread = opts.thread opts.onStateChange?.(t`Processing...`) @@ -97,7 +91,6 @@ export async function post( queryClient, draft, opts.onStateChange, - featureFlags, ) let labels: $Typed | undefined if (draft.labels.length) { @@ -257,7 +250,6 @@ async function resolveEmbed( queryClient: QueryClient, draft: PostDraft, onStateChange: ((state: string) => void) | undefined, - featureFlags?: FeatureFlags, ): Promise< | $Typed | $Typed @@ -268,13 +260,7 @@ async function resolveEmbed( > { if (draft.embed.quote) { const [resolvedMedia, resolvedQuote] = await Promise.all([ - resolveMedia( - agent, - queryClient, - draft.embed, - onStateChange, - featureFlags, - ), + resolveMedia(agent, queryClient, draft.embed, onStateChange), resolveRecord(agent, queryClient, draft.embed.quote.uri), ]) if (resolvedMedia) { @@ -297,7 +283,6 @@ async function resolveEmbed( queryClient, draft.embed, onStateChange, - featureFlags, ) if (resolvedMedia) { return resolvedMedia @@ -323,7 +308,6 @@ async function resolveMedia( queryClient: QueryClient, embedDraft: EmbedDraft, onStateChange: ((state: string) => void) | undefined, - featureFlags?: FeatureFlags, ): Promise< | $Typed | $Typed @@ -339,10 +323,7 @@ async function resolveMedia( const images: AppBskyEmbedImages.Image[] = await Promise.all( imagesDraft.map(async (image, i) => { logger.debug(`Compressing image #${i}`) - const {path, width, height, mime} = await compressImage(image, { - highResolution: featureFlags?.highResolutionImages, - increasedBlobSizeLimit: featureFlags?.increasedBlobSizeLimit, - }) + const {path, width, height, mime} = await compressImage(image) logger.debug(`Uploading image #${i}`) const res = await uploadBlob(agent, path, mime) return { diff --git a/src/state/gallery.ts b/src/state/gallery.ts index c9c7f37750..e1c1541bc3 100644 --- a/src/state/gallery.ts +++ b/src/state/gallery.ts @@ -13,7 +13,6 @@ import { } from 'expo-image-manipulator' import {nanoid} from 'nanoid/non-secure' -import {POST_IMG_MAX} from '#/lib/constants' import {getImageDim} from '#/lib/media/manip' import {openCropper} from '#/lib/media/picker' import {type PickerImage} from '#/lib/media/picker.shared' @@ -202,19 +201,12 @@ export function resetImageManipulation( return img } -export async function compressImage( - img: ComposerImage, - options?: { - highResolution?: boolean - increasedBlobSizeLimit?: boolean - }, -): Promise { +export async function compressImage(img: ComposerImage): Promise { const source = img.transformed || img.source - const highResolution = options?.highResolution ?? false let attempts = 0 - let maxDimension = highResolution ? 4000 : POST_IMG_MAX.width - let maxBytes = options?.increasedBlobSizeLimit ? 2000000 : POST_IMG_MAX.size + let maxDimension = 4000 + let maxBytes = 2000000 let minQualityPercentage = 0 let maxQualityPercentage = 101 // exclusive diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx index 7299abcb1b..5c9f1a05fe 100644 --- a/src/view/com/composer/Composer.tsx +++ b/src/view/com/composer/Composer.tsx @@ -877,24 +877,12 @@ export const ComposePost = ({ try { logger.info(`composer: posting...`) postUri = ( - await apilib.post( - agent, - queryClient, - { - thread: filteredThread, - replyTo: replyTo?.uri, - onStateChange: setPublishingStage, - langs: currentLanguages, - }, - { - highResolutionImages: ax.features.enabled( - ax.features.ImageUploadsHighResolution, - ), - increasedBlobSizeLimit: ax.features.enabled( - ax.features.ImageUploadsBlobSize2mbEnabled, - ), - }, - ) + await apilib.post(agent, queryClient, { + thread: filteredThread, + replyTo: replyTo?.uri, + onStateChange: setPublishingStage, + langs: currentLanguages, + }) ).uris[0] /*