Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "feat: add INCLUDE_ORGS env variable" #2276

Merged
merged 1 commit into from
Nov 21, 2022
Merged

Revert "feat: add INCLUDE_ORGS env variable" #2276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/common/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
25 changes: 6 additions & 19 deletions src/fetchers/stats-fetcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
CustomError,
logger,
MissingParamError,
parseBoolean,
request,
wrapTextMultiline,
} from "../common/utils.js";
Expand All @@ -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
Expand All @@ -46,7 +45,7 @@ const fetcher = (variables, token) => {
followers {
totalCount
}
repositories(ownerAffiliations: $ownerAffiliations) {
repositories(ownerAffiliations: OWNER) {
totalCount
}
}
Expand All @@ -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 {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
12 changes: 3 additions & 9 deletions src/fetchers/top-languages-fetcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
CustomError,
logger,
MissingParamError,
parseBoolean,
request,
wrapTextMultiline,
} from "../common/utils.js";
Expand All @@ -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}) {
Expand Down Expand Up @@ -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);
Expand Down