From 81293bb53f0755d8947b35402d7768e8f211ad89 Mon Sep 17 00:00:00 2001
From: Tanuj Kanti <tanujkanti4441@gmail.com>
Date: Sat, 21 Dec 2024 11:35:09 +0530
Subject: [PATCH 1/8] fix: image sourced from github

---
 tools/add-author.js      | 2 +-
 tools/fetch-sponsors.js  | 4 ++--
 tools/fetch-team-data.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/add-author.js b/tools/add-author.js
index b489a2b6f..017fce643 100644
--- a/tools/add-author.js
+++ b/tools/add-author.js
@@ -46,7 +46,7 @@ async function fetchUserProfile() {
 		name: profile.name,
 		title: "Guest Author",
 		website: profile.blog,
-		avatar_url: profile.avatar_url,
+		avatar_url: profile.avatar_url.replace("private-", ""),
 		bio: profile.bio,
 		twitter_username: profile.twitter_username,
 		github_username: profile.login,
diff --git a/tools/fetch-sponsors.js b/tools/fetch-sponsors.js
index 24ef56719..45c68c139 100644
--- a/tools/fetch-sponsors.js
+++ b/tools/fetch-sponsors.js
@@ -352,7 +352,7 @@ async function fetchGitHubSponsors() {
 		// return an array in the same format as Open Collective
 		.map(({ sponsor, tier }) => ({
 			name: sponsor.name || sponsor.login,
-			image: sponsor.avatarUrl,
+			image: sponsor.avatarUrl.replace("private-", ""),
 			url: fixUrl(sponsor.websiteUrl || sponsor.url),
 			monthlyDonation: tier.monthlyPriceInDollars,
 			source: "github",
@@ -365,7 +365,7 @@ async function fetchGitHubSponsors() {
 		.map(({ sponsor, timestamp, tier, id }) => ({
 			id,
 			name: sponsor.name || sponsor.login,
-			image: sponsor.avatarUrl,
+			image: sponsor.avatarUrl.replace("private-", ""),
 			url: fixUrl(sponsor.websiteUrl || sponsor.url),
 			amount: tier.monthlyPriceInDollars,
 			date: timestamp,
diff --git a/tools/fetch-team-data.js b/tools/fetch-team-data.js
index 01bf4cac8..12d98bf5a 100644
--- a/tools/fetch-team-data.js
+++ b/tools/fetch-team-data.js
@@ -96,7 +96,7 @@ async function fetchUserProfile(username) {
 			: profile.blog
 				? `https://${profile.blog}`
 				: profile.blog,
-		avatar_url: profile.avatar_url,
+		avatar_url: profile.avatar_url.replace("private-", ""),
 		bio: profile.bio,
 		twitter_username: profile.twitter_username,
 		github_username: profile.login,

From d33888c84e7d05575c4b6ebd1e5cbe83ba3adf78 Mon Sep 17 00:00:00 2001
From: Tanuj Kanti <tanujkanti4441@gmail.com>
Date: Sat, 21 Dec 2024 12:11:08 +0530
Subject: [PATCH 2/8] generate old avatar URLs

---
 tools/add-author.js      | 2 +-
 tools/fetch-sponsors.js  | 4 ++--
 tools/fetch-team-data.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/add-author.js b/tools/add-author.js
index 017fce643..d015f9c9d 100644
--- a/tools/add-author.js
+++ b/tools/add-author.js
@@ -46,7 +46,7 @@ async function fetchUserProfile() {
 		name: profile.name,
 		title: "Guest Author",
 		website: profile.blog,
-		avatar_url: profile.avatar_url.replace("private-", ""),
+		avatar_url: `${profile.avatar_url.replace("private-", "").split("?")[0]}?v=4`,
 		bio: profile.bio,
 		twitter_username: profile.twitter_username,
 		github_username: profile.login,
diff --git a/tools/fetch-sponsors.js b/tools/fetch-sponsors.js
index 45c68c139..6148c9c31 100644
--- a/tools/fetch-sponsors.js
+++ b/tools/fetch-sponsors.js
@@ -352,7 +352,7 @@ async function fetchGitHubSponsors() {
 		// return an array in the same format as Open Collective
 		.map(({ sponsor, tier }) => ({
 			name: sponsor.name || sponsor.login,
-			image: sponsor.avatarUrl.replace("private-", ""),
+			image: `${sponsor.avatarUrl.replace("private-", "").split("?")[0]}?v=4`,
 			url: fixUrl(sponsor.websiteUrl || sponsor.url),
 			monthlyDonation: tier.monthlyPriceInDollars,
 			source: "github",
@@ -365,7 +365,7 @@ async function fetchGitHubSponsors() {
 		.map(({ sponsor, timestamp, tier, id }) => ({
 			id,
 			name: sponsor.name || sponsor.login,
-			image: sponsor.avatarUrl.replace("private-", ""),
+			image: `${sponsor.avatarUrl.replace("private-", "").split("?")[0]}?v=4`,
 			url: fixUrl(sponsor.websiteUrl || sponsor.url),
 			amount: tier.monthlyPriceInDollars,
 			date: timestamp,
diff --git a/tools/fetch-team-data.js b/tools/fetch-team-data.js
index 12d98bf5a..a134f1629 100644
--- a/tools/fetch-team-data.js
+++ b/tools/fetch-team-data.js
@@ -96,7 +96,7 @@ async function fetchUserProfile(username) {
 			: profile.blog
 				? `https://${profile.blog}`
 				: profile.blog,
-		avatar_url: profile.avatar_url.replace("private-", ""),
+		avatar_url: `${profile.avatar_url.replace("private-", "").split("?")[0]}?v=4`,
 		bio: profile.bio,
 		twitter_username: profile.twitter_username,
 		github_username: profile.login,

From 83da28241abf860b235b57a7e4fde2ca5b07435a Mon Sep 17 00:00:00 2001
From: Tanuj Kanti <tanujkanti4441@gmail.com>
Date: Mon, 30 Dec 2024 15:31:08 +0530
Subject: [PATCH 3/8] add utils.js and fallback images

---
 src/_includes/components/card.macro.html     |  3 ++-
 src/_includes/components/donation.macro.html |  3 ++-
 src/_includes/components/profile.macro.html  |  7 ++++---
 src/content/pages/index.html                 |  7 +++++--
 src/content/pages/sponsors.html              | 19 ++++++++++++-------
 tools/add-author.js                          |  3 ++-
 tools/fetch-sponsors.js                      |  5 +++--
 tools/fetch-team-data.js                     |  3 ++-
 tools/utils.js                               |  9 +++++++++
 9 files changed, 41 insertions(+), 18 deletions(-)
 create mode 100644 tools/utils.js

diff --git a/src/_includes/components/card.macro.html b/src/_includes/components/card.macro.html
index aa0c418f2..751c416c0 100644
--- a/src/_includes/components/card.macro.html
+++ b/src/_includes/components/card.macro.html
@@ -43,7 +43,8 @@ <h3 class="card__title">
             {{ params.teaser }}
         </p>
         <div class="card__footer">
-            <img class="blog-post__author-photo" src="{% if params.authorImage %}{{ params.authorImage }} {% else %}../../../assets/images/people/_placeholder-avatar.svg{% endif %}" alt="{{ params.authorName }}" width="40" height="40" loading="lazy">
+            {% set fallback_image = '/assets/images/people/_placeholder-avatar.svg' %}
+            <img class="blog-post__author-photo" src="{{ params.image if params.image else fallback_image }}" alt="{{ params.authorName }}" width="40" height="40" loading="lazy" onerror="this.src = '{{fallback_image}}'">
             <div class="blog-post__author__details">
                 <div class="blog-post__author-name">{{ params.authorName }}</div>
                 <time class="blog-post__publish-date" datetime="{{ params.date }}">{{ params.date | readableDate }}</time>
diff --git a/src/_includes/components/donation.macro.html b/src/_includes/components/donation.macro.html
index f88016c0e..fc82a94d7 100644
--- a/src/_includes/components/donation.macro.html
+++ b/src/_includes/components/donation.macro.html
@@ -7,8 +7,9 @@
 -->
 
 {%- macro donationItem(params) -%}
+{% set fallback_image = '/assets/images/people/_placeholder-avatar.svg' %}
 <div class="donation">
-    <img class="donation__sponsor-logo" src="{{ params.image }}" width="40" height="40" alt="{{ params.name }}" onerror="this.src = '/assets/images/people/_placeholder-avatar.svg'" loading="lazy"/>
+    <img class="donation__sponsor-logo" src="{{ params.image if params.image else fallback_image }}" width="40" height="40" alt="{{ params.name }}" onerror="this.src = '{{fallback_image}}'" loading="lazy"/>
 
     <div class="donation__content">
         <p class="donation__sponsor-name">{{ params.name }}</p>
diff --git a/src/_includes/components/profile.macro.html b/src/_includes/components/profile.macro.html
index 63d961f6a..a2b450a75 100644
--- a/src/_includes/components/profile.macro.html
+++ b/src/_includes/components/profile.macro.html
@@ -1,7 +1,8 @@
 <!-- default profile -->
+{% set fallback_image = '/assets/images/people/_placeholder-avatar.svg' %}
 {%- macro member(params) -%}
 <div class="profile profile--member">
-    <img class="profile__photo profile__photo--large" src="{% if params.photo %}{{ params.photo }} {% else %}../../../assets/images/people/_placeholder-avatar.svg{% endif %}" alt="{{ params.name }}" width="80" height="80">
+    <img class="profile__photo profile__photo--large" src="{{ params.image if params.image else fallback_image }}" alt="{{ params.name }}" width="80" height="80" onerror="this.src = '{{fallback_image}}'">
     <div class="profile__details">
         <div class="profile__name">
             {{ params.name }}
@@ -75,7 +76,7 @@
 <!-- has avatar, name, and handle only -->
 {%- macro contributor(params) -%}
 <div class="profile profile--contributor">
-    <img class="profile__photo profile__photo--medium" src="{% if params.photo %}{{ params.photo }} {% else %}../../../assets/images/people/_placeholder-avatar.svg{% endif %}" width="56" height="56" alt="{{ params.name }}" loading="lazy">
+    <img class="profile__photo profile__photo--medium" src="{{ params.image if params.image else fallback_image }}" width="56" height="56" alt="{{ params.name }}" loading="lazy" onerror="this.src = '{{fallback_image}}'">
     <div class="profile__details">
         <div class="profile__name">{{ params.name }}</div>
       <a href="https://github.com/{{ params.handle}}" class="profile__handle">@{{ params.handle }}</a>
@@ -87,7 +88,7 @@
 {%- macro post_author(params) -%}
 <div class="profile profile--author">
     <div class="profile--author__details">
-        <img class="profile__photo profile__photo--small" src="{% if params.photo %}{{ params.photo }} {% else %}../../../assets/images/people/_placeholder-avatar.svg{% endif %}" alt="{{ params.name }}" width="48" height="48" loading="lazy">
+        <img class="profile__photo profile__photo--small" src="{{ params.image if params.image else fallback_image }}" alt="{{ params.name }}" width="48" height="48" loading="lazy" onerror="this.src = '{{fallback_image}}'">
         <div class="profile__details">
             <div class="profile__name">
                 {{ params.name }}
diff --git a/src/content/pages/index.html b/src/content/pages/index.html
index 8b86bc39e..6895466fd 100644
--- a/src/content/pages/index.html
+++ b/src/content/pages/index.html
@@ -12,6 +12,8 @@
 {%- from 'components/donation.macro.html' import donationItem %}
 {%- from 'components/card.macro.html' import card %}
 
+{% set fallback_image = '/assets/images/people/_placeholder-avatar.svg' %}
+
 <section class="section hero hero--homepage">
     <div class="content-container grid">
         <div class="span-1-7 content-container">
@@ -52,7 +54,8 @@ <h1 class="section-title">{{ site.homepage.title }}</h1>
                     <div class="sponsors">
                         {% for sponsor in top_sponsors %}
                         <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">
-                            <img loading="lazy" decoding="async" src="{{sponsor.image}}" height="128"
+                            <img loading="lazy" decoding="async" src="{{ sponsor.image if sponsor.image else fallback_image }}" height="128"
+                                onerror="this.src = '{{fallback_image}}'"
                                 alt="{{sponsor.name}}"
                                 title="{{ sponsor.name }}" />
                         </a>
@@ -249,7 +252,7 @@ <h2 class="section-title h3">{{ site.homepage.sponsors.title }}</h2>
                         {% if sponsor.url %}
                         <a href="{{ sponsor.url }}" class="sponsor-link" rel="nofollow noopen sponsored" target="_blank">
                         {% endif %}
-                            <img src="{{ sponsor.image }}" alt="{{ sponsor_title }}" title="{{ sponsor_title }}" height="48" loading="lazy" decoding="async" />
+                            <img src="{{ sponsor.image if sponsor.image else fallback_image }}" alt="{{ sponsor_title }}" title="{{ sponsor_title }}" height="48" loading="lazy" decoding="async" onerror="this.src = '{{fallback_image}}'" />
                         {% if sponsor.url %}
                         </a>
                         {% endif %}
diff --git a/src/content/pages/sponsors.html b/src/content/pages/sponsors.html
index ee511ddc2..acb89d10f 100644
--- a/src/content/pages/sponsors.html
+++ b/src/content/pages/sponsors.html
@@ -12,6 +12,7 @@
 {% set supporting_text = site.sponsors_page.description %}
 {% set monthly_donations = sponsors.totals.monthlyDonations | dollars %}
 {% set supporting_text = supporting_text | replace("BACKER_COUNT", sponsors.totals.sponsorCount) | replace("MONTHLY_DONATIONS", monthly_donations) %}
+{% set fallback_image = '/assets/images/people/_placeholder-avatar.svg' %}
 
 {{ hero({
     title: site.sponsors_page.title,
@@ -42,7 +43,8 @@ <h2 class="section-title h4" id="diamond">{{ site.sponsors_page.tiers.diamond.ti
 
                 <li>
                     <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">
-                        <img loading="lazy" decoding="async" src="{{ sponsor.image }}" height="128"
+                        <img loading="lazy" decoding="async" src="{{ sponsor.image if sponsor.image else fallback_image }}" height="128"
+                            onerror="this.src = '{{fallback_image}}'"
                             alt="{{ sponsor_title }}"
                             title="{{ sponsor_title }}" />
                     </a>
@@ -69,7 +71,8 @@ <h2 class="section-title h4" id="platinum">{{ site.sponsors_page.tiers.platinum.
 
                 <li>
                     <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">
-                        <img loading="lazy" decoding="async" src="{{ sponsor.image }}" height="128"
+                        <img loading="lazy" decoding="async" src="{{ sponsor.image if sponsor.image else fallback_image }}" height="128"
+                            onerror="this.src = '{{fallback_image}}'"
                             alt="{{ sponsor_title }}"
                             title="{{ sponsor_title }}" />
                     </a>
@@ -96,7 +99,8 @@ <h2 class="section-title h4" id="gold">{{ site.sponsors_page.tiers.gold.title }}
 
                 <li>
                     <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">
-                        <img loading="lazy" decoding="async" src="{{ sponsor.image }}" height="128"
+                        <img loading="lazy" decoding="async" src="{{ sponsor.image if sponsor.image else fallback_image }}" height="128"
+                            onerror="this.src = '{{fallback_image}}'"
                             alt="{{ sponsor_title }}"
                             title="{{ sponsor_title }}" />
                     </a>
@@ -123,7 +127,8 @@ <h2 class="section-title h4" id="silver">{{ site.sponsors_page.tiers.silver.titl
 
                 <li>
                     <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">
-                        <img loading="lazy" decoding="async" src="{{ sponsor.image }}" height="128"
+                        <img loading="lazy" decoding="async" src="{{ sponsor.image if sponsor.image else fallback_image }}" height="128"
+                            onerror="this.src = '{{fallback_image}}'"
                             alt="{{ sponsor_title }}"
                             title="{{ sponsor_title }}" />
                     </a>
@@ -150,7 +155,8 @@ <h2 class="section-title h4" id="bronze">{{ site.sponsors_page.tiers.bronze.titl
 
                 <li>
                     <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">
-                        <img loading="lazy" decoding="async" src="{{ sponsor.image }}" height="128"
+                        <img loading="lazy" decoding="async" src="{{ sponsor.image if sponsor.image else fallback_image }}" height="128"
+                            onerror="this.src = '{{fallback_image}}'"
                             alt="{{ sponsor_title }}"
                             title="{{ sponsor_title }}" />
                     </a>
@@ -174,7 +180,7 @@ <h2 class="section-title h4" id="technology">{{ site.sponsors_page.tiers.technol
                     {% set sponsor_title = site.sponsors_page.tech_sponsor_title | replace("SPONSOR_NAME", sponsor.name) | replace("TECH", sponsor.donation | capitalize) %}
                 <li>
                     <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">
-                        <img loading="lazy" decoding="async" src="{{ sponsor.image }}" alt="{{ sponsor_title }}" title="{{ sponsor_title }}" height="64"/>
+                        <img loading="lazy" decoding="async" src="{{ sponsor.image if sponsor.image else fallback_image }}" alt="{{ sponsor_title }}" title="{{ sponsor_title }}" height="64" onerror="this.src = '{{fallback_image}}'"/>
                     </a>
                 </li>
                 {% endfor %}
@@ -222,7 +228,6 @@ <h2 class="section-title h3">{{ site.sponsors_page.tiers.backers.title }}</h2>
         </div>
         <div class="grid">
             <ul role="list" class="sponsors span-1-12 sponsors--backers">
-                {% set fallback_image = '/assets/images/people/_placeholder-avatar.svg' %}
                 {% for sponsor in sponsors.backers %}
                 <li>
                     <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">
diff --git a/tools/add-author.js b/tools/add-author.js
index d015f9c9d..eb6c5edb3 100644
--- a/tools/add-author.js
+++ b/tools/add-author.js
@@ -15,6 +15,7 @@
 const fs = require("node:fs/promises");
 const { Octokit } = require("@octokit/rest");
 const path = require("node:path");
+const { getGithubAvatar } = require("./utils");
 
 //-----------------------------------------------------------------------------
 // Data
@@ -46,7 +47,7 @@ async function fetchUserProfile() {
 		name: profile.name,
 		title: "Guest Author",
 		website: profile.blog,
-		avatar_url: `${profile.avatar_url.replace("private-", "").split("?")[0]}?v=4`,
+		avatar_url: getGithubAvatar(profile),
 		bio: profile.bio,
 		twitter_username: profile.twitter_username,
 		github_username: profile.login,
diff --git a/tools/fetch-sponsors.js b/tools/fetch-sponsors.js
index 6148c9c31..b9eeb3c64 100644
--- a/tools/fetch-sponsors.js
+++ b/tools/fetch-sponsors.js
@@ -20,6 +20,7 @@
 const fs = require("node:fs/promises");
 const { request } = require("undici");
 const { graphql: githubGraphQL } = require("@octokit/graphql");
+const { getGithubAvatar } = require("./utils");
 
 //-----------------------------------------------------------------------------
 // Data
@@ -352,7 +353,7 @@ async function fetchGitHubSponsors() {
 		// return an array in the same format as Open Collective
 		.map(({ sponsor, tier }) => ({
 			name: sponsor.name || sponsor.login,
-			image: `${sponsor.avatarUrl.replace("private-", "").split("?")[0]}?v=4`,
+			image: getGithubAvatar(sponsor),
 			url: fixUrl(sponsor.websiteUrl || sponsor.url),
 			monthlyDonation: tier.monthlyPriceInDollars,
 			source: "github",
@@ -365,7 +366,7 @@ async function fetchGitHubSponsors() {
 		.map(({ sponsor, timestamp, tier, id }) => ({
 			id,
 			name: sponsor.name || sponsor.login,
-			image: `${sponsor.avatarUrl.replace("private-", "").split("?")[0]}?v=4`,
+			image: getGithubAvatar(sponsor),
 			url: fixUrl(sponsor.websiteUrl || sponsor.url),
 			amount: tier.monthlyPriceInDollars,
 			date: timestamp,
diff --git a/tools/fetch-team-data.js b/tools/fetch-team-data.js
index a134f1629..c19123412 100644
--- a/tools/fetch-team-data.js
+++ b/tools/fetch-team-data.js
@@ -16,6 +16,7 @@ const fs = require("node:fs/promises");
 const matter = require("gray-matter");
 const { Octokit } = require("@octokit/rest");
 const path = require("node:path");
+const { getGithubAvatar } = require("./utils");
 
 //-----------------------------------------------------------------------------
 // Data
@@ -96,7 +97,7 @@ async function fetchUserProfile(username) {
 			: profile.blog
 				? `https://${profile.blog}`
 				: profile.blog,
-		avatar_url: `${profile.avatar_url.replace("private-", "").split("?")[0]}?v=4`,
+		avatar_url: getGithubAvatar(profile),
 		bio: profile.bio,
 		twitter_username: profile.twitter_username,
 		github_username: profile.login,
diff --git a/tools/utils.js b/tools/utils.js
new file mode 100644
index 000000000..b1416c8fb
--- /dev/null
+++ b/tools/utils.js
@@ -0,0 +1,9 @@
+"use strict";
+
+function getGithubAvatar(profile) {
+    return `${profile.avatar_url.replace("private-", "").split("?")[0]}?v=4`
+}
+
+module.exports = {
+    getGithubAvatar
+}
\ No newline at end of file

From f6193da864789010a031a24fbeeb7c1dc0cc0c80 Mon Sep 17 00:00:00 2001
From: Tanuj Kanti <tanujkanti4441@gmail.com>
Date: Mon, 30 Dec 2024 15:47:24 +0530
Subject: [PATCH 4/8] fix linting errors in utils.js

---
 tools/utils.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tools/utils.js b/tools/utils.js
index b1416c8fb..4442dd4c3 100644
--- a/tools/utils.js
+++ b/tools/utils.js
@@ -1,5 +1,15 @@
+/**
+ * @fileoverview Common utils for tools
+ * @author Tanuj Kanti
+ */
+
 "use strict";
 
+/**
+ * Get the avatar link of Github profile images with no additional tokens
+ * @param {Object} profile fetched data of Github users
+ * @returns {string} Github avatar link
+ */
 function getGithubAvatar(profile) {
     return `${profile.avatar_url.replace("private-", "").split("?")[0]}?v=4`
 }

From d1e5edfa92030cd25fac7c5710e115f57cdd192f Mon Sep 17 00:00:00 2001
From: Tanuj Kanti <tanujkanti4441@gmail.com>
Date: Mon, 30 Dec 2024 20:09:28 +0530
Subject: [PATCH 5/8] fix styling error

---
 tools/utils.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/utils.js b/tools/utils.js
index 4442dd4c3..14fcc6732 100644
--- a/tools/utils.js
+++ b/tools/utils.js
@@ -11,9 +11,9 @@
  * @returns {string} Github avatar link
  */
 function getGithubAvatar(profile) {
-    return `${profile.avatar_url.replace("private-", "").split("?")[0]}?v=4`
+	return `${profile.avatar_url.replace("private-", "").split("?")[0]}?v=4`;
 }
 
 module.exports = {
-    getGithubAvatar
-}
\ No newline at end of file
+	getGithubAvatar,
+};

From 13f3390ea2e9af07da64afdfa3216951b23ccd05 Mon Sep 17 00:00:00 2001
From: Tanuj Kanti <tanujkanti4441@gmail.com>
Date: Tue, 31 Dec 2024 22:08:58 +0530
Subject: [PATCH 6/8] revert changes related to avatar link

---
 tools/add-author.js      |  3 +--
 tools/fetch-sponsors.js  |  5 ++---
 tools/fetch-team-data.js |  3 +--
 tools/utils.js           | 19 -------------------
 4 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 tools/utils.js

diff --git a/tools/add-author.js b/tools/add-author.js
index eb6c5edb3..b489a2b6f 100644
--- a/tools/add-author.js
+++ b/tools/add-author.js
@@ -15,7 +15,6 @@
 const fs = require("node:fs/promises");
 const { Octokit } = require("@octokit/rest");
 const path = require("node:path");
-const { getGithubAvatar } = require("./utils");
 
 //-----------------------------------------------------------------------------
 // Data
@@ -47,7 +46,7 @@ async function fetchUserProfile() {
 		name: profile.name,
 		title: "Guest Author",
 		website: profile.blog,
-		avatar_url: getGithubAvatar(profile),
+		avatar_url: profile.avatar_url,
 		bio: profile.bio,
 		twitter_username: profile.twitter_username,
 		github_username: profile.login,
diff --git a/tools/fetch-sponsors.js b/tools/fetch-sponsors.js
index b9eeb3c64..24ef56719 100644
--- a/tools/fetch-sponsors.js
+++ b/tools/fetch-sponsors.js
@@ -20,7 +20,6 @@
 const fs = require("node:fs/promises");
 const { request } = require("undici");
 const { graphql: githubGraphQL } = require("@octokit/graphql");
-const { getGithubAvatar } = require("./utils");
 
 //-----------------------------------------------------------------------------
 // Data
@@ -353,7 +352,7 @@ async function fetchGitHubSponsors() {
 		// return an array in the same format as Open Collective
 		.map(({ sponsor, tier }) => ({
 			name: sponsor.name || sponsor.login,
-			image: getGithubAvatar(sponsor),
+			image: sponsor.avatarUrl,
 			url: fixUrl(sponsor.websiteUrl || sponsor.url),
 			monthlyDonation: tier.monthlyPriceInDollars,
 			source: "github",
@@ -366,7 +365,7 @@ async function fetchGitHubSponsors() {
 		.map(({ sponsor, timestamp, tier, id }) => ({
 			id,
 			name: sponsor.name || sponsor.login,
-			image: getGithubAvatar(sponsor),
+			image: sponsor.avatarUrl,
 			url: fixUrl(sponsor.websiteUrl || sponsor.url),
 			amount: tier.monthlyPriceInDollars,
 			date: timestamp,
diff --git a/tools/fetch-team-data.js b/tools/fetch-team-data.js
index c19123412..01bf4cac8 100644
--- a/tools/fetch-team-data.js
+++ b/tools/fetch-team-data.js
@@ -16,7 +16,6 @@ const fs = require("node:fs/promises");
 const matter = require("gray-matter");
 const { Octokit } = require("@octokit/rest");
 const path = require("node:path");
-const { getGithubAvatar } = require("./utils");
 
 //-----------------------------------------------------------------------------
 // Data
@@ -97,7 +96,7 @@ async function fetchUserProfile(username) {
 			: profile.blog
 				? `https://${profile.blog}`
 				: profile.blog,
-		avatar_url: getGithubAvatar(profile),
+		avatar_url: profile.avatar_url,
 		bio: profile.bio,
 		twitter_username: profile.twitter_username,
 		github_username: profile.login,
diff --git a/tools/utils.js b/tools/utils.js
deleted file mode 100644
index 14fcc6732..000000000
--- a/tools/utils.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @fileoverview Common utils for tools
- * @author Tanuj Kanti
- */
-
-"use strict";
-
-/**
- * Get the avatar link of Github profile images with no additional tokens
- * @param {Object} profile fetched data of Github users
- * @returns {string} Github avatar link
- */
-function getGithubAvatar(profile) {
-	return `${profile.avatar_url.replace("private-", "").split("?")[0]}?v=4`;
-}
-
-module.exports = {
-	getGithubAvatar,
-};

From 6d75dafba5cbbe91b28b6ad70b666d12a15cfe52 Mon Sep 17 00:00:00 2001
From: Tanuj Kanti <tanujkanti4441@gmail.com>
Date: Sat, 4 Jan 2025 12:40:27 +0530
Subject: [PATCH 7/8] revert changes in index and sponsors page

---
 src/content/pages/index.html    |  7 ++-----
 src/content/pages/sponsors.html | 19 +++++++------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/content/pages/index.html b/src/content/pages/index.html
index 6895466fd..8b86bc39e 100644
--- a/src/content/pages/index.html
+++ b/src/content/pages/index.html
@@ -12,8 +12,6 @@
 {%- from 'components/donation.macro.html' import donationItem %}
 {%- from 'components/card.macro.html' import card %}
 
-{% set fallback_image = '/assets/images/people/_placeholder-avatar.svg' %}
-
 <section class="section hero hero--homepage">
     <div class="content-container grid">
         <div class="span-1-7 content-container">
@@ -54,8 +52,7 @@ <h1 class="section-title">{{ site.homepage.title }}</h1>
                     <div class="sponsors">
                         {% for sponsor in top_sponsors %}
                         <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">
-                            <img loading="lazy" decoding="async" src="{{ sponsor.image if sponsor.image else fallback_image }}" height="128"
-                                onerror="this.src = '{{fallback_image}}'"
+                            <img loading="lazy" decoding="async" src="{{sponsor.image}}" height="128"
                                 alt="{{sponsor.name}}"
                                 title="{{ sponsor.name }}" />
                         </a>
@@ -252,7 +249,7 @@ <h2 class="section-title h3">{{ site.homepage.sponsors.title }}</h2>
                         {% if sponsor.url %}
                         <a href="{{ sponsor.url }}" class="sponsor-link" rel="nofollow noopen sponsored" target="_blank">
                         {% endif %}
-                            <img src="{{ sponsor.image if sponsor.image else fallback_image }}" alt="{{ sponsor_title }}" title="{{ sponsor_title }}" height="48" loading="lazy" decoding="async" onerror="this.src = '{{fallback_image}}'" />
+                            <img src="{{ sponsor.image }}" alt="{{ sponsor_title }}" title="{{ sponsor_title }}" height="48" loading="lazy" decoding="async" />
                         {% if sponsor.url %}
                         </a>
                         {% endif %}
diff --git a/src/content/pages/sponsors.html b/src/content/pages/sponsors.html
index acb89d10f..ee511ddc2 100644
--- a/src/content/pages/sponsors.html
+++ b/src/content/pages/sponsors.html
@@ -12,7 +12,6 @@
 {% set supporting_text = site.sponsors_page.description %}
 {% set monthly_donations = sponsors.totals.monthlyDonations | dollars %}
 {% set supporting_text = supporting_text | replace("BACKER_COUNT", sponsors.totals.sponsorCount) | replace("MONTHLY_DONATIONS", monthly_donations) %}
-{% set fallback_image = '/assets/images/people/_placeholder-avatar.svg' %}
 
 {{ hero({
     title: site.sponsors_page.title,
@@ -43,8 +42,7 @@ <h2 class="section-title h4" id="diamond">{{ site.sponsors_page.tiers.diamond.ti
 
                 <li>
                     <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">
-                        <img loading="lazy" decoding="async" src="{{ sponsor.image if sponsor.image else fallback_image }}" height="128"
-                            onerror="this.src = '{{fallback_image}}'"
+                        <img loading="lazy" decoding="async" src="{{ sponsor.image }}" height="128"
                             alt="{{ sponsor_title }}"
                             title="{{ sponsor_title }}" />
                     </a>
@@ -71,8 +69,7 @@ <h2 class="section-title h4" id="platinum">{{ site.sponsors_page.tiers.platinum.
 
                 <li>
                     <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">
-                        <img loading="lazy" decoding="async" src="{{ sponsor.image if sponsor.image else fallback_image }}" height="128"
-                            onerror="this.src = '{{fallback_image}}'"
+                        <img loading="lazy" decoding="async" src="{{ sponsor.image }}" height="128"
                             alt="{{ sponsor_title }}"
                             title="{{ sponsor_title }}" />
                     </a>
@@ -99,8 +96,7 @@ <h2 class="section-title h4" id="gold">{{ site.sponsors_page.tiers.gold.title }}
 
                 <li>
                     <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">
-                        <img loading="lazy" decoding="async" src="{{ sponsor.image if sponsor.image else fallback_image }}" height="128"
-                            onerror="this.src = '{{fallback_image}}'"
+                        <img loading="lazy" decoding="async" src="{{ sponsor.image }}" height="128"
                             alt="{{ sponsor_title }}"
                             title="{{ sponsor_title }}" />
                     </a>
@@ -127,8 +123,7 @@ <h2 class="section-title h4" id="silver">{{ site.sponsors_page.tiers.silver.titl
 
                 <li>
                     <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">
-                        <img loading="lazy" decoding="async" src="{{ sponsor.image if sponsor.image else fallback_image }}" height="128"
-                            onerror="this.src = '{{fallback_image}}'"
+                        <img loading="lazy" decoding="async" src="{{ sponsor.image }}" height="128"
                             alt="{{ sponsor_title }}"
                             title="{{ sponsor_title }}" />
                     </a>
@@ -155,8 +150,7 @@ <h2 class="section-title h4" id="bronze">{{ site.sponsors_page.tiers.bronze.titl
 
                 <li>
                     <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">
-                        <img loading="lazy" decoding="async" src="{{ sponsor.image if sponsor.image else fallback_image }}" height="128"
-                            onerror="this.src = '{{fallback_image}}'"
+                        <img loading="lazy" decoding="async" src="{{ sponsor.image }}" height="128"
                             alt="{{ sponsor_title }}"
                             title="{{ sponsor_title }}" />
                     </a>
@@ -180,7 +174,7 @@ <h2 class="section-title h4" id="technology">{{ site.sponsors_page.tiers.technol
                     {% set sponsor_title = site.sponsors_page.tech_sponsor_title | replace("SPONSOR_NAME", sponsor.name) | replace("TECH", sponsor.donation | capitalize) %}
                 <li>
                     <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">
-                        <img loading="lazy" decoding="async" src="{{ sponsor.image if sponsor.image else fallback_image }}" alt="{{ sponsor_title }}" title="{{ sponsor_title }}" height="64" onerror="this.src = '{{fallback_image}}'"/>
+                        <img loading="lazy" decoding="async" src="{{ sponsor.image }}" alt="{{ sponsor_title }}" title="{{ sponsor_title }}" height="64"/>
                     </a>
                 </li>
                 {% endfor %}
@@ -228,6 +222,7 @@ <h2 class="section-title h3">{{ site.sponsors_page.tiers.backers.title }}</h2>
         </div>
         <div class="grid">
             <ul role="list" class="sponsors span-1-12 sponsors--backers">
+                {% set fallback_image = '/assets/images/people/_placeholder-avatar.svg' %}
                 {% for sponsor in sponsors.backers %}
                 <li>
                     <a href="{{ sponsor.url | url }}" class="sponsor-link" rel="nofollow noopener sponsored" target="_blank">

From 91834de0753f3101933f534b61a4bd72f0042f24 Mon Sep 17 00:00:00 2001
From: Tanuj Kanti <tanujkanti4441@gmail.com>
Date: Sat, 4 Jan 2025 19:27:13 +0530
Subject: [PATCH 8/8] fix CI errors

---
 src/_includes/components/card.macro.html    | 2 +-
 src/_includes/components/profile.macro.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/_includes/components/card.macro.html b/src/_includes/components/card.macro.html
index 751c416c0..a237dea96 100644
--- a/src/_includes/components/card.macro.html
+++ b/src/_includes/components/card.macro.html
@@ -44,7 +44,7 @@ <h3 class="card__title">
         </p>
         <div class="card__footer">
             {% set fallback_image = '/assets/images/people/_placeholder-avatar.svg' %}
-            <img class="blog-post__author-photo" src="{{ params.image if params.image else fallback_image }}" alt="{{ params.authorName }}" width="40" height="40" loading="lazy" onerror="this.src = '{{fallback_image}}'">
+            <img class="blog-post__author-photo" src="{{ params.authorImage if params.authorImage else fallback_image }}" alt="{{ params.authorName }}" width="40" height="40" loading="lazy" onerror="this.src = '{{fallback_image}}'">
             <div class="blog-post__author__details">
                 <div class="blog-post__author-name">{{ params.authorName }}</div>
                 <time class="blog-post__publish-date" datetime="{{ params.date }}">{{ params.date | readableDate }}</time>
diff --git a/src/_includes/components/profile.macro.html b/src/_includes/components/profile.macro.html
index a2b450a75..56a063f28 100644
--- a/src/_includes/components/profile.macro.html
+++ b/src/_includes/components/profile.macro.html
@@ -2,7 +2,7 @@
 {% set fallback_image = '/assets/images/people/_placeholder-avatar.svg' %}
 {%- macro member(params) -%}
 <div class="profile profile--member">
-    <img class="profile__photo profile__photo--large" src="{{ params.image if params.image else fallback_image }}" alt="{{ params.name }}" width="80" height="80" onerror="this.src = '{{fallback_image}}'">
+    <img class="profile__photo profile__photo--large" src="{{ params.photo if params.photo else fallback_image }}" alt="{{ params.name }}" width="80" height="80" onerror="this.src = '{{fallback_image}}'">
     <div class="profile__details">
         <div class="profile__name">
             {{ params.name }}
@@ -76,7 +76,7 @@
 <!-- has avatar, name, and handle only -->
 {%- macro contributor(params) -%}
 <div class="profile profile--contributor">
-    <img class="profile__photo profile__photo--medium" src="{{ params.image if params.image else fallback_image }}" width="56" height="56" alt="{{ params.name }}" loading="lazy" onerror="this.src = '{{fallback_image}}'">
+    <img class="profile__photo profile__photo--medium" src="{{ params.photo if params.photo else fallback_image }}" width="56" height="56" alt="{{ params.name }}" loading="lazy" onerror="this.src = '{{fallback_image}}'">
     <div class="profile__details">
         <div class="profile__name">{{ params.name }}</div>
       <a href="https://github.com/{{ params.handle}}" class="profile__handle">@{{ params.handle }}</a>
@@ -88,7 +88,7 @@
 {%- macro post_author(params) -%}
 <div class="profile profile--author">
     <div class="profile--author__details">
-        <img class="profile__photo profile__photo--small" src="{{ params.image if params.image else fallback_image }}" alt="{{ params.name }}" width="48" height="48" loading="lazy" onerror="this.src = '{{fallback_image}}'">
+        <img class="profile__photo profile__photo--small" src="{{ params.photo if params.photo else fallback_image }}" alt="{{ params.name }}" width="48" height="48" loading="lazy" onerror="this.src = '{{fallback_image}}'">
         <div class="profile__details">
             <div class="profile__name">
                 {{ params.name }}