diff --git a/backend/canisters/user_index/impl/src/model/diamond_membership_details.rs b/backend/canisters/user_index/impl/src/model/diamond_membership_details.rs index eb76e9aa2f..30228e62e3 100644 --- a/backend/canisters/user_index/impl/src/model/diamond_membership_details.rs +++ b/backend/canisters/user_index/impl/src/model/diamond_membership_details.rs @@ -61,26 +61,22 @@ impl DiamondMembershipDetailsInternal { .unwrap_or_default() } - #[allow(deprecated)] pub fn status_full(&self, now: TimestampMillis) -> DiamondMembershipStatusFull { match self.expires_at { Some(ts) if ts > LIFETIME_TIMESTAMP => DiamondMembershipStatusFull::Lifetime, Some(ts) if ts > now => DiamondMembershipStatusFull::Active(DiamondMembershipDetails { expires_at: ts, pay_in_chat: self.pay_in_chat, - recurring: Some(self.subscription), subscription: self.subscription, }), _ => DiamondMembershipStatusFull::Inactive, } } - #[allow(deprecated)] pub fn hydrate(&self, now: TimestampMillis) -> Option { self.expires_at.filter(|&ts| now < ts).map(|ts| DiamondMembershipDetails { expires_at: ts, pay_in_chat: self.pay_in_chat, - recurring: self.subscription.is_active().then_some(self.subscription), subscription: self.subscription, }) } diff --git a/backend/libraries/types/can.did b/backend/libraries/types/can.did index 9ec28c67bf..19f12e6b8e 100644 --- a/backend/libraries/types/can.did +++ b/backend/libraries/types/can.did @@ -1484,7 +1484,6 @@ type PrizeWinnerContent = record { type DiamondMembershipDetails = record { expires_at : TimestampMillis; - recurring : opt DiamondMembershipSubscription; pay_in_chat : bool; subscription : DiamondMembershipSubscription; }; diff --git a/backend/libraries/types/src/diamond_membership.rs b/backend/libraries/types/src/diamond_membership.rs index eecc1b7824..77546324d3 100644 --- a/backend/libraries/types/src/diamond_membership.rs +++ b/backend/libraries/types/src/diamond_membership.rs @@ -7,8 +7,6 @@ use std::fmt::{Display, Formatter}; pub struct DiamondMembershipDetails { pub expires_at: TimestampMillis, pub pay_in_chat: bool, - #[deprecated] - pub recurring: Option, pub subscription: DiamondMembershipSubscription, } diff --git a/frontend/openchat-agent/src/services/community/candid/types.d.ts b/frontend/openchat-agent/src/services/community/candid/types.d.ts index cae1a65f2d..1d3f660848 100644 --- a/frontend/openchat-agent/src/services/community/candid/types.d.ts +++ b/frontend/openchat-agent/src/services/community/candid/types.d.ts @@ -701,7 +701,6 @@ export type DeletedMessageResponse = { 'UserNotInChannel' : null } | export interface DiamondMembershipDetails { 'pay_in_chat' : boolean, 'subscription' : DiamondMembershipSubscription, - 'recurring' : [] | [DiamondMembershipSubscription], 'expires_at' : TimestampMillis, } export type DiamondMembershipPlanDuration = { 'OneYear' : null } | diff --git a/frontend/openchat-agent/src/services/group/candid/types.d.ts b/frontend/openchat-agent/src/services/group/candid/types.d.ts index 89c995af3f..68c1685078 100644 --- a/frontend/openchat-agent/src/services/group/candid/types.d.ts +++ b/frontend/openchat-agent/src/services/group/candid/types.d.ts @@ -578,7 +578,6 @@ export type DeletedMessageResponse = { 'MessageNotFound' : null } | export interface DiamondMembershipDetails { 'pay_in_chat' : boolean, 'subscription' : DiamondMembershipSubscription, - 'recurring' : [] | [DiamondMembershipSubscription], 'expires_at' : TimestampMillis, } export type DiamondMembershipPlanDuration = { 'OneYear' : null } | diff --git a/frontend/openchat-agent/src/services/groupIndex/candid/types.d.ts b/frontend/openchat-agent/src/services/groupIndex/candid/types.d.ts index 70d4b9e78a..05ad154e83 100644 --- a/frontend/openchat-agent/src/services/groupIndex/candid/types.d.ts +++ b/frontend/openchat-agent/src/services/groupIndex/candid/types.d.ts @@ -497,7 +497,6 @@ export interface DeletedGroupInfo { export interface DiamondMembershipDetails { 'pay_in_chat' : boolean, 'subscription' : DiamondMembershipSubscription, - 'recurring' : [] | [DiamondMembershipSubscription], 'expires_at' : TimestampMillis, } export type DiamondMembershipPlanDuration = { 'OneYear' : null } | diff --git a/frontend/openchat-agent/src/services/localUserIndex/candid/types.d.ts b/frontend/openchat-agent/src/services/localUserIndex/candid/types.d.ts index 9d921185b7..811bfe91ff 100644 --- a/frontend/openchat-agent/src/services/localUserIndex/candid/types.d.ts +++ b/frontend/openchat-agent/src/services/localUserIndex/candid/types.d.ts @@ -496,7 +496,6 @@ export interface DeletedContent { export interface DiamondMembershipDetails { 'pay_in_chat' : boolean, 'subscription' : DiamondMembershipSubscription, - 'recurring' : [] | [DiamondMembershipSubscription], 'expires_at' : TimestampMillis, } export type DiamondMembershipPlanDuration = { 'OneYear' : null } | diff --git a/frontend/openchat-agent/src/services/notifications/candid/types.d.ts b/frontend/openchat-agent/src/services/notifications/candid/types.d.ts index bd54ac37f0..0612ec6101 100644 --- a/frontend/openchat-agent/src/services/notifications/candid/types.d.ts +++ b/frontend/openchat-agent/src/services/notifications/candid/types.d.ts @@ -456,7 +456,6 @@ export interface DeletedContent { export interface DiamondMembershipDetails { 'pay_in_chat' : boolean, 'subscription' : DiamondMembershipSubscription, - 'recurring' : [] | [DiamondMembershipSubscription], 'expires_at' : TimestampMillis, } export type DiamondMembershipPlanDuration = { 'OneYear' : null } | diff --git a/frontend/openchat-agent/src/services/online/candid/types.d.ts b/frontend/openchat-agent/src/services/online/candid/types.d.ts index 57fffe31b5..c8b1de003d 100644 --- a/frontend/openchat-agent/src/services/online/candid/types.d.ts +++ b/frontend/openchat-agent/src/services/online/candid/types.d.ts @@ -456,7 +456,6 @@ export interface DeletedContent { export interface DiamondMembershipDetails { 'pay_in_chat' : boolean, 'subscription' : DiamondMembershipSubscription, - 'recurring' : [] | [DiamondMembershipSubscription], 'expires_at' : TimestampMillis, } export type DiamondMembershipPlanDuration = { 'OneYear' : null } | diff --git a/frontend/openchat-agent/src/services/proposalsBot/candid/types.d.ts b/frontend/openchat-agent/src/services/proposalsBot/candid/types.d.ts index db653da53d..852eab55b4 100644 --- a/frontend/openchat-agent/src/services/proposalsBot/candid/types.d.ts +++ b/frontend/openchat-agent/src/services/proposalsBot/candid/types.d.ts @@ -456,7 +456,6 @@ export interface DeletedContent { export interface DiamondMembershipDetails { 'pay_in_chat' : boolean, 'subscription' : DiamondMembershipSubscription, - 'recurring' : [] | [DiamondMembershipSubscription], 'expires_at' : TimestampMillis, } export type DiamondMembershipPlanDuration = { 'OneYear' : null } | diff --git a/frontend/openchat-agent/src/services/registry/candid/types.d.ts b/frontend/openchat-agent/src/services/registry/candid/types.d.ts index 538e7fb4e2..dd744d1d4a 100644 --- a/frontend/openchat-agent/src/services/registry/candid/types.d.ts +++ b/frontend/openchat-agent/src/services/registry/candid/types.d.ts @@ -462,7 +462,6 @@ export interface DeletedContent { export interface DiamondMembershipDetails { 'pay_in_chat' : boolean, 'subscription' : DiamondMembershipSubscription, - 'recurring' : [] | [DiamondMembershipSubscription], 'expires_at' : TimestampMillis, } export type DiamondMembershipPlanDuration = { 'OneYear' : null } | diff --git a/frontend/openchat-agent/src/services/storageBucket/candid/types.d.ts b/frontend/openchat-agent/src/services/storageBucket/candid/types.d.ts index bf01d092b2..5f40b09421 100644 --- a/frontend/openchat-agent/src/services/storageBucket/candid/types.d.ts +++ b/frontend/openchat-agent/src/services/storageBucket/candid/types.d.ts @@ -471,7 +471,6 @@ export interface DeletedContent { export interface DiamondMembershipDetails { 'pay_in_chat' : boolean, 'subscription' : DiamondMembershipSubscription, - 'recurring' : [] | [DiamondMembershipSubscription], 'expires_at' : TimestampMillis, } export type DiamondMembershipPlanDuration = { 'OneYear' : null } | diff --git a/frontend/openchat-agent/src/services/storageIndex/candid/types.d.ts b/frontend/openchat-agent/src/services/storageIndex/candid/types.d.ts index f7fdb807b8..4db08614c2 100644 --- a/frontend/openchat-agent/src/services/storageIndex/candid/types.d.ts +++ b/frontend/openchat-agent/src/services/storageIndex/candid/types.d.ts @@ -486,7 +486,6 @@ export interface DeletedContent { export interface DiamondMembershipDetails { 'pay_in_chat' : boolean, 'subscription' : DiamondMembershipSubscription, - 'recurring' : [] | [DiamondMembershipSubscription], 'expires_at' : TimestampMillis, } export type DiamondMembershipPlanDuration = { 'OneYear' : null } | diff --git a/frontend/openchat-agent/src/services/translations/candid/types.d.ts b/frontend/openchat-agent/src/services/translations/candid/types.d.ts index 4ac362e861..c2e207dbad 100644 --- a/frontend/openchat-agent/src/services/translations/candid/types.d.ts +++ b/frontend/openchat-agent/src/services/translations/candid/types.d.ts @@ -468,7 +468,6 @@ export interface DeletedContent { export interface DiamondMembershipDetails { 'pay_in_chat' : boolean, 'subscription' : DiamondMembershipSubscription, - 'recurring' : [] | [DiamondMembershipSubscription], 'expires_at' : TimestampMillis, } export type DiamondMembershipPlanDuration = { 'OneYear' : null } | diff --git a/frontend/openchat-agent/src/services/user/candid/types.d.ts b/frontend/openchat-agent/src/services/user/candid/types.d.ts index 1bcf1865c4..5efd91f1e5 100644 --- a/frontend/openchat-agent/src/services/user/candid/types.d.ts +++ b/frontend/openchat-agent/src/services/user/candid/types.d.ts @@ -681,7 +681,6 @@ export type DeletedMessageResponse = { 'MessageNotFound' : null } | export interface DiamondMembershipDetails { 'pay_in_chat' : boolean, 'subscription' : DiamondMembershipSubscription, - 'recurring' : [] | [DiamondMembershipSubscription], 'expires_at' : TimestampMillis, } export type DiamondMembershipPlanDuration = { 'OneYear' : null } | diff --git a/frontend/openchat-agent/src/services/userIndex/candid/idl.js b/frontend/openchat-agent/src/services/userIndex/candid/idl.js index 682dcf6f91..c31d68cbbc 100644 --- a/frontend/openchat-agent/src/services/userIndex/candid/idl.js +++ b/frontend/openchat-agent/src/services/userIndex/candid/idl.js @@ -52,7 +52,6 @@ export const idlFactory = ({ IDL }) => { const DiamondMembershipDetails = IDL.Record({ 'pay_in_chat' : IDL.Bool, 'subscription' : DiamondMembershipSubscription, - 'recurring' : IDL.Opt(DiamondMembershipSubscription), 'expires_at' : TimestampMillis, }); const DiamondMembershipStatusFull = IDL.Variant({ diff --git a/frontend/openchat-agent/src/services/userIndex/candid/types.d.ts b/frontend/openchat-agent/src/services/userIndex/candid/types.d.ts index 64915527f5..760e18943d 100644 --- a/frontend/openchat-agent/src/services/userIndex/candid/types.d.ts +++ b/frontend/openchat-agent/src/services/userIndex/candid/types.d.ts @@ -506,7 +506,6 @@ export interface DeletedContent { export interface DiamondMembershipDetails { 'pay_in_chat' : boolean, 'subscription' : DiamondMembershipSubscription, - 'recurring' : [] | [DiamondMembershipSubscription], 'expires_at' : TimestampMillis, } export interface DiamondMembershipFeesByDuration {