feat: include all commits from the year the user joined

src/card.ts

@@ -143,7 +143,7 @@ export default function cardStyle(data: GetData, uiConfig: UiConfig): string {
       ${gradientStops}
     </linearGradient>
   </defs>
-  <rect x="0.5" y="0.5" rx="${uiConfig.borderRadius}" height="99.6%" width="99.8%" fill="url(#${gradientId})" ${hideBorder}/>`;
+  <rect x="0.5" y="0.5" rx="${uiConfig.borderRadius}" height="99.4%" width="99.8%" fill="url(#${gradientId})" ${hideBorder}/>`;
   }
 
   // Generating SVG code for the background based on background color or gradient
@@ -158,7 +158,7 @@ export default function cardStyle(data: GetData, uiConfig: UiConfig): string {
         backgroundSVG = generateGradient(gradientColors);
       } else {
         backgroundSVG = `
-  <rect x="0.5" y="0.5" rx="${uiConfig.borderRadius}" height="99.6%" width="99.8%" fill="#${uiConfig.bgColor}" ${hideBorder}/>`;
+  <rect x="0.5" y="0.5" rx="${uiConfig.borderRadius}" height="99.4%" width="99.8%" fill="#${uiConfig.bgColor}" ${hideBorder}/>`;
       }
     }
   }

src/fetcher/apiFetch.ts

@@ -10,14 +10,16 @@
   repositories: Repositories;
   followers: Followers;
   following: Following;
-  contributionsCollection: ContributionsCollection;
   openedIssues: OpenedIssues;
   closedIssues: ClosedIssues;
   pullRequests: PullRequests;
   mergedPullRequests: MergedPullRequests;
   discussionStarted: DiscussionStarted;
   discussionAnswered: DiscussionAnswered;
   repositoriesContributedTo: RepositoriesContributedTo;
+  totalCommitContributions: number;
+  restrictedContributionsCount: number;
+  totalPullRequestReviewContributions: number;
 }
 
 // Represents the total count of repositories
@@ -77,13 +79,101 @@
   totalCount: number;
 }
 
+async function getUserJoinYear(username: string): Promise<number> {
+  const data = await axios({
+    method: "post",
+    url: "https://api.github.com/graphql",
+    headers: {
+      "User-Agent": "FajarKim/github-readme-profile",
+      Authorization: getRandomToken(true),
+    },
+    data: {
+      query: `query userInfo($username: String!) {
+        user(login: $username) {
+          createdAt
+        }
+      }`,
+      variables: {
+        username,
+      },
+    },
+  });
+
+  if (data.data.errors?.length > 0) {
+    throw new Error(data.data.errors[0].message);
+  }
+
+  const user = data.data.data.user;
+  if (!user || !user.createdAt) {
+    throw new Error("User data is missing.");
+  }
+
+  const joinDate = new Date(user.createdAt);
+  return joinDate.getFullYear();
+}
+
+async function fetchContributions(username: string, year: number): Promise<ContributionsCollection> {
+  const from = `${year}-01-01T00:00:00Z`;
+  const to = `${year}-12-31T23:59:59Z`;
+
+  const data = await axios({
+    method: "post",
+    url: "https://api.github.com/graphql",
+    headers: {
+      "User-Agent": "FajarKim/github-readme-profile",
+      Authorization: getRandomToken(true),
+    },
+    data: {
+      query: `query userInfo($username: String!, $from: DateTime!, $to: DateTime!) {
+        user(login: $username) {
+          contributionsCollection(from: $from, to: $to) {
+            totalCommitContributions
+            restrictedContributionsCount
+            totalPullRequestReviewContributions
+          }
+        }
+      }`,
+      variables: {
+        username,
+        from,
+        to,
+      },
+    },
+  });
+
+  if (data.data.errors?.length > 0) {
+    throw new Error(data.data.errors[0].message);
+  }
+
+  const contributions = data.data.data.user.contributionsCollection;
+  return {
+    totalCommitContributions: contributions.totalCommitContributions,
+    restrictedContributionsCount: contributions.restrictedContributionsCount,
+    totalPullRequestReviewContributions: contributions.totalPullRequestReviewContributions,
+  };
+}
+
 /**
  * Fetches user data from the GitHub GraphQL API.
  *
  * @param {string} username GitHub username.
  * @returns {Promise<User>} Promise representing the user data obtained from the GitHub Graphql API.
  */
 export default async function apiFetch(username: string): Promise<User> {
+  const startYear = await getUserJoinYear(username);
+  const endYear = new Date().getFullYear();
+
+  let TotalCommitContributions = 0;
+  let RestrictedContributionsCount = 0;
+  let TotalPullRequestReviewContributions = 0;
+
+  for (let year = startYear; year <= endYear; year++) {
+    const contributions = await fetchContributions(username, year);
+    TotalCommitContributions += contributions.totalCommitContributions;
+    RestrictedContributionsCount += contributions.restrictedContributionsCount;
+    TotalPullRequestReviewContributions += contributions.totalPullRequestReviewContributions;
+  }
+
   const data = await axios({
     method: "post",
     url: "https://api.github.com/graphql",
@@ -106,11 +196,6 @@
           following {
             totalCount
           }
-          contributionsCollection {
-            totalCommitContributions
-            restrictedContributionsCount
-            totalPullRequestReviewContributions
-          }
           openedIssues: issues(states: OPEN) {
             totalCount
           }
@@ -143,5 +228,24 @@
   if (data.data.errors?.length > 0)
     throw new Error(data.data.errors[0].message);
 
-  return data.data.data.user;
+  const user = data.data.data.user;
+
+  return {
+    name: user.name,
+    login: user.login,
+    avatarUrl: user.avatarUrl,
+    repositories: user.repositories,
+    followers: user.followers,
+    following: user.following,
+    openedIssues: user.openedIssues,
+    closedIssues: user.closedIssues,
+    pullRequests: user.pullRequests,
+    mergedPullRequests: user.mergedPullRequests,
+    discussionStarted: user.discussionStarted,
+    discussionAnswered: user.discussionAnswered,
+    repositoriesContributedTo: user.repositoriesContributedTo,
+    totalCommitContributions: TotalCommitContributions,
+    restrictedContributionsCount: RestrictedContributionsCount,
+    totalPullRequestReviewContributions: TotalPullRequestReviewContributions,
+  };
 }

src/getData.ts

@@ -58,10 +58,10 @@ async function getData(username: string): Promise<GetData> {
     total_prs: millify(user.pullRequests.totalCount),
     total_prs_merged: millify(user.mergedPullRequests.totalCount),
     total_commits: millify(
-      user.contributionsCollection.restrictedContributionsCount +
-        user.contributionsCollection.totalCommitContributions
+      user.restrictedContributionsCount +
+        user.totalCommitContributions
     ),
-    total_review: millify(user.contributionsCollection.totalPullRequestReviewContributions),
+    total_review: millify(user.totalPullRequestReviewContributions),
     total_discussion_answered: millify(user.discussionAnswered.totalCount),
     total_discussion_started: millify(user.discussionStarted.totalCount),
     total_contributed_to: millify(user.repositoriesContributedTo.totalCount),