From f29d513436580f2a59c2b671433ae7eb27c712c6 Mon Sep 17 00:00:00 2001
From: Lucas Yang <yangchenshin77@gmail.com>
Date: Sun, 15 Jun 2025 08:13:13 +0800
Subject: [PATCH] fix: incorrect shows the tier for the user with a gifted
 membership for patreon (#112)

(cherry picked from commit 3c3d93c377ae0675695cd7f8917a31dc75fb10fb)
---
 src/providers/patreon.ts | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/providers/patreon.ts b/src/providers/patreon.ts
index 9f7329d..9966fbb 100644
--- a/src/providers/patreon.ts
+++ b/src/providers/patreon.ts
@@ -27,7 +27,7 @@ export async function fetchPatreonSponsors(token: string): Promise<Sponsorship[]
   const userCampaignId = userData.data[0].id
 
   const sponsors: any[] = []
-  let sponsorshipApi = `https://www.patreon.com/api/oauth2/v2/campaigns/${userCampaignId}/members?include=user&fields%5Bmember%5D=currently_entitled_amount_cents,patron_status,pledge_relationship_start,lifetime_support_cents&fields%5Buser%5D=image_url,url,first_name,full_name&page%5Bcount%5D=100`
+  let sponsorshipApi = `https://www.patreon.com/api/oauth2/v2/campaigns/${userCampaignId}/members?include=user,currently_entitled_tiers&fields%5Bmember%5D=currently_entitled_amount_cents,patron_status,pledge_relationship_start,lifetime_support_cents&fields%5Buser%5D=image_url,url,first_name,full_name&fields%5Btier%5D=amount_cents&page%5Bcount%5D=100`
   do {
     // Get pledges from the campaign
     const sponsorshipData = await $fetch(sponsorshipApi, {
@@ -45,15 +45,18 @@ export async function fetchPatreonSponsors(token: string): Promise<Sponsorship[]
         .map((membership: any) => ({
           membership,
           patron: sponsorshipData.included.find(
-            (v: any) => v.id === membership.relationships.user.data.id,
+            (v: any) => v.type === 'user' && v.id === membership.relationships.user.data.id,
+          ),
+          tier: sponsorshipData.included.find(
+            (v: any) => v.type === 'tier' && v.id === membership.relationships.currently_entitled_tiers.data[0]?.id,
           ),
         })),
     )
     sponsorshipApi = sponsorshipData.links?.next
   } while (sponsorshipApi)
 
-  const processed = sponsors.map(
-    (raw: any): Sponsorship => ({
+  const processed = sponsors.map((raw: any): Sponsorship => {
+    const sponsor: Sponsorship = {
       sponsor: {
         avatarUrl: raw.patron.attributes.image_url,
         login: raw.patron.attributes.first_name,
@@ -62,13 +65,21 @@ export async function fetchPatreonSponsors(token: string): Promise<Sponsorship[]
         linkUrl: raw.patron.attributes.url,
       },
       isOneTime: false, // One-time pledges not supported
-      // The "former_patron" and "declined_patron" both is past sponsors
-      monthlyDollars: ['former_patron', 'declined_patron'].includes(raw.membership.attributes.patron_status) ? -1 : Math.floor(raw.membership.attributes.currently_entitled_amount_cents / 100),
+      monthlyDollars: Math.floor(raw.membership.attributes.currently_entitled_amount_cents / 100),
       privacyLevel: 'PUBLIC', // Patreon is all public
       tierName: 'Patreon',
       createdAt: raw.membership.attributes.pledge_relationship_start,
-    }),
-  )
+    }
+
+    // The "former_patron" and "declined_patron" both is past sponsors
+    if (['former_patron', 'declined_patron'].includes(raw.membership.attributes.patron_status))
+      sponsor.monthlyDollars = -1
+    // If the sponsor is not a patron but has a gifted membership, we can still show the tier amount
+    else if (sponsor.monthlyDollars <= 0 && (raw.tier?.attributes.amount_cents || 0) > 0)
+      sponsor.monthlyDollars = Math.floor(raw.tier.attributes.amount_cents / 100)
+
+    return sponsor
+  })
 
   return processed
 }