🔀 Merge pull request #199 from AyakaLab/nekomeowww/dev

🐛 Fixed avatar display issue, cookie exp issue and user finding issue

Author: nekomeowww

src/api/arweave.js

@@ -995,7 +995,7 @@ let arweave = {
           expr2: { // 匹配歌曲类型
             op: 'equals',
             expr1: 'Top1-Genre',
-            expr2: genre1
+            expr2: genre1 || 'noGenreData'
           }
         }
       }).then(ids => { resolve(ids || []) })
@@ -1029,25 +1029,25 @@ let arweave = {
               expr1: {
                 op: 'equals',
                 expr1: 'Top1-Genre',
-                expr2: genre1
+                expr2: genre1 || 'noGenreData'
               },
               expr2: {
                 op: 'equals',
                 expr1: 'Top1-Genre',
-                expr2: genre2
+                expr2: genre2 || 'noGenreData'
               }
             },
             expr2: { // Top2 类型
               op: 'or',
               expr1: {
                 op: 'equals',
                 expr1: 'Top2-Genre',
-                expr2: genre1
+                expr2: genre1 || 'noGenreData'
               },
               expr2: {
                 op: 'equals',
                 expr1: 'Top2-Genre',
-                expr2: genre2
+                expr2: genre2 || 'noGenreData'
               }
             }
           }
@@ -1083,19 +1083,19 @@ let arweave = {
               expr1: {
                 op: 'equals',
                 expr1: 'Top1-Genre',
-                expr2: genre1
+                expr2: genre1 || 'noGenreData'
               },
               expr2: {
                 op: 'or',
                 expr1: {
                   op: 'equals',
                   expr1: 'Top1-Genre',
-                  expr2: genre2
+                  expr2: genre2 || 'noGenreData'
                 },
                 expr2: {
                   op: 'equals',
                   expr1: 'Top1-Genre',
-                  expr2: genre3
+                  expr2: genre3 || 'noGenreData'
                 }
               }
             },
@@ -1106,19 +1106,19 @@ let arweave = {
                 expr1: {
                   op: 'equals',
                   expr1: 'Top2-Genre',
-                  expr2: genre1
+                  expr2: genre1 || 'noGenreData'
                 },
                 expr2: {
                   op: 'or',
                   expr1: {
                     op: 'equals',
                     expr1: 'Top2-Genre',
-                    expr2: genre2
+                    expr2: genre2 || 'noGenreData'
                   },
                   expr2: {
                     op: 'equals',
                     expr1: 'Top2-Genre',
-                    expr2: genre3
+                    expr2: genre3 || 'noGenreData'
                   }
                 }
               },
@@ -1127,19 +1127,19 @@ let arweave = {
                 expr1: {
                   op: 'equals',
                   expr1: 'Top3-Genre',
-                  expr2: genre1
+                  expr2: genre1 || 'noGenreData'
                 },
                 expr2: {
                   op: 'or',
                   expr1: {
                     op: 'equals',
                     expr1: 'Top3-Genre',
-                    expr2: genre2
+                    expr2: genre2 || 'noGenreData'
                   },
                   expr2: {
                     op: 'equals',
                     expr1: 'Top3-Genre',
-                    expr2: genre3
+                    expr2: genre3 || 'noGenreData'
                   }
                 }
               }

src/components/Header.vue

@@ -64,13 +64,12 @@
           v-bind="attrs"
           v-on="on"
         >
-          <v-avatar size="24">
-            <v-icon :size="24" v-if="!userAvatar" dark style="margin-right: 0.3rem;">mdi-account-circle</v-icon>
+          <v-avatar size="24" style="margin-right: 0.3rem;">
+            <v-icon :size="24" v-if="!userAvatar" dark>mdi-account-circle</v-icon>
             <img
               v-if="userAvatar"
               :src="userAvatar"
               :alt="username"
-              style="margin-right: 0.3rem;"
             >
           </v-avatar>
           <p class="username">{{ username }}</p>
@@ -306,7 +305,7 @@ export default {
           this.show = false
           if (this.writeCookie) {
             clearCookie('arclight_userkey')
-            setCookie('arclight_userkey', this.fileRaw)
+            setCookie('arclight_userkey', this.fileRaw, 7)
           }
         } catch (err) {
           this.failSnackbar = true