Skip to content

Commit 0b5562f

Browse files
melroy89akhilmhdh
authored andcommitted
Fix null name & introduce eslint fix command
1 parent 507d466 commit 0b5562f

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"main": "index.js",
66
"scripts": {
77
"lint": "eslint .",
8+
"fix": "eslint --fix .",
89
"format": "prettier --write **/*.js",
910
"format-check": "prettier --check **/*.js",
1011
"test": "jest --verbose",

src/utils/templateBuilder.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,22 @@ export const getUserInfo = async (login, avatarUrl, prevContributors, useUserNam
3131
const {
3232
data: { name, avatar_url }
3333
} = await octokit.rest.users.getByUsername({ username: login });
34-
return { name: useUserName ? login : htmlEncoding(name), url: avatar_url };
34+
// Use login (== username) when useUserName is true, otherwise try to use name.
35+
// Unless name is null, then fallback to login.
36+
const finalName = (useUserName) ? login: (name) ? capitalize(htmlEncoding(name)) : login
37+
return { name: finalName, url: avatar_url };
3538
} catch (error) {
3639
console.log(`Oops...given github id ${login} is invalid :(`);
3740
return { name: login, url: '' };
3841
}
3942
}
4043

44+
// Use login (== username) when useUserName is true, otherwise try to use name.
45+
// If name is null, then fallback to login.
46+
const finalName = (useUserName) ? login : (prevContributors[login] && prevContributors[login].name) ?
47+
capitalize(htmlEncoding(prevContributors[login].name)) : login
4148
return {
42-
name: useUserName ? login : htmlEncoding(prevContributors[login].name),
49+
name: finalName,
4350
url: avatarUrl || prevContributors[login].url
4451
};
4552
};
@@ -82,7 +89,7 @@ const templateBuilder = async (contributors, prevContributors, type) => {
8289
contributors_content += getTemplate(
8390
login,
8491
imageSize,
85-
useUsername ? name : capitalize(name),
92+
name,
8693
url
8794
);
8895
} else {

0 commit comments

Comments
 (0)