From 45f05c9fc475721efe2769d622f42dea9b74fb20 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Tue, 20 Apr 2021 18:58:14 +0800
Subject: [PATCH] FIX render commmiter and author avatar bug

---
 app/models/user/avatar.rb                           | 11 ++++++++---
 app/views/repositories/_commit_author.json.jbuilder |  2 +-
 app/views/repositories/commits.json.jbuilder        |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/models/user/avatar.rb b/app/models/user/avatar.rb
index 7a1a174c3..d6f88bb01 100644
--- a/app/models/user/avatar.rb
+++ b/app/models/user/avatar.rb
@@ -11,11 +11,16 @@ class User
     end
 
     def get_letter_avatar_url(size = :lg)
-      avatar_path(size).split('public/')&.last
+      avatar_path(self.username, size).split('public/')&.last
     end
 
-    def avatar_path(size)
-      LetterAvatar.generate self.username, avatar_size(size)
+    def self.get_letter_avatar_url(name, size = :lg)
+      return "" if name.blank?
+      avatar_path(Pinyin.t(name), size).split('public/')&.last
+    end
+    
+    def avatar_path(username, size)
+      LetterAvatar.generate username, avatar_size(size)
     end
     
     # 返回头像尺寸
diff --git a/app/views/repositories/_commit_author.json.jbuilder b/app/views/repositories/_commit_author.json.jbuilder
index d57e7c534..fec311426 100644
--- a/app/views/repositories/_commit_author.json.jbuilder
+++ b/app/views/repositories/_commit_author.json.jbuilder
@@ -7,5 +7,5 @@ else
   json.id nil
   json.login name 
   json.name name 
-  json.image_url File.join("avatars/User","b")
+  json.image_url User.get_letter_avatar_url(name)
 end
diff --git a/app/views/repositories/commits.json.jbuilder b/app/views/repositories/commits.json.jbuilder
index d123daf54..750976e55 100644
--- a/app/views/repositories/commits.json.jbuilder
+++ b/app/views/repositories/commits.json.jbuilder
@@ -26,7 +26,7 @@ else
           json.login commit['commit']['author']['name']
           json.type nil
           json.name commit['commit']['author']['name']
-          json.image_url File.join("avatars/User","b")
+          json.image_url User.get_letter_avatar_url(commit['commit']['author']['name'])
         end
       end
     end