Skip to content

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

TypeScript fluxerfluxerapp

fix(operator-pass): settings links, badge date switch (#3794)

Hampus8a460aa94d64
diff --git a/fluxer_api/src/api/operator_pass/OperatorPassEntitlementService.ts b/fluxer_api/src/api/operator_pass/OperatorPassEntitlementService.ts
index 49c3e32bc..d7e62ddd1 100644
--- a/fluxer_api/src/api/operator_pass/OperatorPassEntitlementService.ts
+++ b/fluxer_api/src/api/operator_pass/OperatorPassEntitlementService.ts
@@ -139,7 +139,8 @@ export function profileOperatorPassSince(params: {
const holder = resolveOperatorPassHolder(state);
if (
!holder ||
- (!isOwner && (user.hiddenProfileBadges.has('operator_pass') || isOperatorPassTimestampHidden(user.premiumFlags)))
+ isOperatorPassTimestampHidden(user.premiumFlags) ||
+ (!isOwner && user.hiddenProfileBadges.has('operator_pass'))
) {
return null;
}
diff --git a/fluxer_api/src/api/user/profile_badges/ProfileBadgeBuilder.ts b/fluxer_api/src/api/user/profile_badges/ProfileBadgeBuilder.ts
index bf2ba1919..f59cc1f46 100644
--- a/fluxer_api/src/api/user/profile_badges/ProfileBadgeBuilder.ts
+++ b/fluxer_api/src/api/user/profile_badges/ProfileBadgeBuilder.ts
@@ -46,22 +46,22 @@ export interface ProfileBadgeInput {
environment: ProfileBadgeEnvironment;
restricted?: boolean;
profileHidden?: boolean;
- viewerIsSelf?: boolean;
}
type ViewSource = Omit<ProfileBadgeView, 'shown'> & {customBadgeIds: ReadonlySet<bigint>};
const NO_HIDDEN_BADGES: ReadonlySet<ProfileBadgeKey> = new Set();
-function publicOperatorPass(
- holder: OperatorPassHolder | null,
- user: ProfileBadgeSubject,
- viewerIsSelf: boolean,
-): VisibleOperatorPass | null {
+function visibleOperatorPass(holder: OperatorPassHolder, user: ProfileBadgeSubject): VisibleOperatorPass {
+ return {
+ since: isOperatorPassTimestampHidden(user.premiumFlags) ? null : holder.since,
+ count: isOperatorPassCountHidden(user.premiumFlags) ? null : holder.count,
+ };
+}
+
+function publicOperatorPass(holder: OperatorPassHolder | null, user: ProfileBadgeSubject): VisibleOperatorPass | null {
if (!holder || user.hiddenProfileBadges.has('operator_pass')) return null;
- const since = !viewerIsSelf && isOperatorPassTimestampHidden(user.premiumFlags) ? null : holder.since;
- const count = !viewerIsSelf && isOperatorPassCountHidden(user.premiumFlags) ? null : holder.count;
- return {since, count};
+ return visibleOperatorPass(holder, user);
}
function publicViewSource(input: ProfileBadgeInput): ViewSource | null {
@@ -77,7 +77,7 @@ function publicViewSource(input: ProfileBadgeInput): ViewSource | null {
selfHosted: environment.selfHosted,
restricted,
}),
- operatorPass: restricted ? null : publicOperatorPass(input.operatorPass, user, input.viewerIsSelf === true),
+ operatorPass: restricted ? null : publicOperatorPass(input.operatorPass, user),
environment,
locale: resolveContentLocale(input.locale),
customBadgeIds: new Set([...user.badgeIds].filter((id) => !hidden.has(customProfileBadgeKey(id.toString())))),
@@ -94,7 +94,7 @@ function heldViewSource(input: ProfileBadgeInput, premiumFlags: number): ViewSou
selfHosted: environment.selfHosted,
restricted: false,
}),
- operatorPass: input.operatorPass ? {since: input.operatorPass.since, count: input.operatorPass.count} : null,
+ operatorPass: input.operatorPass ? visibleOperatorPass(input.operatorPass, input.user) : null,
environment,
locale: resolveContentLocale(input.locale),
customBadgeIds: user.badgeIds,
diff --git a/fluxer_api/src/api/user/services/UserAccountRequestService.ts b/fluxer_api/src/api/user/services/UserAccountRequestService.ts
index 99b312788..2784ba777 100644
--- a/fluxer_api/src/api/user/services/UserAccountRequestService.ts
+++ b/fluxer_api/src/api/user/services/UserAccountRequestService.ts
@@ -416,7 +416,6 @@ export class UserAccountRequestService {
environment: badgeEnvironment,
restricted: restrictProfile,
profileHidden: hidden,
- viewerIsSelf,
};
const profileBadges = buildProfileBadges(badgeInput);
const hiddenProfileBadgeCount = viewerIsSelf
diff --git a/fluxer_app/src/features/premium/utils/BillingTabVisibility.ts b/fluxer_app/src/features/premium/utils/BillingTabVisibility.ts
index ca5f75227..be2a1812c 100644
--- a/fluxer_app/src/features/premium/utils/BillingTabVisibility.ts
+++ b/fluxer_app/src/features/premium/utils/BillingTabVisibility.ts
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
+import {isOperatorPassBenefitsRemoved} from '@app/features/premium/utils/OperatorPassPassRows';
import {getSubscriptionStatus} from '@app/features/premium/utils/SubscriptionStatus';
import type {User} from '@app/features/user/models/User';
import type {OperatorPassPassesResponse} from '@fluxer/schema/src/domains/operator_pass/OperatorPassSchemas';
@@ -38,3 +39,17 @@ export function holdsOperatorPass(
holdings.visionary?.state === 'ended'
);
}
+
+export function showsOperatorPassWallSettings(
+ user: Pick<User, 'operatorPassSince'> | null,
+ holdings: OperatorPassPassesResponse | null,
+): boolean {
+ return user?.operatorPassSince != null || (holdings != null && isOperatorPassBenefitsRemoved(holdings));
+}
+
+export function showsOperatorPassLabsSettings(
+ user: Pick<User, 'operatorPassSince'> | null,
+ holdings: OperatorPassPassesResponse | null,
+): boolean {
+ return holdings?.labs != null && user?.operatorPassSince != null;
+}
diff --git a/fluxer_app/src/features/user/components/modals/tabs/operator_pass_tab/OperatorPassLabsGreetingSetting.tsx b/fluxer_app/src/features/user/components/modals/tabs/operator_pass_tab/OperatorPassLabsGreetingSetting.tsx
index e3dc92a33..55ecb3164 100644
--- a/fluxer_app/src/features/user/components/modals/tabs/operator_pass_tab/OperatorPassLabsGreetingSetting.tsx
+++ b/fluxer_app/src/features/user/components/modals/tabs/operator_pass_tab/OperatorPassLabsGreetingSetting.tsx
@@ -9,6 +9,7 @@ import {
LABS_GREETING_LABEL_DESCRIPTOR,
} from '@app/features/premium/components/operator_pass/OperatorPassLabsGreetingField';
import OperatorPassHoldings from '@app/features/premium/state/OperatorPassHoldings';
+import {showsOperatorPassLabsSettings} from '@app/features/premium/utils/BillingTabVisibility';
import {WALL_SAVE_FAILED_DESCRIPTOR} from '@app/features/premium/utils/PremiumMessageDescriptors';
import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
import * as ToastCommands from '@app/features/ui/commands/ToastCommands';
@@ -35,7 +36,7 @@ export const OperatorPassLabsGreetingSetting = observer(function OperatorPassLab
const {i18n} = useLingui();
const [saving, setSaving] = useState(false);
const labs = OperatorPassHoldings.passes?.labs;
- if (!labs || Users.currentUser?.operatorPassSince == null) return null;
+ if (!labs || !showsOperatorPassLabsSettings(Users.currentUser, OperatorPassHoldings.passes)) return null;
const handleChange = async (greeting: boolean) => {
setSaving(true);
try {
diff --git a/fluxer_app/src/features/user/components/settings_utils/section_registry/GeneralSettingsSections.ts b/fluxer_app/src/features/user/components/settings_utils/section_registry/GeneralSettingsSections.ts
index 65f3ce03c..1c879b36c 100644
--- a/fluxer_app/src/features/user/components/settings_utils/section_registry/GeneralSettingsSections.ts
+++ b/fluxer_app/src/features/user/components/settings_utils/section_registry/GeneralSettingsSections.ts
@@ -1,5 +1,10 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
+import OperatorPassHoldings from '@app/features/premium/state/OperatorPassHoldings';
+import {
+ showsOperatorPassLabsSettings,
+ showsOperatorPassWallSettings,
+} from '@app/features/premium/utils/BillingTabVisibility';
import {
OPERATOR_PASS_LABS_SECTION_DESCRIPTOR,
OPERATOR_PASS_PASSES_SECTION_DESCRIPTOR,
@@ -22,6 +27,7 @@ import {
SPELL_CHECK_DESCRIPTOR as SPELLCHECK_DESCRIPTOR,
TIME_FORMAT_DESCRIPTOR,
} from '@app/features/user/components/settings_utils/section_registry/SharedDescriptors';
+import Users from '@app/features/user/state/Users';
import {
INTERFACE_LANGUAGE_DESCRIPTOR,
PROFILE_BADGES_DESCRIPTOR,
@@ -84,6 +90,7 @@ export const generalSettingsSections = [
label: OPERATOR_PASS_WALL_SECTION_DESCRIPTOR,
keywords: [],
isAdvanced: false,
+ isVisible: () => showsOperatorPassWallSettings(Users.currentUser, OperatorPassHoldings.passes),
},
{
id: 'operator-pass-labs',
@@ -91,6 +98,7 @@ export const generalSettingsSections = [
label: OPERATOR_PASS_LABS_SECTION_DESCRIPTOR,
keywords: [],
isAdvanced: false,
+ isVisible: () => showsOperatorPassLabsSettings(Users.currentUser, OperatorPassHoldings.passes),
},
{id: 'redeem-gift', tabType: 'gift_inventory', label: REDEEM_A_GIFT_DESCRIPTOR, keywords: [], isAdvanced: false},
{