pepepper/fluxer
1
0 Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-17 13:05:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(premium): reflect limit config flags in plan comparisons (#3319)

Browse Source
This commit is contained in:
Hampus authored and GitHub committed 2026-10-08 20:33:20 +02:00
1 parent acc1392a53
commit 94f1239050
4 files changed
+49 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fluxer_app/src/features/app/components/dialogs/components/FeatureComparisonTable.tsx
+8 -4
View File
@@ -139,8 +139,10 @@ export const FeatureComparisonTable = observer(() => {
<ComparisonCheckRow
key={perk.id}
feature={label}
restrictedHas={perk.restrictedValue}
stockHas={perk.stockValue}
restrictedHas={
perk.limitKey ? Limits.hasRestrictedFeature(perk.limitKey, perk.restrictedValue) : perk.restrictedValue
}
stockHas={perk.limitKey ? Limits.hasStockFeature(perk.limitKey, perk.stockValue) : perk.stockValue}
data-flx="app.feature-comparison-table.render-perk-row.comparison-check-row"
/>
);
@@ -157,9 +159,11 @@ export const FeatureComparisonTable = observer(() => {
);
}
if (isTextTierPerk(perk)) {
const restrictedLabel =
const lowLabel =
perkLabels[perk.restrictedValueI18nKey as keyof typeof perkLabels] || perk.restrictedValueI18nKey;
const stockLabel = perkLabels[perk.stockValueI18nKey as keyof typeof perkLabels] || perk.stockValueI18nKey;
const highLabel = perkLabels[perk.stockValueI18nKey as keyof typeof perkLabels] || perk.stockValueI18nKey;
const restrictedLabel = perk.limitKey && Limits.hasRestrictedFeature(perk.limitKey, false) ? highLabel : lowLabel;
const stockLabel = !perk.limitKey || Limits.hasStockFeature(perk.limitKey, true) ? highLabel : lowLabel;
return (
<ComparisonRow
key={perk.id}
fluxer_app/src/features/app/utils/UserLimits.ts
+8
View File
@@ -102,6 +102,14 @@ class LimitsClass {
return LimitResolver.resolveFree(key, fallback);
}
hasStockFeature(key: LimitKey, fallback: boolean): boolean {
return this.getStockValue(key, fallback ? 1 : 0) > 0;
}
hasRestrictedFeature(key: LimitKey, fallback: boolean): boolean {
return this.getRestrictedValue(key, fallback ? 1 : 0) > 0;
}
getPremiumValue(key: LimitKey, fallback: number): number {
return this.getStockValue(key, fallback);
}
fluxer_app/src/features/premium/components/plutonium_page/PlutoniumPageComparison.tsx
+24 -4
View File
@@ -127,8 +127,16 @@ function buildRows(locale: string, translate: (descriptor: MessageDescriptor) =>
id: perk.id,
icon: definition.icon,
label: definition.label,
free: {kind: 'boolean', value: perk.restrictedValue},
premium: {kind: 'boolean', value: perk.stockValue},
free: {
kind: 'boolean',
value: perk.limitKey
? Limits.hasRestrictedFeature(perk.limitKey, perk.restrictedValue)
: perk.restrictedValue,
},
premium: {
kind: 'boolean',
value: perk.limitKey ? Limits.hasStockFeature(perk.limitKey, perk.stockValue) : perk.stockValue,
},
});
continue;
}
@@ -142,12 +150,24 @@ function buildRows(locale: string, translate: (descriptor: MessageDescriptor) =>
});
continue;
}
const freeHasHighQuality = perk.limitKey ? Limits.hasRestrictedFeature(perk.limitKey, false) : false;
const premiumHasHighQuality = perk.limitKey ? Limits.hasStockFeature(perk.limitKey, true) : true;
rows.push({
id: perk.id,
icon: definition.icon,
label: definition.label,
free: {kind: 'text', value: translate(PERK_VIDEO_QUALITY_FREE_DESCRIPTOR)},
premium: {kind: 'text', value: translate(PERK_VIDEO_QUALITY_PREMIUM_DESCRIPTOR)},
free: {
kind: 'text',
value: translate(
freeHasHighQuality ? PERK_VIDEO_QUALITY_PREMIUM_DESCRIPTOR : PERK_VIDEO_QUALITY_FREE_DESCRIPTOR,
),
},
premium: {
kind: 'text',
value: translate(
premiumHasHighQuality ? PERK_VIDEO_QUALITY_PREMIUM_DESCRIPTOR : PERK_VIDEO_QUALITY_FREE_DESCRIPTOR,
),
},
});
}
return rows;
packages/constants/src/LimitTierPerks.ts
+9
View File
@@ -16,6 +16,7 @@ export interface BooleanTierPerk extends BasePerk {
type: 'boolean';
restrictedValue: boolean;
stockValue: boolean;
limitKey?: LimitKey;
}
export interface NumericTierPerk extends BasePerk {
@@ -30,6 +31,7 @@ export interface TextTierPerk extends BasePerk {
type: 'text';
restrictedValueI18nKey: string;
stockValueI18nKey: string;
limitKey?: LimitKey;
}
export type LimitTierPerk = BooleanTierPerk | NumericTierPerk | TextTierPerk;
@@ -54,6 +56,7 @@ export const LIMIT_TIER_PERKS: ReadonlyArray<LimitTierPerk> = [
i18nKey: 'custom_4_digit_username_tag',
restrictedValue: false,
stockValue: true,
limitKey: 'feature_custom_discriminator',
},
{
id: 'per_guild_profiles',
@@ -62,6 +65,7 @@ export const LIMIT_TIER_PERKS: ReadonlyArray<LimitTierPerk> = [
i18nKey: 'per_community_profiles',
restrictedValue: false,
stockValue: true,
limitKey: 'feature_per_guild_profiles',
},
{
id: 'profile_badge',
@@ -88,6 +92,7 @@ export const LIMIT_TIER_PERKS: ReadonlyArray<LimitTierPerk> = [
i18nKey: 'entrance_sounds',
restrictedValue: false,
stockValue: true,
limitKey: 'feature_voice_entrance_sounds',
},
{
id: 'max_guilds',
@@ -154,6 +159,7 @@ export const LIMIT_TIER_PERKS: ReadonlyArray<LimitTierPerk> = [
i18nKey: 'global_emoji_sticker_access',
restrictedValue: false,
stockValue: true,
limitKey: 'feature_global_expressions',
},
{
id: 'video_quality',
@@ -162,6 +168,7 @@ export const LIMIT_TIER_PERKS: ReadonlyArray<LimitTierPerk> = [
i18nKey: 'video_quality',
restrictedValueI18nKey: 'video_quality_restricted',
stockValueI18nKey: 'video_quality_stock',
limitKey: 'feature_higher_video_quality',
},
{
id: 'animated_profile',
@@ -170,6 +177,7 @@ export const LIMIT_TIER_PERKS: ReadonlyArray<LimitTierPerk> = [
i18nKey: 'animated_avatars_and_banners',
restrictedValue: false,
stockValue: true,
limitKey: 'feature_animated_avatar',
},
{
id: 'early_access',
@@ -178,6 +186,7 @@ export const LIMIT_TIER_PERKS: ReadonlyArray<LimitTierPerk> = [
i18nKey: 'early_access',
restrictedValue: false,
stockValue: true,
limitKey: 'feature_early_access',
},
{
id: 'custom_themes',