From bfcf168df44723827943fcbb855de0448065dee2 Mon Sep 17 00:00:00 2001
From: Benny Guo <bennyxguo6@gmail.com>
Date: Mon, 24 Jul 2023 10:49:36 +0800
Subject: [PATCH] fix: incorrect recent comment gavatar url with valine #225

---
 src/components/Sidebar/src/RecentComment.vue | 61 ++------------------
 src/utils/leancloud-api.ts                   | 24 +++-----
 2 files changed, 15 insertions(+), 70 deletions(-)

diff --git a/src/components/Sidebar/src/RecentComment.vue b/src/components/Sidebar/src/RecentComment.vue
index 81826bb6..eb1d7f9c 100644
--- a/src/components/Sidebar/src/RecentComment.vue
+++ b/src/components/Sidebar/src/RecentComment.vue
@@ -4,19 +4,7 @@
     <ul>
       <template v-if="comments.length > 0">
         <li
-          class="
-            bg-ob-deep-900
-            px-2
-            py-3
-            mb-1.5
-            rounded-lg
-            flex flex-row
-            justify-items-center
-            items-center
-            shadow-sm
-            hover:shadow-ob
-            transition-shadow
-          "
+          class="bg-ob-deep-900 px-2 py-3 mb-1.5 rounded-lg flex flex-row justify-items-center items-center shadow-sm hover:shadow-ob transition-shadow"
           v-for="comment in comments"
           :key="comment.id"
         >
@@ -32,14 +20,7 @@
               <span class="text-ob pr-2">
                 {{ comment.user.login }}
                 <b
-                  class="
-                    text-ob-secondary
-                    bg-ob-deep-800
-                    py-0.5
-                    px-1.5
-                    rounded-md
-                    opacity-75
-                  "
+                  class="text-ob-secondary bg-ob-deep-800 py-0.5 px-1.5 rounded-md opacity-75"
                   v-if="comment.is_admin"
                 >
                   {{ t('settings.admin-user') }}
@@ -55,19 +36,7 @@
       </template>
       <template v-else>
         <li
-          class="
-            bg-ob-deep-900
-            px-2
-            py-3
-            mb-1.5
-            rounded-lg
-            flex flex-row
-            justify-items-center
-            items-center
-            shadow-sm
-            hover:shadow-ob
-            transition-shadow
-          "
+          class="bg-ob-deep-900 px-2 py-3 mb-1.5 rounded-lg flex flex-row justify-items-center items-center shadow-sm hover:shadow-ob transition-shadow"
           v-for="n in 7"
           :key="n"
         >
@@ -82,13 +51,7 @@
               <span class="text-ob pr-2">
                 <ob-skeleton
                   tag="b"
-                  class="
-                    text-ob-secondary
-                    bg-ob-deep-800
-                    py-0.5
-                    px-1.5
-                    rounded-md
-                  "
+                  class="text-ob-secondary bg-ob-deep-800 py-0.5 px-1.5 rounded-md"
                   height="10px"
                   width="66px"
                 />
@@ -96,26 +59,14 @@
               <br />
               <ob-skeleton
                 tag="p"
-                class="
-                  text-ob-secondary
-                  bg-ob-deep-800
-                  py-0.5
-                  px-1.5
-                  rounded-md
-                "
+                class="text-ob-secondary bg-ob-deep-800 py-0.5 px-1.5 rounded-md"
                 height="10px"
                 width="96px"
               />
             </div>
             <div class="text-xs text-ob-bright">
               <ob-skeleton
-                class="
-                  text-ob-secondary
-                  bg-ob-deep-800
-                  py-0.5
-                  px-1.5
-                  rounded-md
-                "
+                class="text-ob-secondary bg-ob-deep-800 py-0.5 px-1.5 rounded-md"
                 height="10px"
                 width="126px"
               />
diff --git a/src/utils/leancloud-api.ts b/src/utils/leancloud-api.ts
index 76936ba3..36620aeb 100644
--- a/src/utils/leancloud-api.ts
+++ b/src/utils/leancloud-api.ts
@@ -119,8 +119,7 @@ export class LeanCloudComments implements LeanCloudCommentsInterface {
       lang: ''
     },
     gravatarConfig: {
-      // cdn: 'https://cdn.v2ex.com/gravatar/',
-      cdn: 'https://www.gravatar.com/avatar',
+      cdn: 'https://www.gravatar.com/avatar/',
       ds: ['mp', 'identicon', 'monsterid', 'wavatar', 'robohash', 'retro', ''],
       params: '',
       url: ''
@@ -196,25 +195,18 @@ export class LeanCloudComments implements LeanCloudCommentsInterface {
     this.configs.leanCloudConfig.admin = admin
     this.configs.leanCloudConfig.lang = lang
 
-    this.configs.gravatarConfig.params = `?d=${
-      ds.indexOf(avatar) > -1 ? avatar : 'mp'
-    }&v=${VERSION}`
-
-    const gravatarCDNs: { [key: string]: any } = {
-      en: 'https://www.gravatar.com/avatar',
-      ja: 'https://www.gravatar.com/avatar',
+    const gravatarCDNs: { [key: string]: string } = {
+      en: 'https://www.gravatar.com/avatar/',
+      ja: 'https://www.gravatar.com/avatar/',
       'zh-CN': 'https://gravatar.loli.net/avatar/',
-      'zh-TW': 'https://www.gravatar.com/avatar'
+      'zh-TW': 'https://www.gravatar.com/avatar/'
     }
 
-    this.configs.gravatarConfig.cdn = /^https?:\/\//.test(avatarCDN)
+    this.configs.gravatarConfig.url = /^https?:\/\//.test(avatarCDN)
       ? avatarCDN
       : gravatarCDNs[String(this.configs.leanCloudConfig.lang)]
       ? gravatarCDNs[String(this.configs.leanCloudConfig.lang)]
       : gravatarCDNs['en']
-
-    this.configs.gravatarConfig.url =
-      this.configs.gravatarConfig.cdn + this.configs.gravatarConfig.params
   }
 
   /**
@@ -273,7 +265,9 @@ export class LeanCloudComments implements LeanCloudCommentsInterface {
       ? 'https://q4.qlogo.cn/g?b=qq&nk=' +
         mail.replace('@qq.com', '') +
         '&s=100'
-      : this.configs.gravatarConfig.url + '&' + md5(comment._serverData.mail)
+      : this.configs.gravatarConfig.url +
+        md5(comment._serverData.mail) +
+        `?&v=${VERSION}`
     const admin = this.configs.leanCloudConfig.admin
 
     return {