From d81f57d2ad24ab9176a6d342f427676065c0f5f6 Mon Sep 17 00:00:00 2001 From: Stephen Zhou Date: Fri, 20 Sep 2024 19:05:29 +0800 Subject: [PATCH] feat: read image proxy url from ab value --- apps/renderer/src/hooks/biz/useAb.ts | 9 +++++++-- apps/renderer/src/lib/img-proxy.ts | 9 ++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/apps/renderer/src/hooks/biz/useAb.ts b/apps/renderer/src/hooks/biz/useAb.ts index 3eddbb14f..213704f5c 100644 --- a/apps/renderer/src/hooks/biz/useAb.ts +++ b/apps/renderer/src/hooks/biz/useAb.ts @@ -17,8 +17,9 @@ export const useAb = (feature: FeatureKeys) => { return isEnabled } -export const getAbValue = (feature: FeatureKeys) => { - const enabled = PostHog.getFeatureFlag(feature) +export const isAbEnabled = (feature: FeatureKeys) => { + const featureFlag = PostHog.getFeatureFlag(feature) + const enabled = typeof featureFlag === "boolean" ? featureFlag : featureFlag === "enabled" const debugOverride = jotaiStore.get(debugFeaturesAtom) const isEnableOverride = jotaiStore.get(enableDebugOverrideAtom) @@ -29,3 +30,7 @@ export const getAbValue = (feature: FeatureKeys) => { return enabled } + +export const getAbValue = (feature: FeatureKeys) => { + return PostHog.getFeatureFlagPayload(feature) +} diff --git a/apps/renderer/src/lib/img-proxy.ts b/apps/renderer/src/lib/img-proxy.ts index c839c3937..9b61011b1 100644 --- a/apps/renderer/src/lib/img-proxy.ts +++ b/apps/renderer/src/lib/img-proxy.ts @@ -1,7 +1,6 @@ -import { env } from "@follow/shared/env" import { imageRefererMatches } from "@follow/shared/image" -import { getAbValue } from "~/hooks/biz/useAb" +import { getAbValue, isAbEnabled } from "~/hooks/biz/useAb" export const getImageProxyUrl = ({ url, @@ -12,10 +11,10 @@ export const getImageProxyUrl = ({ width: number height: number }) => { - if (getAbValue("Image_Proxy_V2")) { - return `${env.VITE_IMGPROXY_URL}?url=${encodeURIComponent(url)}&width=${width}&height=${height}` + if (isAbEnabled("Image_Proxy_V2")) { + return `${getAbValue("Image_Proxy_V2")}?url=${encodeURIComponent(url)}&width=${width}&height=${height}` } else { - return `${env.VITE_IMGPROXY_URL}/unsafe/fit-in/${width}x${height}/${encodeURIComponent(url)}` + return `${getAbValue("Image_Proxy_V2")}/unsafe/fit-in/${width}x${height}/${encodeURIComponent(url)}` } }