From 20e4c6b01e79fd8938b756d939540ac05b5fe1a0 Mon Sep 17 00:00:00 2001 From: FruitRiin Date: Sat, 16 Dec 2023 12:57:53 +0900 Subject: [PATCH 01/27] =?UTF-8?q?=E6=8A=95=E7=A8=BF=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=BC=E3=83=A0=E3=81=A7=E3=81=A9=E3=81=93=E3=81=8B=E3=82=89?= =?UTF-8?q?=E3=81=A7=E3=82=82=E3=83=81=E3=83=A3=E3=83=B3=E3=83=8D=E3=83=AB?= =?UTF-8?q?=E3=81=AB=E6=8A=95=E3=81=92=E3=82=89=E3=82=8C=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frontend/src/components/MkPostForm.vue | 35 ++++++++++--------- .../src/components/MkVisibilityPicker.vue | 32 +++++++++++++++++ 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index 4a1930ac0b..a5ea648277 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -19,20 +19,20 @@ SPDX-License-Identifier: AGPL-3.0-only
- @@ -46,6 +51,7 @@ import { nextTick, shallowRef, ref } from 'vue'; import * as Misskey from 'misskey-js'; import MkModal from '@/components/MkModal.vue'; import { i18n } from '@/i18n.js'; +import * as os from "@/os.js"; const modal = shallowRef>(); @@ -64,6 +70,32 @@ const emit = defineEmits<{ const v = ref(props.currentVisibility); +/** + * Visibility とチャンネルはそれぞれ独立だけど、今のところはチャンネル投稿は連合なしだし公開範囲も変更できないようである + + packages/frontend/src/components/MkPostForm.vue :475 + if (props.channel) { + visibility.value = 'public'; + localOnly.value = true; // TODO: チャンネルが連合するようになった折には消す + return; + } + + */ +const channels = ref([]); +async function getChannel(){ + const res = await os.api('channels/my-favorites', { + limit: 100, + }); + channels.value.splice(0, 0, ...res); +} +getChannel(); + +async function chooseChannel(channel: string ){ + emit("changeChannel", channel); + await nextTick(); + if (modal.value) modal.value.close(); +} + function choose(visibility: typeof Misskey.noteVisibilities[number]): void { v.value = visibility; emit('changeVisibility', visibility); From 704ebcde767ad5d061e3ae2142f72ef0f90110af Mon Sep 17 00:00:00 2001 From: FruitRiin Date: Sat, 16 Dec 2023 13:24:00 +0900 Subject: [PATCH 02/27] =?UTF-8?q?=E9=96=8B=E3=81=84=E3=81=A6=E3=82=8B?= =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=A7=E6=8A=95=E7=A8=BF=E5=85=88?= =?UTF-8?q?=E3=81=8C=E3=83=81=E3=83=A3=E3=83=B3=E3=83=8D=E3=83=AB=E3=81=AB?= =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=BB=E3=81=97=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/os.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts index b02f6aa640..fdcf3eaf30 100644 --- a/packages/frontend/src/os.ts +++ b/packages/frontend/src/os.ts @@ -25,6 +25,7 @@ import MkContextMenu from '@/components/MkContextMenu.vue'; import { MenuItem } from '@/types/menu.js'; import copyToClipboard from '@/scripts/copy-to-clipboard.js'; import { showMovedDialog } from '@/scripts/show-moved-dialog.js'; +import {mainRouter} from "@/router.js"; export const openingWindowsCount = ref(0); @@ -601,6 +602,18 @@ export function post(props: Record = {}): Promise { // Vueが渡されたコンポーネントに内部的に__propsというプロパティを生やす影響で、 // 複数のpost formを開いたときに場合によってはエラーになる // もちろん複数のpost formを開けること自体Misskeyサイドのバグなのだが + + + const route = mainRouter.getCurrentPath().split("/") + if(route[1] === "channels") + props = { + ...props, + // 本当はチャンネル名や色もほしいけどどっからとってこよう + channel: { + id: route[2] + } + } + let dispose; popup(MkPostFormDialog, props, { closed: () => { From 88f07147da1ddc257a1e644514ba3ecb5b4e238d Mon Sep 17 00:00:00 2001 From: FruitRiin Date: Sat, 16 Dec 2023 19:36:58 +0900 Subject: [PATCH 03/27] fix lint --- packages/frontend/src/os.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts index fdcf3eaf30..339a096be6 100644 --- a/packages/frontend/src/os.ts +++ b/packages/frontend/src/os.ts @@ -25,7 +25,7 @@ import MkContextMenu from '@/components/MkContextMenu.vue'; import { MenuItem } from '@/types/menu.js'; import copyToClipboard from '@/scripts/copy-to-clipboard.js'; import { showMovedDialog } from '@/scripts/show-moved-dialog.js'; -import {mainRouter} from "@/router.js"; +import { mainRouter } from '@/router.js'; export const openingWindowsCount = ref(0); @@ -603,16 +603,14 @@ export function post(props: Record = {}): Promise { // 複数のpost formを開いたときに場合によってはエラーになる // もちろん複数のpost formを開けること自体Misskeyサイドのバグなのだが - - const route = mainRouter.getCurrentPath().split("/") - if(route[1] === "channels") - props = { + const route = mainRouter.getCurrentPath().split('/'); + if (route[1] === 'channels') props = { ...props, // 本当はチャンネル名や色もほしいけどどっからとってこよう channel: { - id: route[2] - } - } + id: route[2], + }, + }; let dispose; popup(MkPostFormDialog, props, { From 86ac1f6492d10bf6d12984891a79eddd603928cd Mon Sep 17 00:00:00 2001 From: FruitRiin Date: Sat, 16 Dec 2023 19:39:12 +0900 Subject: [PATCH 04/27] fix lint --- .../src/components/MkVisibilityPicker.vue | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/packages/frontend/src/components/MkVisibilityPicker.vue b/packages/frontend/src/components/MkVisibilityPicker.vue index b7600e7f95..dc450d37b6 100644 --- a/packages/frontend/src/components/MkVisibilityPicker.vue +++ b/packages/frontend/src/components/MkVisibilityPicker.vue @@ -37,11 +37,11 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts._visibility.specifiedDescription }}
- + @@ -51,7 +51,7 @@ import { nextTick, shallowRef, ref } from 'vue'; import * as Misskey from 'misskey-js'; import MkModal from '@/components/MkModal.vue'; import { i18n } from '@/i18n.js'; -import * as os from "@/os.js"; +import * as os from '@/os.js'; const modal = shallowRef>(); @@ -82,18 +82,20 @@ const v = ref(props.currentVisibility); */ const channels = ref([]); -async function getChannel(){ - const res = await os.api('channels/my-favorites', { - limit: 100, - }); - channels.value.splice(0, 0, ...res); + +async function getChannel() { + const res = await os.api('channels/my-favorites', { + limit: 100, + }); + channels.value.splice(0, 0, ...res); } + getChannel(); -async function chooseChannel(channel: string ){ - emit("changeChannel", channel); - await nextTick(); - if (modal.value) modal.value.close(); +async function chooseChannel(channel: string ) { + emit('changeChannel', channel); + await nextTick(); + if (modal.value) modal.value.close(); } function choose(visibility: typeof Misskey.noteVisibilities[number]): void { From 1f9c2ee97a97ec6e4c19c83611e1f0f6b8db22a8 Mon Sep 17 00:00:00 2001 From: FruitRiin Date: Sat, 16 Dec 2023 19:41:46 +0900 Subject: [PATCH 05/27] :art: --- packages/frontend/src/components/MkVisibilityPicker.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/components/MkVisibilityPicker.vue b/packages/frontend/src/components/MkVisibilityPicker.vue index dc450d37b6..3a02b26feb 100644 --- a/packages/frontend/src/components/MkVisibilityPicker.vue +++ b/packages/frontend/src/components/MkVisibilityPicker.vue @@ -38,7 +38,7 @@ SPDX-License-Identifier: AGPL-3.0-only From d5fc58e43929a91c3fa44cc25559e2591897e5da Mon Sep 17 00:00:00 2001 From: FruitRiin Date: Sat, 16 Dec 2023 20:03:28 +0900 Subject: [PATCH 06/27] fix bug --- .../frontend/src/components/MkPostForm.vue | 20 ++++++++++--------- .../src/components/MkVisibilityPicker.vue | 13 +++++++----- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index a5ea648277..9cbd79d75a 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -19,19 +19,19 @@ SPDX-License-Identifier: AGPL-3.0-only
- + - - - - - - - -
@@ -47,13 +56,14 @@ SPDX-License-Identifier: AGPL-3.0-only From fb3288d72035f7f4200c9382eb49f815b0435f5b Mon Sep 17 00:00:00 2001 From: samunohito <46447427+samunohito@users.noreply.github.com> Date: Mon, 18 Dec 2023 11:04:08 +0900 Subject: [PATCH 10/27] fix MkPostForm.vue --- .../frontend/src/components/MkPostForm.vue | 78 ++++++++++--------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index c6124da0e1..cfb96bb3ff 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -22,18 +22,18 @@ SPDX-License-Identifier: AGPL-3.0-only - -
+
{{ i18n.ts.recipient }}
@@ -67,7 +67,7 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts.notSpecifiedMentionWarning }} -
-
+