Merge branch 'dev' into releases/v1

JamesIves · Dec 3, 2023 · 8b513ea · 8b513ea
2 parents 6a447f2 + 01673aa
commit 8b513ea
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/action.yml b/action.yml
@@ -2,7 +2,7 @@ name: 'Add GitHub Sponsors to Readme'
 description: 'This GitHub Action will automatically add your GitHub Sponsors to your README.'
 author: 'James Ives <iam@jamesiv.es>'
 runs:
-  using: 'node16'
+  using: 'node20'
   main: 'lib/main.js'
 branding:
   icon: 'heart'
@@ -11,7 +11,7 @@ inputs:
   token:
     description: >
       You must provide the action with a Personal Access Token (PAT) with either the user:read or org:read permission scope and store it in the secrets / with menu as a secret. 
-      This should be generated from the account or organization that recieves sponsorship.
+      This should be generated from the account or organization that receives sponsorship.
 
       [Learn more about creating and using encrypted secrets here.](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)
     required: true

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@jamesives/github-sponsors-readme-action",
   "description": "This GitHub Action will automatically add your GitHub Sponsors to your README. It can be configured in multiple ways allowing you to display and breakdown your sponsors by price tier with fallbacks.",
   "author": "James Ives <iam@jamesiv.es> (https://jamesiv.es)",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "license": "MIT",
   "main": "lib/lib.js",
   "types": "lib/lib.d.ts",

diff --git a/src/constants.ts b/src/constants.ts
@@ -61,7 +61,7 @@ export interface Sponsor {
   }
   createdAt: string
   privacyLevel: PrivacyLevel
-  tier: {
+  tier?: {
     monthlyPriceInCents?: number
   }
 }

diff --git a/src/template.ts b/src/template.ts
@@ -108,15 +108,17 @@ export function generateTemplate(
     let filteredSponsors = sponsorshipsAsMaintainer.nodes.filter(
       (user: Sponsor) =>
         user.privacyLevel !== PrivacyLevel.PRIVATE &&
-        (user.tier.monthlyPriceInCents ? user.tier.monthlyPriceInCents : 0) >=
-          action.minimum
+        (user.tier && user.tier.monthlyPriceInCents
+          ? user.tier.monthlyPriceInCents
+          : 0) >= action.minimum
     )
 
     if (action.maximum > 0) {
       filteredSponsors = filteredSponsors.filter(
         (user: Sponsor) =>
-          (user.tier.monthlyPriceInCents ? user.tier.monthlyPriceInCents : 0) <=
-          action.maximum
+          (user.tier && user.tier.monthlyPriceInCents
+            ? user.tier.monthlyPriceInCents
+            : 0) <= action.maximum
       )
     }