From 7cb7994cdae848053487d00c1730d1e865fb8623 Mon Sep 17 00:00:00 2001
From: Michael Muré <batolettre@gmail.com>
Date: Sun, 7 Oct 2018 18:27:23 +0200
Subject: github: also pull users email

---
 bridge/github/import.go | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

(limited to 'bridge/github/import.go')

diff --git a/bridge/github/import.go b/bridge/github/import.go
index ed0135e7..93390408 100644
--- a/bridge/github/import.go
+++ b/bridge/github/import.go
@@ -565,9 +565,29 @@ func (gi *githubImporter) makePerson(actor *actor) bug.Person {
 	if actor == nil {
 		return gi.ghost
 	}
+	var name string
+	var email string
+
+	switch actor.Typename {
+	case "User":
+		if actor.User.Name != nil {
+			name = string(*(actor.User.Name))
+		}
+		email = string(actor.User.Email)
+	case "Organization":
+		if actor.Organization.Name != nil {
+			name = string(*(actor.Organization.Name))
+		}
+		if actor.Organization.Email != nil {
+			email = string(*(actor.Organization.Email))
+		}
+	case "Bot":
+	}
 
 	return bug.Person{
-		Name:      string(actor.Login),
+		Name:      name,
+		Email:     email,
+		Login:     string(actor.Login),
 		AvatarUrl: string(actor.AvatarUrl),
 	}
 }
@@ -584,9 +604,16 @@ func (gi *githubImporter) fetchGhost() error {
 		return err
 	}
 
+	var name string
+	if q.User.Name != nil {
+		name = string(*q.User.Name)
+	}
+
 	gi.ghost = bug.Person{
-		Name:      string(q.User.Login),
+		Name:      name,
+		Login:     string(q.User.Login),
 		AvatarUrl: string(q.User.AvatarUrl),
+		Email:     string(q.User.Email),
 	}
 
 	return nil
-- 
cgit