feat: return the space turbo expiration timestamp (#997)

* feat: return the space turbo expiration timestamp

* Update src/helpers/spaces.ts

Co-authored-by: Chaitanya <[email protected]>

* fix: fix variable case

* fix: fix missing comma

* chore: fix query due to camelcase local name

* test: fix tests

* fix: fix invalid variable name

---------

Co-authored-by: Chaitanya <[email protected]>

Author: wa0x6e

src/graphql/helpers.ts

@@ -88,6 +88,7 @@ export function formatSpace({
   domain,
   verified,
   turbo,
+  turboExpiration,
   flagged,
   hibernated,
   skinSettings
@@ -143,6 +144,7 @@ export function formatSpace({
   space.flagged = flagged ?? null;
   space.hibernated = hibernated ?? null;
   space.turbo = turbo ?? null;
+  space.turboExpiration = turboExpiration ?? 0;
   space.rank = spaceMetadata?.rank ?? null;
 
   // always return parent and children in child node format
@@ -317,7 +319,11 @@ export async function fetchSpaces(args) {
   return spaces.map(space =>
     Object.assign(
       space,
-      formatSpace({ skinSettings: formatSkinSettings(space), ...space })
+      formatSpace({
+        skinSettings: formatSkinSettings(space),
+        turboExpiration: space.turbo_expiration,
+        ...space
+      })
     )
   );
 }
@@ -437,6 +443,7 @@ export function formatProposal(proposal) {
     domain: proposal.spaceDomain,
     verified: proposal.spaceVerified,
     turbo: proposal.spaceTurbo,
+    turboExpiration: proposal.spaceTurboExpiration,
     flagged: proposal.spaceFlagged,
     hibernated: proposal.spaceHibernated,
     skinSettings: formatSkinSettings(proposal)
@@ -463,6 +470,7 @@ export function formatVote(vote) {
     settings: vote.settings,
     verified: vote.spaceVerified,
     turbo: vote.spaceTurbo,
+    turboExpiration: vote.spaceTurboExpiration,
     flagged: vote.spaceFlagged,
     hibernated: vote.spaceHibernated,
     skinSettings: formatSkinSettings(vote)
@@ -477,6 +485,7 @@ export function formatFollow(follow) {
     domain: follow.spaceDomain,
     verified: follow.spaceVerified,
     turbo: follow.spaceTurbo,
+    turboExpiration: follow.spaceTurboExpiration,
     flagged: follow.spaceFlagged,
     hibernated: follow.spaceHibernated,
     skinSettings: formatSkinSettings(follow)
@@ -491,6 +500,7 @@ export function formatSubscription(subscription) {
     domain: subscription.spaceDomain,
     verified: subscription.spaceVerified,
     turbo: subscription.spaceTurbo,
+    turboExpiration: subscription.spaceTurboExpiration,
     flagged: subscription.spaceFlagged,
     hibernated: subscription.spaceHibernated,
     skinSettings: formatSkinSettings(subscription)

src/graphql/operations/follows.ts

@@ -37,6 +37,7 @@ export default async function (parent, args) {
       spaces.flagged as spaceFlagged,
       spaces.verified as spaceVerified,
       spaces.turbo as spaceTurbo,
+      spaces.turbo_expiration as spaceTurboExpiration,
       spaces.hibernated as spaceHibernated
     FROM follows f
     LEFT JOIN spaces ON spaces.id = f.space

src/graphql/operations/proposal.ts

@@ -14,6 +14,7 @@ export default async function (parent, { id }) {
       spaces.flagged as spaceFlagged,
       spaces.verified as spaceVerified,
       spaces.turbo as spaceTurbo,
+      spaces.turbo_expiration as spaceTurboExpiration,
       spaces.hibernated as spaceHibernated
     FROM proposals p
     INNER JOIN spaces ON spaces.id = p.space

src/graphql/operations/proposals.ts

@@ -96,6 +96,7 @@ export default async function (parent, args) {
       spaces.flagged as spaceFlagged,
       spaces.verified as spaceVerified,
       spaces.turbo as spaceTurbo,
+      spaces.turbo_expiration as spaceTurboExpiration,
       spaces.hibernated as spaceHibernated
     FROM proposals p
     INNER JOIN spaces ON spaces.id = p.space

src/graphql/operations/subscriptions.ts

@@ -38,6 +38,7 @@ export default async function (parent, args) {
       spaces.flagged as spaceFlagged,
       spaces.verified as spaceVerified,
       spaces.turbo as spaceTurbo,
+      spaces.turbo_expiration as spaceTurboExpiration,
       spaces.hibernated as spaceHibernated
     FROM subscriptions s
     INNER JOIN spaces ON spaces.id = s.space

src/graphql/operations/votes.ts

@@ -96,6 +96,7 @@ async function query(parent, args, context?, info?) {
         spaces.flagged as spaceFlagged,
         spaces.verified as spaceVerified,
         spaces.turbo as spaceTurbo,
+        spaces.turbo_expiration as spaceTurboExpiration,
         spaces.hibernated as spaceHibernated
       FROM proposals p
       INNER JOIN spaces ON spaces.id = p.space

src/graphql/schema.gql

@@ -442,7 +442,7 @@ type Space {
   flagged: Boolean
   hibernated: Boolean
   turbo: Boolean
-  turbo_expiration: Int
+  turboExpiration: Int
   rank: Float
   boost: BoostSettings
   created: Int!

src/helpers/spaces.ts

@@ -33,6 +33,7 @@ type Metadata = {
   verified: boolean;
   flagged: boolean;
   turbo: boolean;
+  turboExpiration: number;
   hibernated: boolean;
   parent: string;
   popularity: number;
@@ -124,6 +125,7 @@ function mapSpaces() {
       verified: space.verified,
       flagged: space.flagged,
       turbo: space.turbo,
+      turboExpiration: space.turboExpiration,
       hibernated: space.hibernated,
       parent: space.parent,
       popularity: spacesMetadata[id]?.popularity || 0,
@@ -152,7 +154,7 @@ async function loadSpaces() {
   const startTime = +Date.now();
 
   const query = `
-      SELECT id, settings, flagged, verified, turbo, hibernated, follower_count, proposal_count, vote_count
+      SELECT id, settings, flagged, verified, turbo, turbo_expiration, hibernated, follower_count, proposal_count, vote_count
       FROM spaces
       WHERE deleted = 0
       ORDER BY id ASC
@@ -167,6 +169,7 @@ async function loadSpaces() {
         flagged: space.flagged === 1,
         verified: space.verified === 1,
         turbo: space.turbo === 1,
+        turboExpiration: space.turbo_expiration,
         hibernated: space.hibernated === 1,
         follower_count: space.follower_count,
         vote_count: space.vote_count,
@@ -298,7 +301,7 @@ async function loadSpacesMetrics() {
 
 export async function getSpace(id: string) {
   const query = `
-    SELECT settings, domain, flagged, verified, turbo, hibernated, deleted, follower_count, proposal_count, vote_count
+    SELECT settings, domain, flagged, verified, turbo, turbo_expiration, hibernated, deleted, follower_count, proposal_count, vote_count
     FROM spaces
     WHERE id = ?
     LIMIT 1`;
@@ -313,6 +316,7 @@ export async function getSpace(id: string) {
     flagged: space.flagged === 1,
     verified: space.verified === 1,
     turbo: space.turbo === 1,
+    turboExpiration: space.turbo_expiration,
     hibernated: space.hibernated === 1,
     deleted: space.deleted === 1
   };

test/e2e/space.test.ts

@@ -41,6 +41,7 @@ describe('GET /api/space/:key', () => {
         flagged: space.flagged,
         verified: space.verified,
         turbo: space.turbo,
+        turboExpiration: space.turbo_expiration,
         hibernated: space.hibernated,
         deleted: false,
         domain: space.domain,
@@ -75,6 +76,7 @@ describe('GET /api/space/:key', () => {
         flagged: space.flagged,
         verified: space.verified,
         turbo: space.turbo,
+        turboExpiration: space.turbo_expiration,
         hibernated: space.hibernated,
         deleted: true,
         domain: space.domain,

test/fixtures/spaces.ts

@@ -5,6 +5,7 @@ const fixtures: Record<string, any>[] = [
     flagged: false,
     verified: true,
     turbo: false,
+    turbo_expiration: 0,
     hibernated: false,
     domain: 'test.com',
     settings: { network: 1 },
@@ -17,6 +18,7 @@ const fixtures: Record<string, any>[] = [
     flagged: false,
     verified: true,
     turbo: false,
+    turbo_expiration: 0,
     hibernated: false,
     deleted: true,
     domain: 'test1.com',