feat: Implement hideCurrentSeason

potato4d · Sep 27, 2020 · 88944bd · 88944bd
1 parent cb13fe2
commit 88944bd
Show file tree

Hide file tree

Showing 8 changed files with 324 additions and 173 deletions.
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "axios": "^0.19.2",
     "dayjs": "^1.8.27",
     "dotenv": "^8.2.0",
-    "firebase": "^7.14.2",
+    "firebase": "^7.21.1",
     "jimp": "^0.10.3",
     "nuxt": "^2.0.0",
     "nuxt-basic-auth-module": "^1.3.2",

diff --git a/src/analyzer/compare.ts b/src/analyzer/compare.ts
@@ -82,7 +82,14 @@ async function check(croppedSS: Jimp): Promise<Pokemon> {
   debug(r.distance)
   const endAt = new Date()
   debug(`実行時間: ${endAt.getTime() - startedAt.getTime()}ms`)
-  return dex.find((p) => p.slug === r.slug)!
+  return dex
+    .map((p) => ({
+      ...p,
+      slug: p.slug.includes('alcremie-')
+        ? p.slug.split('alcremie-')[0]
+        : p.slug,
+    }))
+    .find((p) => p.slug === r.slug)!
 }
 
 export async function compare(

diff --git a/src/assets/rules/firestore.indexes.json b/src/assets/rules/firestore.indexes.json
@@ -31,6 +31,24 @@
           "order": "DESCENDING"
         }
       ]
+    },
+    {
+      "collectionGroup": "battlerecords",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "hideCurrentSeason",
+          "order": "DESCENDING"
+        },
+        {
+          "fieldPath": "season",
+          "order": "DESCENDING"
+        },
+        {
+          "fieldPath": "createdAt",
+          "order": "DESCENDING"
+        }
+      ]
     }
   ],
   "fieldOverrides": [

diff --git a/src/components/common/AppUsage.tsx b/src/components/common/AppUsage.tsx
@@ -68,20 +68,10 @@ export const AppUsage = tsx.component({
         {} as WinRates['items']
       )
       return {
-        items: Object.entries(items)
-          .map(([slug, item]) => ({
-            slug,
-            ...item,
-          }))
-          .sort((b, a) => {
-            if (b.winCount === 0 || b.selectCount === 0) {
-              return +1
-            }
-            if (a.winCount === 0 || a.selectCount === 0) {
-              return -1
-            }
-            return b.selectCount < a.selectCount ? +1 : -1
-          }),
+        items: Object.entries(items).map(([slug, item]) => ({
+          slug,
+          ...item,
+        })),
         bestWin: Object.values(items).reduce((b: number, a) => {
           if (a.winCount === 0) {
             return 0
@@ -107,7 +97,9 @@ export const AppUsage = tsx.component({
         }}
       >
         <div class="flex items-center justify-between px-6 py-4">
-          <h4 class="text-2xl font-bold text-white">この構築の利用統計</h4>
+          <h4 class="text-2xl font-bold text-white">
+            この構築の利用統計 (全{this.winRates.battleCount}試合)
+          </h4>
           <div class="flex items-center">
             <span class="inline-block w-4 h-4 rounded-full bg-blue-600"></span>
             <span class="inline-block ml-2 mr-12">選出率</span>

diff --git a/src/components/partials/modal/AnalyzerModal.vue b/src/components/partials/modal/AnalyzerModal.vue
@@ -198,16 +198,17 @@
                 />
               </p>
             </div>
-            <p class="flex flex-col pt-12">
-              <label class="pb-3">この対戦が含まれる動画のURL</label>
-              <input
-                type="text"
-                class="input-rank"
-                placeholder="YouTube, Twitter, ニコ生など"
-                v-model="formData.videoUrl"
-              />
+            <p class="flex flex-col justify-center pt-12">
+              <label class="pb-3">
+                <input
+                  type="checkbox"
+                  :value="true"
+                  v-model="formData.hideCurrentSeason"
+                />
+                <span>シーズン中トップに表示しない</span>
+              </label>
             </p>
-            <p class="flex flex-col pt-12">
+            <p class="flex flex-col justify-center pt-2">
               <label class="pb-3">
                 <input
                   type="checkbox"
@@ -313,9 +314,11 @@ type LocalData = {
   }
 }
 
+const CURRENT_SEASON = 10
+
 const getInitialFormData = (): Omit<BattleRecord, 'userId'> => ({
   captureUrl: null,
-  season: 10,
+  season: CURRENT_SEASON,
   format: 'single',
   result: 'win',
   rank: null,
@@ -326,6 +329,7 @@ const getInitialFormData = (): Omit<BattleRecord, 'userId'> => ({
   opponentChoice: [null, null, null],
   note: '',
   videoUrl: '',
+  hideCurrentSeason: null,
 })
 
 export default Vue.extend({
@@ -569,6 +573,9 @@ export default Vue.extend({
     },
   },
   computed: {
+    CURRENT_SEASON() {
+      return CURRENT_SEASON
+    },
     userId(): string | 'anonymous' {
       return this.$auth.currentUser
         ? this.anonymous

diff --git a/src/pages/index.vue b/src/pages/index.vue
@@ -58,6 +58,7 @@ export default Vue.extend({
   async asyncData({ app }) {
     const records = await app.$firestore
       .collection('battlerecords')
+      .where('hideCurrentSeason', '==', false)
       .orderBy('season', 'desc')
       .orderBy('createdAt', 'desc')
       .limit(LIMIT)

diff --git a/src/types/struct.ts b/src/types/struct.ts
@@ -43,5 +43,6 @@ export type BattleRecord = {
   note: string
   captureUrl: string | null
   videoUrl: string | null
+  hideCurrentSeason?: number | null
   createdAt?: firebase.firestore.Timestamp | Date
 }