From 025afe88b415d2401f73c6d375a1d4601b9c5a49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?= <46447427+samunohito@users.noreply.github.com> Date: Sat, 9 Dec 2023 21:52:25 +0900 Subject: [PATCH 1/2] =?UTF-8?q?(dev)=20index.html=E3=81=ABmeta[name=3Dview?= =?UTF-8?q?port]=E3=81=8C=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E8=BF=BD=E5=8A=A0=EF=BC=86=E8=B6=B3=E3=82=8A=E3=81=A6?= =?UTF-8?q?=E3=81=AA=E3=81=84CSP=E8=BF=BD=E5=8A=A0=20(#12613)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * (dev) index.htmlにmeta[name=viewport]がなかったので追加＆足りてないCSP追加 * fix tab --- packages/frontend/src/index.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/index.html b/packages/frontend/src/index.html index b93e32265e..49189914a0 100644 --- a/packages/frontend/src/index.html +++ b/packages/frontend/src/index.html @@ -17,12 +17,14 @@ + From 4c135a5ca12c5e0efc343425905b995ecb0a5a90 Mon Sep 17 00:00:00 2001 From: woxtu Date: Sun, 10 Dec 2023 02:11:17 +0900 Subject: [PATCH 2/2] Fix indentation (#12615) --- .../src/components/MkEmojiPicker.section.vue | 58 ++++++++-------- .../frontend/src/components/MkEmojiPicker.vue | 22 +++---- packages/frontend/src/pages/admin-user.vue | 66 +++++++++---------- .../frontend/src/pages/settings/general.vue | 2 +- 4 files changed, 74 insertions(+), 74 deletions(-) diff --git a/packages/frontend/src/components/MkEmojiPicker.section.vue b/packages/frontend/src/components/MkEmojiPicker.section.vue index 35de9bbb5e..14f3f5770f 100644 --- a/packages/frontend/src/components/MkEmojiPicker.section.vue +++ b/packages/frontend/src/components/MkEmojiPicker.section.vue @@ -26,35 +26,35 @@ SPDX-License-Identifier: AGPL-3.0-only
-
- (:{{ customEmojiTree.length }} :{{ emojis.length }}) -
-
- - {{ child.value || i18n.ts.other }} - -
-
- -
+
+ (:{{ customEmojiTree.length }} :{{ emojis.length }}) +
+
+ + {{ child.value || i18n.ts.other }} + +
+
+ +
diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue index b5e5a0260c..29a33a162f 100644 --- a/packages/frontend/src/components/MkEmojiPicker.vue +++ b/packages/frontend/src/components/MkEmojiPicker.vue @@ -77,8 +77,8 @@ SPDX-License-Identifier: AGPL-3.0-only :key="`custom:${child.value}`" :initialShown="false" :emojis="computed(() => customEmojis.filter(e => child.value === '' ? (e.category === 'null' || !e.category) : e.category === child.value).filter(filterAvailable).map(e => `:${e.name}:`))" - :hasChildSection="child.children.length !== 0" - :customEmojiTree="child.children" + :hasChildSection="child.children.length !== 0" + :customEmojiTree="child.children" @chosen="chosen" > {{ child.value || i18n.ts.other }} @@ -103,12 +103,12 @@ import { ref, shallowRef, computed, watch, onMounted } from 'vue'; import * as Misskey from 'misskey-js'; import XSection from '@/components/MkEmojiPicker.section.vue'; import { - emojilist, - emojiCharByCategory, - UnicodeEmojiDef, - unicodeEmojiCategories as categories, - getEmojiName, - CustomEmojiFolderTree + emojilist, + emojiCharByCategory, + UnicodeEmojiDef, + unicodeEmojiCategories as categories, + getEmojiName, + CustomEmojiFolderTree } from '@/scripts/emojilist.js'; import MkRippleEffect from '@/components/MkRippleEffect.vue'; import * as os from '@/os.js'; @@ -176,9 +176,9 @@ function parseAndMergeCategories(input: string, root: CustomEmojiFolderTree): Cu } customEmojiCategories.value.forEach(ec => { - if (ec !== null) { - parseAndMergeCategories(ec, customEmojiFolderRoot); - } + if (ec !== null) { + parseAndMergeCategories(ec, customEmojiFolderRoot); + } }); parseAndMergeCategories('', customEmojiFolderRoot); diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue index fd839b4369..55ad1e2ab1 100644 --- a/packages/frontend/src/pages/admin-user.vue +++ b/packages/frontend/src/pages/admin-user.vue @@ -122,7 +122,7 @@ SPDX-License-Identifier: AGPL-3.0-only -
+
{{ i18n.ts.unsetUserAvatar }} {{ i18n.ts.unsetUserBanner }}
@@ -325,41 +325,41 @@ async function toggleSuspend(v) { } async function unsetUserAvatar() { - const confirm = await os.confirm({ - type: 'warning', - text: i18n.ts.unsetUserAvatarConfirm, - }); - if (confirm.canceled) return; - const process = async () => { - await os.api('admin/unset-user-avatar', { userId: user.value.id }); - os.success(); - }; - await process().catch(err => { - os.alert({ - type: 'error', - text: err.toString(), - }); - }); - refreshUser(); + const confirm = await os.confirm({ + type: 'warning', + text: i18n.ts.unsetUserAvatarConfirm, + }); + if (confirm.canceled) return; + const process = async () => { + await os.api('admin/unset-user-avatar', { userId: user.value.id }); + os.success(); + }; + await process().catch(err => { + os.alert({ + type: 'error', + text: err.toString(), + }); + }); + refreshUser(); } async function unsetUserBanner() { - const confirm = await os.confirm({ - type: 'warning', - text: i18n.ts.unsetUserBannerConfirm, - }); - if (confirm.canceled) return; - const process = async () => { - await os.api('admin/unset-user-banner', { userId: user.value.id }); - os.success(); - }; - await process().catch(err => { - os.alert({ - type: 'error', - text: err.toString(), - }); - }); - refreshUser(); + const confirm = await os.confirm({ + type: 'warning', + text: i18n.ts.unsetUserBannerConfirm, + }); + if (confirm.canceled) return; + const process = async () => { + await os.api('admin/unset-user-banner', { userId: user.value.id }); + os.success(); + }; + await process().catch(err => { + os.alert({ + type: 'error', + text: err.toString(), + }); + }); + refreshUser(); } async function deleteAllFiles() { diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue index 98a07d907d..0c83abf7f6 100644 --- a/packages/frontend/src/pages/settings/general.vue +++ b/packages/frontend/src/pages/settings/general.vue @@ -293,7 +293,7 @@ const useGroupedNotifications = computed(defaultStore.makeGetterSetter('useGroup watch(lang, () => { miLocalStorage.setItem('lang', lang.value as string); miLocalStorage.removeItem('locale'); - miLocalStorage.removeItem('localeVersion'); + miLocalStorage.removeItem('localeVersion'); }); watch(fontSize, () => {