feat(client): compat avatar server return

walinejs · Jan 10, 2021 · 86a0f0a · 86a0f0a
1 parent 1ab3c9f
commit 86a0f0a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/packages/client/src/components/CommentBox.js b/packages/client/src/components/CommentBox.js
@@ -293,7 +293,7 @@ export default function({
           ) : (
             <div className="vlogin-info">
               <div className="vlogin-avatar">
-                <img src={ctx.gravatarSetting.cdn + ctx.userInfo.mailMd5 + ctx.gravatarSetting.params} alt="" className="vimg"/>
+                <img src={ctx.userInfo.avatar || ctx.gravatarSetting.cdn + ctx.userInfo.mailMd5 + ctx.gravatarSetting.params} alt="" className="vimg"/>
                 <div 
                   title={ctx.locale.logout}
                   className="vlogin-logout-btn" 

diff --git a/packages/client/src/components/CommentCard.js b/packages/client/src/components/CommentCard.js
@@ -29,7 +29,7 @@ export default function CommentCard({comment, boxConfig, rootId, onSubmit}) {
     <div className="vcard" id={comment.objectId}>
       <img 
         className="vimg" 
-        src={ctx.gravatarSetting.cdn + comment.mail + ctx.gravatarSetting.params} 
+        src={comment.avatar || ctx.gravatarSetting.cdn + comment.mail + ctx.gravatarSetting.params} 
       />
       <div className="vh">
         <div className="vhead">

diff --git a/packages/server/src/logic/base.js b/packages/server/src/logic/base.js
@@ -36,11 +36,14 @@ module.exports = class extends think.Logic {
 
     const user = await this.modelInstance.select(
       {email: userMail},
-      {field: ['email', 'url', 'display_name', 'type', 'github']}
+      {field: ['email', 'url', 'display_name', 'type', 'github', 'avatar']}
     );
     if(!think.isEmpty(user)) {
       const userInfo = user[0];
       userInfo.mailMd5 = helper.md5(userInfo.email);
+      if(/(github)/i.test(userInfo.avatar)) {
+        userInfo.avatar = this.config('avatarProxy') + '?url=' + encodeURIComponent(userInfo.avatar);
+      }
       this.ctx.state.userInfo = userInfo;
     }
   }