fix: improve author-email/name-lookup conditionals

seantrane · seantrane · commit 2abcdb9ccd04 · 2018-11-06T16:40:52.000-05:00
diff --git a/src/finda.ts b/src/finda.ts
@@ -49,10 +49,10 @@ export class Finda {
     if (isString(author) && typeof email === 'undefined') {
       email = (author.match(/<[^@]+.+(?=>)/g) || []).join('').substr(1);
     }
-    if (!get(email, 'length')) {
+    if (get(email, 'length') < 6) {
       email = this.gitEmail();
     }
-    if (!get(email, 'length')) {
+    if (typeof email === 'undefined' || get(email, 'length') < 6) {
       email = defaultEmail || `${userInfo().username}@${hostname()}`;
     }
     return email;
@@ -73,10 +73,10 @@ export class Finda {
     if (isString(name)) {
       name = trimEnd((name.match(/^[^\<\(]+/g) || []).join(''));
     }
-    if (!get(name, 'length')) {
+    if (typeof name === 'undefined' || get(name, 'length') < 1) {
       name = this.gitName();
     }
-    if (!get(name, 'length')) {
+    if (typeof name === 'undefined' || get(name, 'length') < 1) {
       name = startCase(this.username());
     }
     return name;

Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,10 @@ export class Finda {`
`49`	`49`	`if (isString(author) && typeof email === 'undefined') {`
`50`	`50`	`email = (author.match(/<[^@]+.+(?=>)/g) \|\| []).join('').substr(1);`
`51`	`51`	`}`
`52`		`- if (!get(email, 'length')) {`
	`52`	`+ if (get(email, 'length') < 6) {`
`53`	`53`	`email = this.gitEmail();`
`54`	`54`	`}`
`55`		`- if (!get(email, 'length')) {`
	`55`	`+ if (typeof email === 'undefined' \|\| get(email, 'length') < 6) {`
`56`	`56`	email = defaultEmail \|\| `${userInfo().username}@${hostname()}`;
`57`	`57`	`}`
`58`	`58`	`return email;`
`@@ -73,10 +73,10 @@ export class Finda {`
`73`	`73`	`if (isString(name)) {`
`74`	`74`	`name = trimEnd((name.match(/^[^\<\(]+/g) \|\| []).join(''));`
`75`	`75`	`}`
`76`		`- if (!get(name, 'length')) {`
	`76`	`+ if (typeof name === 'undefined' \|\| get(name, 'length') < 1) {`
`77`	`77`	`name = this.gitName();`
`78`	`78`	`}`
`79`		`- if (!get(name, 'length')) {`
	`79`	`+ if (typeof name === 'undefined' \|\| get(name, 'length') < 1) {`
`80`	`80`	`name = startCase(this.username());`
`81`	`81`	`}`
`82`	`82`	`return name;`