[bridge/github] import: avoid retrieving ghost email in userQuery

a-hilaly · a-hilaly · commit 9e611ee66787 · 2019-07-06T16:20:05.000+02:00
request

rename userQuery to ghostQuery
diff --git a/bridge/github/import.go b/bridge/github/import.go
@@ -505,7 +505,7 @@ func (gi *githubImporter) getGhost(repo *cache.RepoCache) (*cache.IdentityCache,
 		return nil, err
 	}
 
-	var q userQuery
+	var q ghostQuery
 
 	variables := map[string]interface{}{
 		"login": githubv4.String("ghost"),
@@ -529,7 +529,7 @@ func (gi *githubImporter) getGhost(repo *cache.RepoCache) (*cache.IdentityCache,
 
 	return repo.NewIdentityRaw(
 		name,
-		string(q.User.Email),
+		"",
 		string(q.User.Login),
 		string(q.User.AvatarUrl),
 		map[string]string{
diff --git a/bridge/github/import_query.go b/bridge/github/import_query.go
@@ -160,12 +160,11 @@ type commentEditQuery struct {
 	} `graphql:"repository(owner: $owner, name: $name)"`
 }
 
-type userQuery struct {
+type ghostQuery struct {
 	User struct {
 		Login     githubv4.String
 		AvatarUrl githubv4.String
 		Name      *githubv4.String
-		Email     githubv4.String
 	} `graphql:"user(login: $login)"`
 }
 

Original file line number	Diff line number	Diff line change
`@@ -160,12 +160,11 @@ type commentEditQuery struct {`
`160`	`160`	} `graphql:"repository(owner: $owner, name: $name)"`
`161`	`161`	`}`
`162`	`162`
`163`		`-type userQuery struct {`
	`163`	`+type ghostQuery struct {`
`164`	`164`	`User struct {`
`165`	`165`	`Login githubv4.String`
`166`	`166`	`AvatarUrl githubv4.String`
`167`	`167`	`Name *githubv4.String`
`168`		`- Email githubv4.String`
`169`	`168`	} `graphql:"user(login: $login)"`
`170`	`169`	`}`
`171`	`170`