From cd028dc6553ee42ad306da6619c623a650e781aa Mon Sep 17 00:00:00 2001
From: liszt01 <61107001+liszt01@users.noreply.github.com>
Date: Fri, 3 Nov 2023 16:48:20 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=A8=E3=83=87=E3=82=A3=E3=82=BF=E3=83=BC?=
 =?UTF-8?q?=E3=81=AE=E3=83=A1=E3=82=A4=E3=83=B3=E7=94=BB=E9=9D=A2=E3=81=A7?=
 =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=81=99=E3=82=8B=20(#1616)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>
---
 .env.production                             |   2 +
 .env.test                                   |   2 +
 src/components/UpdateNotificationDialog.vue | 107 ++++++++++++++++++++
 src/components/help/HelpDialog.vue          |  47 +--------
 src/composables/useFetchNewUpdateInfos.ts   |  47 +++++++++
 src/store/type.ts                           |   3 +
 src/store/ui.ts                             |   2 +
 src/views/EditorHome.vue                    |  25 +++++
 src/vite-env.d.ts                           |   2 +
 tests/unit/store/Vuex.spec.ts               |   1 +
 10 files changed, 194 insertions(+), 44 deletions(-)
 create mode 100644 src/components/UpdateNotificationDialog.vue
 create mode 100644 src/composables/useFetchNewUpdateInfos.ts

diff --git a/.env.production b/.env.production
index 69203956d9..5b0dcb0498 100644
--- a/.env.production
+++ b/.env.production
@@ -9,4 +9,6 @@ VITE_DEFAULT_ENGINE_INFOS=`[
         "host": "http://127.0.0.1:50021"
     }
 ]`
+VITE_OFFICIAL_WEBSITE_URL=https://voicevox.hiroshiba.jp/
+VITE_LATEST_UPDATE_INFOS_URL=https://raw.githubusercontent.com/VOICEVOX/voicevox_blog/master/src/data/updateInfos.json
 VITE_GTM_CONTAINER_ID=GTM-DUMMY
diff --git a/.env.test b/.env.test
index a2c27972a3..dcf447f8b2 100644
--- a/.env.test
+++ b/.env.test
@@ -9,4 +9,6 @@ VITE_DEFAULT_ENGINE_INFOS=`[
         "host": "http://127.0.0.1:50021"
     }
 ]`
+VITE_OFFICIAL_WEBSITE_URL=https://voicevox.hiroshiba.jp/
+VITE_LATEST_UPDATE_INFOS_URL=https://raw.githubusercontent.com/VOICEVOX/voicevox_blog/master/src/data/updateInfos.json
 VITE_GTM_CONTAINER_ID=GTM-DUMMY
diff --git a/src/components/UpdateNotificationDialog.vue b/src/components/UpdateNotificationDialog.vue
new file mode 100644
index 0000000000..54d76bcfb4
--- /dev/null
+++ b/src/components/UpdateNotificationDialog.vue
@@ -0,0 +1,107 @@
+<template>
+  <q-dialog v-model="modelValueComputed">
+    <q-card class="q-py-sm q-px-md">
+      <q-card-section class="q-pb-sm" align="center">
+        <div class="text-h6">
+          <q-icon name="info" color="primary" />アップデート通知
+        </div>
+      </q-card-section>
+      <q-card-section class="q-pt-sm" align="center">
+        <div class="text-body1">
+          最新バージョン {{ props.latestVersion }} が利用可能です。<br />
+          公式サイトから最新バージョンをダウンロードできます。
+        </div>
+      </q-card-section>
+      <q-card-section class="q-py-none scrollable-area">
+        <template
+          v-for="(info, infoIndex) of props.newUpdateInfos"
+          :key="infoIndex"
+        >
+          <div class="text-h6">バージョン {{ info.version }}</div>
+          <ul>
+            <template
+              v-for="(item, descriptionIndex) of info.descriptions"
+              :key="descriptionIndex"
+            >
+              <li>{{ item }}</li>
+            </template>
+          </ul>
+        </template>
+      </q-card-section>
+      <q-card-actions align="center" class="button-area">
+        <q-btn
+          padding="xs md"
+          label="キャンセル"
+          unelevated
+          color="surface"
+          text-color="display"
+          class="q-mt-sm"
+          @click="closeUpdateNotificationDialog()"
+        />
+        <q-btn
+          padding="xs md"
+          label="公式サイトを開く"
+          unelevated
+          color="primary"
+          text-color="display-on-primary"
+          class="q-mt-sm"
+          @click="
+            openOfficialWebsite();
+            closeUpdateNotificationDialog();
+          "
+        />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script setup lang="ts">
+import { computed } from "vue";
+import { UpdateInfo } from "@/type/preload";
+
+const props =
+  defineProps<{
+    modelValue: boolean;
+    latestVersion: string;
+    newUpdateInfos: UpdateInfo[];
+  }>();
+const emit =
+  defineEmits<{
+    (e: "update:modelValue", value: boolean): void;
+  }>();
+
+const modelValueComputed = computed({
+  get: () => props.modelValue,
+  set: (val) => emit("update:modelValue", val),
+});
+
+const closeUpdateNotificationDialog = () => {
+  modelValueComputed.value = false;
+};
+
+const openOfficialWebsite = () => {
+  window.open(import.meta.env.VITE_OFFICIAL_WEBSITE_URL, "_blank");
+};
+</script>
+
+<style scoped lang="scss">
+@use '@/styles/colors' as colors;
+
+.scrollable-area {
+  overflow-y: auto;
+  max-height: 250px;
+}
+
+.scrollable-area h5 {
+  margin: 10px 0;
+}
+
+.scrollable-area h6 {
+  margin: 15px 0;
+}
+
+.button-area {
+  border-top: 1px solid colors.$splitter;
+  /* ボタン領域の上部に線を引く */
+}
+</style>
diff --git a/src/components/help/HelpDialog.vue b/src/components/help/HelpDialog.vue
index 153d963384..653d9c8234 100644
--- a/src/components/help/HelpDialog.vue
+++ b/src/components/help/HelpDialog.vue
@@ -86,7 +86,6 @@
 
 <script setup lang="ts">
 import { computed, ref, type Component } from "vue";
-import semver from "semver";
 import HelpPolicy from "./HelpPolicy.vue";
 import LibraryPolicy from "./LibraryPolicy.vue";
 import HowToUse from "./HowToUse.vue";
@@ -97,6 +96,7 @@ import QAndA from "./QAndA.vue";
 import ContactInfo from "./ContactInfo.vue";
 import { UpdateInfo as UpdateInfoObject } from "@/type/preload";
 import { useStore } from "@/store";
+import { useFetchNewUpdateInfos } from "@/composables/useFetchNewUpdateInfos";
 
 type PageItem = {
   type: "item";
@@ -131,48 +131,7 @@ const store = useStore();
 const updateInfos = ref<UpdateInfoObject[]>();
 store.dispatch("GET_UPDATE_INFOS").then((obj) => (updateInfos.value = obj));
 
-const isCheckingFinished = ref<boolean>(false);
-
-// 最新版があるか調べる
-const currentVersion = ref("");
-const latestVersion = ref("");
-window.electron
-  .getAppInfos()
-  .then((obj) => {
-    currentVersion.value = obj.version;
-  })
-  .then(() => {
-    fetch("https://api.github.com/repos/VOICEVOX/voicevox/releases", {
-      method: "GET",
-      headers: {
-        "Content-Type": "application/json",
-        Accept: "application/json",
-      },
-    })
-      .then((response) => {
-        if (!response.ok) throw new Error("Network response was not ok.");
-        return response.json();
-      })
-      .then((json) => {
-        const newerVersion = json.find(
-          (item: { prerelease: boolean; tag_name: string }) => {
-            return (
-              !item.prerelease &&
-              semver.valid(currentVersion.value) &&
-              semver.valid(item.tag_name) &&
-              semver.lt(currentVersion.value, item.tag_name)
-            );
-          }
-        );
-        if (newerVersion) {
-          latestVersion.value = newerVersion.tag_name;
-        }
-        isCheckingFinished.value = true;
-      })
-      .catch((err) => {
-        throw new Error(err);
-      });
-  });
+const { isCheckingFinished, latestVersion } = useFetchNewUpdateInfos();
 
 const isUpdateAvailable = computed(() => {
   return isCheckingFinished.value && latestVersion.value !== "";
@@ -223,7 +182,7 @@ const pagedata = computed(() => {
       name: "アップデート情報",
       component: UpdateInfo,
       props: {
-        downloadLink: "https://voicevox.hiroshiba.jp/",
+        downloadLink: import.meta.env.VITE_OFFICIAL_WEBSITE_URL,
         updateInfos: updateInfos.value,
         isUpdateAvailable: isUpdateAvailable.value,
         latestVersion: latestVersion.value,
diff --git a/src/composables/useFetchNewUpdateInfos.ts b/src/composables/useFetchNewUpdateInfos.ts
new file mode 100644
index 0000000000..4b966500e7
--- /dev/null
+++ b/src/composables/useFetchNewUpdateInfos.ts
@@ -0,0 +1,47 @@
+import { ref } from "vue";
+import semver from "semver";
+import { UpdateInfo } from "@/type/preload";
+
+// 最新版があるか調べる
+// 現バージョンより新しい最新版があれば`latestVersion`に代入される
+export const useFetchNewUpdateInfos = () => {
+  const isCheckingFinished = ref<boolean>(false);
+  const currentVersion = ref("");
+  const latestVersion = ref("");
+  const newUpdateInfos = ref<UpdateInfo[]>([]);
+
+  window.electron
+    .getAppInfos()
+    .then((obj) => {
+      currentVersion.value = obj.version;
+    })
+    .then(() => {
+      const url: string | undefined = import.meta.env
+        .VITE_LATEST_UPDATE_INFOS_URL;
+      if (!url) {
+        throw new Error(
+          "VITE_LATEST_UPDATE_INFOS_URLが未設定です。.env内に記載してください。"
+        );
+      }
+      fetch(url)
+        .then((response) => {
+          if (!response.ok) throw new Error("Network response was not ok.");
+          return response.json();
+        })
+        .then((json) => {
+          newUpdateInfos.value = json.filter((item: UpdateInfo) => {
+            return semver.lt(currentVersion.value, item.version);
+          });
+          if (newUpdateInfos.value?.length) {
+            latestVersion.value = newUpdateInfos.value[0].version;
+          }
+          isCheckingFinished.value = true;
+        });
+    });
+
+  return {
+    isCheckingFinished,
+    latestVersion,
+    newUpdateInfos,
+  };
+};
diff --git a/src/store/type.ts b/src/store/type.ts
index b8bb894991..95059f0925 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -1166,6 +1166,7 @@ export type UiStoreState = {
   isAcceptTermsDialogOpen: boolean;
   isDictionaryManageDialogOpen: boolean;
   isEngineManageDialogOpen: boolean;
+  isUpdateNotificationDialogOpen: boolean;
   isMaximized: boolean;
   isPinned: boolean;
   isFullscreen: boolean;
@@ -1231,6 +1232,7 @@ export type UiStoreTypes = {
       isToolbarSettingDialogOpen?: boolean;
       isCharacterOrderDialogOpen?: boolean;
       isEngineManageDialogOpen?: boolean;
+      isUpdateNotificationDialogOpen?: boolean;
     };
     action(payload: {
       isDefaultStyleSelectDialogOpen?: boolean;
@@ -1243,6 +1245,7 @@ export type UiStoreTypes = {
       isToolbarSettingDialogOpen?: boolean;
       isCharacterOrderDialogOpen?: boolean;
       isEngineManageDialogOpen?: boolean;
+      isUpdateNotificationDialogOpen?: boolean;
     }): void;
   };
 
diff --git a/src/store/ui.ts b/src/store/ui.ts
index e469131433..dbf4a8f3be 100644
--- a/src/store/ui.ts
+++ b/src/store/ui.ts
@@ -60,6 +60,7 @@ export const uiStoreState: UiStoreState = {
   isAcceptTermsDialogOpen: false,
   isDictionaryManageDialogOpen: false,
   isEngineManageDialogOpen: false,
+  isUpdateNotificationDialogOpen: false,
   isMaximized: false,
   isPinned: false,
   isFullscreen: false,
@@ -169,6 +170,7 @@ export const uiStore = createPartialStore<UiStoreTypes>({
         isToolbarSettingDialogOpen?: boolean;
         isCharacterOrderDialogOpen?: boolean;
         isEngineManageDialogOpen?: boolean;
+        isUpdateNotificationDialogOpen?: boolean;
       }
     ) {
       for (const [key, value] of Object.entries(dialogState)) {
diff --git a/src/views/EditorHome.vue b/src/views/EditorHome.vue
index 42159e834c..9b0585917f 100644
--- a/src/views/EditorHome.vue
+++ b/src/views/EditorHome.vue
@@ -176,6 +176,11 @@
     v-model="isAcceptRetrieveTelemetryDialogOpenComputed"
   />
   <accept-terms-dialog v-model="isAcceptTermsDialogOpenComputed" />
+  <update-notification-dialog
+    v-model="isUpdateNotificationDialogOpenComputed"
+    :latest-version="latestVersion"
+    :new-update-infos="newUpdateInfos"
+  />
 </template>
 
 <script setup lang="ts">
@@ -203,6 +208,8 @@ import AcceptTermsDialog from "@/components/AcceptTermsDialog.vue";
 import DictionaryManageDialog from "@/components/DictionaryManageDialog.vue";
 import EngineManageDialog from "@/components/EngineManageDialog.vue";
 import ProgressDialog from "@/components/ProgressDialog.vue";
+import UpdateNotificationDialog from "@/components/UpdateNotificationDialog.vue";
+import { useFetchNewUpdateInfos } from "@/composables/useFetchNewUpdateInfos";
 import { AudioItem, EngineState } from "@/store/type";
 import {
   AudioKey,
@@ -541,6 +548,13 @@ watch(userOrderedCharacterInfos, (userOrderedCharacterInfos) => {
   }
 });
 
+// エディタのアップデート確認
+const { isCheckingFinished, latestVersion, newUpdateInfos } =
+  useFetchNewUpdateInfos();
+const isUpdateAvailable = computed(() => {
+  return isCheckingFinished.value && latestVersion.value !== "";
+});
+
 // ソフトウェアを初期化
 const isCompletedInitialStartup = ref(false);
 onMounted(async () => {
@@ -623,6 +637,8 @@ onMounted(async () => {
     import.meta.env.MODE !== "development" &&
     store.state.acceptTerms !== "Accepted";
 
+  isUpdateNotificationDialogOpenComputed.value = isUpdateAvailable.value;
+
   isCompletedInitialStartup.value = true;
 });
 
@@ -798,6 +814,15 @@ const isAcceptRetrieveTelemetryDialogOpenComputed = computed({
     }),
 });
 
+// アップデート通知
+const isUpdateNotificationDialogOpenComputed = computed({
+  get: () => store.state.isUpdateNotificationDialogOpen,
+  set: (val) =>
+    store.dispatch("SET_DIALOG_OPEN", {
+      isUpdateNotificationDialogOpen: val,
+    }),
+});
+
 // ドラッグ＆ドロップ
 const dragEventCounter = ref(0);
 const loadDraggedFile = (event: { dataTransfer: DataTransfer | null }) => {
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index 39d522e64d..2112976e79 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -5,6 +5,8 @@ interface ImportMetaEnv {
   readonly VITE_APP_NAME: string;
   readonly VITE_APP_VERSION: string;
   readonly VITE_DEFAULT_ENGINE_INFOS: string;
+  readonly VITE_OFFICIAL_WEBSITE_URL: string;
+  readonly VITE_LATEST_UPDATE_INFOS_URL: string;
   readonly VITE_GTM_CONTAINER_ID: string;
   readonly VITE_TARGET: "electron" | "browser";
 }
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index eade98f922..3bbb5fb7a8 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -51,6 +51,7 @@ describe("store/vuex.js test", () => {
         isDefaultStyleSelectDialogOpen: false,
         isDictionaryManageDialogOpen: false,
         isEngineManageDialogOpen: false,
+        isUpdateNotificationDialogOpen: false,
         isAcceptRetrieveTelemetryDialogOpen: false,
         isAcceptTermsDialogOpen: false,
         isMaximized: false,