From 7a7b93c4af6aea321bf298426a068519ef283c27 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Thu, 18 May 2023 09:12:17 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E6=8F=90=E4=BA=A4=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

---
 app/views/api/v1/users/_commit_user.json.jbuilder | 11 ++---------
 .../repositories/_commit_author.json.jbuilder     | 15 ++++-----------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/app/views/api/v1/users/_commit_user.json.jbuilder b/app/views/api/v1/users/_commit_user.json.jbuilder
index 89670860..83935709 100644
--- a/app/views/api/v1/users/_commit_user.json.jbuilder
+++ b/app/views/api/v1/users/_commit_user.json.jbuilder
@@ -1,24 +1,17 @@
 if user.present?
-  if user.is_a?(Hash) && user["id"].present?
+  if user.is_a?(Hash)
     json.id user["id"]
     json.login user["login"]
     json.name user["name"]
     json.type user["type"]
     json.image_url user["avatar_url"]
-  elsif  user.is_a?(Hash) && user["email"].present?
-    db_user = User.find_by(mail: user["email"])
-    json.id db_user&.id
-    json.login db_user&.login || user["login"]
-    json.name db_user&.real_name || user["name"]
-    json.type db_user&.type
-    json.image_url db_user.present? ? url_to_avatar(db_user) : ""
   else
     json.id user.id
     json.login user.login
     json.name user.real_name
     json.type user&.type
     json.image_url url_to_avatar(user)
-  end
+  end 
 else
   json.id nil
   json.login name 
diff --git a/app/views/repositories/_commit_author.json.jbuilder b/app/views/repositories/_commit_author.json.jbuilder
index 1b1a833a..83935709 100644
--- a/app/views/repositories/_commit_author.json.jbuilder
+++ b/app/views/repositories/_commit_author.json.jbuilder
@@ -1,28 +1,21 @@
 if user.present?
-  if user.is_a?(Hash) && user["id"].present?
+  if user.is_a?(Hash)
     json.id user["id"]
     json.login user["login"]
     json.name user["name"]
     json.type user["type"]
     json.image_url user["avatar_url"]
-  elsif  user.is_a?(Hash) && user["email"].present?
-    db_user = User.find_by(mail: user["email"])
-    json.id db_user&.id
-    json.login db_user&.login || user["login"]
-    json.name db_user&.real_name || user["name"]
-    json.type db_user&.type
-    json.image_url db_user.present? ? url_to_avatar(db_user) : ""
   else
     json.id user.id
     json.login user.login
     json.name user.real_name
     json.type user&.type
     json.image_url url_to_avatar(user)
-  end
+  end 
 else
   json.id nil
-  json.login name
-  json.name name
+  json.login name 
+  json.name name 
   json.type nil
   json.image_url User::Avatar.get_letter_avatar_url(name)
 end