chore: pull in upstream changes v17.0.0 (#13)

Co-authored-by: Hiroki Osame <[email protected]>
Co-authored-by: Lucas Yang <[email protected]>
Co-authored-by: Anthony Fu <[email protected]>
Co-authored-by: 三咲智子 Kevin Deng <[email protected]>

Author: 5 people

src/configs/env.ts

@@ -31,7 +31,7 @@ export function loadEnv(): Partial<ContribkitConfig> {
     afdian: {
       userId: process.env.CONTRIBKIT_AFDIAN_USER_ID || process.env.AFDIAN_USER_ID,
       token: process.env.CONTRIBKIT_AFDIAN_TOKEN || process.env.AFDIAN_TOKEN,
-      exechangeRate: Number.parseFloat(process.env.CONTRIBKIT_AFDIAN_EXECHANGERATE || process.env.AFDIAN_EXECHANGERATE || '0') || undefined,
+      exchangeRate: Number.parseFloat(process.env.CONTRIBKIT_AFDIAN_EXCHANGE_RATE || process.env.AFDIAN_EXCHANGE_RATE || '0') || undefined,
     },
     polar: {
       token: process.env.CONTRIBKIT_POLAR_TOKEN || process.env.POLAR_TOKEN,

src/providers/afdian.ts

@@ -15,7 +15,7 @@ export async function fetchAfdianSponsors(options: ContribkitConfig['afdian'] =
   const {
     userId,
     token,
-    exechangeRate = 6.5,
+    exchangeRate = 6.5,
     includePurchases = true,
     purchaseEffectivity = 30,
   } = options
@@ -88,7 +88,7 @@ export async function fetchAfdianSponsors(options: ContribkitConfig['afdian'] =
       // all_sum_amount is based on cny
       monthlyDollars: isExpired
         ? -1
-        : Number.parseFloat(raw.all_sum_amount) / exechangeRate,
+        : Number.parseFloat(raw.current_plan.show_price) / exchangeRate,
       privacyLevel: 'PUBLIC',
       tierName: 'Afdian',
       createdAt: new Date(raw.first_pay_time * 1000).toISOString(),

src/types.ts

@@ -170,7 +170,7 @@ export interface ProvidersConfig {
      *
      * @default 6.5
      */
-    exechangeRate?: number
+    exchangeRate?: number
     /**
      * Include one-time purchases
      * @default true