From 09b1007800391eb2f29e859f7fb93a6bdf272d4d Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Thu, 18 May 2023 14:22:53 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E8=B4=A1=E7=8C=AE=E8=80=85=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E7=94=A8=E6=88=B7email?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/_contributor.json.jbuilder   | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/app/views/repositories/_contributor.json.jbuilder b/app/views/repositories/_contributor.json.jbuilder
index b0547eba3..2deab09d2 100644
--- a/app/views/repositories/_contributor.json.jbuilder
+++ b/app/views/repositories/_contributor.json.jbuilder
@@ -1,20 +1,33 @@
-user = $redis_cache.hgetall("v2-owner-common:#{contributor["name"] || contributor["login"]}-#{contributor["email"]}")
-if user.blank?
+user = render_cache_commit_author(contributor)
+if user.present?
+  if user.is_a?(Hash)
+    json.contributions contributor["commits"] || contributor["contributions"]
+    json.id user["id"]
+    json.login user["login"]
+    json.email user["email"]
+    json.type user["type"]
+    json.name (user["name"] || contributor["name"] || contributor["login"]).to_s.downcase
+    json.image_url user["avatar_url"]
+    db_user = User.find_by_id(user["id"])
+    json.contribution_perc db_user.simple_contribution_perc(project, contributor["contribution_perc"]) if db_user.present?
+  else
+    json.contributions contributor["commits"] || contributor["contributions"]
+    json.id user.id
+    json.login user.login
+    json.email user.mail
+    json.type user.type
+    json.name user.real_name
+    json.image_url url_to_avatar(user)
+    json.contribution_perc user.simple_contribution_perc(project, contributor["contribution_perc"]) if user.present?
+  end
+else
   json.contributions contributor["commits"] || contributor["contributions"]
+  json.id nil
   json.login nil
   json.type nil
   json.name (contributor["name"] || contributor["login"]).to_s.downcase
   json.email contributor["email"]
   json.image_url User::Avatar.get_letter_avatar_url(contributor["name"] || contributor["login"])
   json.contribution_perc User.new(login: (contributor["name"] || contributor["login"]), mail: contributor["email"]).simple_contribution_perc(project, contributor["contribution_perc"])
-else
-  json.contributions contributor["commits"] || contributor["contributions"]
-  json.id user["id"]
-  json.login user["login"]
-  json.email user["email"]
-  json.type user["type"]
-  json.name (user["name"] || contributor["name"] || contributor["login"]).to_s.downcase
-  json.image_url user["avatar_url"]
-  db_user = User.find_by_id(user["id"])
-  json.contribution_perc db_user.simple_contribution_perc(project, contributor["contribution_perc"]) if db_user.present?
 end
+