From 944807a29bd9c8117a23cb17a88846ba5536f697 Mon Sep 17 00:00:00 2001
From: Rick Staa <rick.staa@outlook.com>
Date: Mon, 21 Nov 2022 11:14:04 +0100
Subject: [PATCH] Revert "feat: add INCLUDE_ORGS env variable (#2275)"

This reverts commit ada9cf4e0eeec24579ec12ee709fa7afd402fcf8.
---
 src/common/utils.js                   |  2 +-
 src/fetchers/stats-fetcher.js         | 25 ++++++-------------------
 src/fetchers/top-languages-fetcher.js | 12 +++---------
 3 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/src/common/utils.js b/src/common/utils.js
index 147f5408f81f3..1215fc9ac8cc2 100644
--- a/src/common/utils.js
+++ b/src/common/utils.js
@@ -77,7 +77,7 @@ const isValidHexColor = (hexColor) => {
 /**
  * Returns boolean if value is either "true" or "false" else the value as it is.
  *
- * @param {string | boolean| undefined} value The value to parse.
+ * @param {string | boolean} value The value to parse.
  * @returns {boolean | undefined } The parsed value.
  */
 const parseBoolean = (value) => {
diff --git a/src/fetchers/stats-fetcher.js b/src/fetchers/stats-fetcher.js
index a8ed082c57102..7f6cb9e5e95b4 100644
--- a/src/fetchers/stats-fetcher.js
+++ b/src/fetchers/stats-fetcher.js
@@ -7,7 +7,6 @@ import {
   CustomError,
   logger,
   MissingParamError,
-  parseBoolean,
   request,
   wrapTextMultiline,
 } from "../common/utils.js";
@@ -23,7 +22,7 @@ const fetcher = (variables, token) => {
   return request(
     {
       query: `
-      query userInfo($login: String!, $ownerAffiliations: [RepositoryAffiliation]) {
+      query userInfo($login: String!) {
         user(login: $login) {
           name
           login
@@ -46,7 +45,7 @@ const fetcher = (variables, token) => {
           followers {
             totalCount
           }
-          repositories(ownerAffiliations: $ownerAffiliations) {
+          repositories(ownerAffiliations: OWNER) {
             totalCount
           }
         }
@@ -71,9 +70,9 @@ const repositoriesFetcher = (variables, token) => {
   return request(
     {
       query: `
-      query userInfo($login: String!, $after: String, $ownerAffiliations: [RepositoryAffiliation]) {
+      query userInfo($login: String!, $after: String) {
         user(login: $login) {
-          repositories(first: 100, ownerAffiliations: $ownerAffiliations, orderBy: {direction: DESC, field: STARGAZERS}, after: $after) {
+          repositories(first: 100, ownerAffiliations: OWNER, orderBy: {direction: DESC, field: STARGAZERS}, after: $after) {
             nodes {
               name
               stargazers {
@@ -150,14 +149,7 @@ const totalStarsFetcher = async (username, repoToHide) => {
   let hasNextPage = true;
   let endCursor = null;
   while (hasNextPage) {
-    const variables = {
-      login: username,
-      first: 100,
-      after: endCursor,
-      ownerAffiliations: parseBoolean(process.env.INCLUDE_ORGS)
-        ? ["OWNER", "COLLABORATOR"]
-        : ["OWNER"],
-    };
+    const variables = { login: username, first: 100, after: endCursor };
     let res = await retryer(repositoriesFetcher, variables);
 
     if (res.data.errors) {
@@ -211,12 +203,7 @@ const fetchStats = async (
     rank: { level: "C", score: 0 },
   };
 
-  let res = await retryer(fetcher, {
-    login: username,
-    ownerAffiliations: parseBoolean(process.env.INCLUDE_ORGS)
-      ? ["OWNER", "COLLABORATOR"]
-      : ["OWNER"],
-  });
+  let res = await retryer(fetcher, { login: username });
 
   // Catch GraphQL errors.
   if (res.data.errors) {
diff --git a/src/fetchers/top-languages-fetcher.js b/src/fetchers/top-languages-fetcher.js
index cf8c3d16610ab..86d794435be08 100644
--- a/src/fetchers/top-languages-fetcher.js
+++ b/src/fetchers/top-languages-fetcher.js
@@ -4,7 +4,6 @@ import {
   CustomError,
   logger,
   MissingParamError,
-  parseBoolean,
   request,
   wrapTextMultiline,
 } from "../common/utils.js";
@@ -20,10 +19,10 @@ const fetcher = (variables, token) => {
   return request(
     {
       query: `
-      query userInfo($login: String!, $ownerAffiliations: [RepositoryAffiliation]) {
+      query userInfo($login: String!) {
         user(login: $login) {
           # fetch only owner repos & not forks
-          repositories(ownerAffiliations: $ownerAffiliations, isFork: false, first: 100) {
+          repositories(ownerAffiliations: OWNER, isFork: false, first: 100) {
             nodes {
               name
               languages(first: 10, orderBy: {field: SIZE, direction: DESC}) {
@@ -58,12 +57,7 @@ const fetcher = (variables, token) => {
 const fetchTopLanguages = async (username, exclude_repo = []) => {
   if (!username) throw new MissingParamError(["username"]);
 
-  const res = await retryer(fetcher, {
-    login: username,
-    ownerAffiliations: parseBoolean(process.env.INCLUDE_ORGS)
-      ? ["OWNER", "COLLABORATOR"]
-      : ["OWNER"],
-  });
+  const res = await retryer(fetcher, { login: username });
 
   if (res.data.errors) {
     logger.error(res.data.errors);