From 176e2fc2c547a0f7b06003ae997d7fa4552fd821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Wed, 15 Feb 2017 09:16:57 +0100
Subject: [PATCH] Adding avatar to list_user function in importers

---
 taiga/importers/asana/importer.py  | 5 +++--
 taiga/importers/github/importer.py | 1 +
 taiga/importers/jira/common.py     | 1 +
 taiga/importers/trello/importer.py | 9 ++++++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/taiga/importers/asana/importer.py b/taiga/importers/asana/importer.py
index 6c3c675a..2899ace9 100644
--- a/taiga/importers/asana/importer.py
+++ b/taiga/importers/asana/importer.py
@@ -49,11 +49,12 @@ class AsanaImporter:
     def list_users(self, project_id):
         users = []
         for ws in self._client.workspaces.find_all():
-            for user in self._client.users.find_by_workspace(ws['id'], fields=["id", "name", "email"]):
+            for user in self._client.users.find_by_workspace(ws['id'], fields=["id", "name", "email", "photo"]):
                 users.append({
                     "id": user["id"],
                     "full_name": user['name'],
-                    "detected_user": self._get_user(user)
+                    "detected_user": self._get_user(user),
+                    "avatar": user.get('photo', None) and user['photo'].get('image_60x60', None)
                 })
         return users
 
diff --git a/taiga/importers/github/importer.py b/taiga/importers/github/importer.py
index daee40c8..18c5cbce 100644
--- a/taiga/importers/github/importer.py
+++ b/taiga/importers/github/importer.py
@@ -88,6 +88,7 @@ class GithubImporter:
         return [{"id": u['id'],
                  "username": u['login'],
                  "full_name": u.get('name', u['login']),
+                 "avatar": u.get('avatar_url', None),
                  "detected_user": self._get_user(u) } for u in collaborators]
 
     def _get_user(self, user, default=None):
diff --git a/taiga/importers/jira/common.py b/taiga/importers/jira/common.py
index c38d1993..1448deeb 100644
--- a/taiga/importers/jira/common.py
+++ b/taiga/importers/jira/common.py
@@ -176,6 +176,7 @@ class JiraImporterCommon:
                 "id": user_data['key'],
                 "full_name": user_data['displayName'],
                 "email": user_data['emailAddress'],
+                "avatar": user_data.get('avatarUrls', None) and user_data['avatarUrls'].get('48x48', None),
             })
         return result
 
diff --git a/taiga/importers/trello/importer.py b/taiga/importers/trello/importer.py
index c36e3086..227339e4 100644
--- a/taiga/importers/trello/importer.py
+++ b/taiga/importers/trello/importer.py
@@ -126,11 +126,18 @@ class TrelloImporter:
     def list_users(self, project_id):
         members = []
         for member in self._client.get("/board/{}/members/all".format(project_id), {"fields": "id"}):
-            user = self._client.get("/member/{}".format(member['id']), {"fields": "id,fullName,email"})
+            user = self._client.get("/member/{}".format(member['id']), {"fields": "id,fullName,email,avatarSource,avatarHash,gravatarHash"})
+            print(user)
+            if user['avatarSource'] == "gravatar":
+                avatar = 'https://www.gravatar.com/avatar/' + user['gravatarHash'] + '.jpg?s=50'
+            else:
+                avatar = 'https://trello-avatars.s3.amazonaws.com/' + user['avatarHash'] + '/50.png'
+
             members.append({
                 "id": user['id'],
                 "full_name": user['fullName'],
                 "email": user['email'],
+                "avatar": avatar
             })
         return members