@@ -31,15 +31,22 @@ export const getUserInfo = async (login, avatarUrl, prevContributors, useUserNam
31
31
const {
32
32
data : { name, avatar_url }
33
33
} = 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 } ;
35
38
} catch ( error ) {
36
39
console . log ( `Oops...given github id ${ login } is invalid :(` ) ;
37
40
return { name : login , url : '' } ;
38
41
}
39
42
}
40
43
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
41
48
return {
42
- name : useUserName ? login : htmlEncoding ( prevContributors [ login ] . name ) ,
49
+ name : finalName ,
43
50
url : avatarUrl || prevContributors [ login ] . url
44
51
} ;
45
52
} ;
@@ -82,7 +89,7 @@ const templateBuilder = async (contributors, prevContributors, type) => {
82
89
contributors_content += getTemplate (
83
90
login ,
84
91
imageSize ,
85
- useUsername ? name : capitalize ( name ) ,
92
+ name ,
86
93
url
87
94
) ;
88
95
} else {
0 commit comments