Remove deprecated recurring field

open-chat-labs · Jul 19, 2024 · 79edca3 · 79edca3
1 parent c2fa7a8
commit 79edca3
Show file tree

Hide file tree

Showing 17 changed files with 0 additions and 21 deletions.
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
@@ -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<DiamondMembershipDetails> {
         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
@@ -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
@@ -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<DiamondMembershipSubscription>,
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -506,7 +506,6 @@ export interface DeletedContent {
 export interface DiamondMembershipDetails {
   'pay_in_chat' : boolean,
   'subscription' : DiamondMembershipSubscription,
-  'recurring' : [] | [DiamondMembershipSubscription],
   'expires_at' : TimestampMillis,
 }
 export interface DiamondMembershipFeesByDuration {