From 853ef0e0757c5138b755046c7c84f1e9512f0dc2 Mon Sep 17 00:00:00 2001 From: Ebise Date: Tue, 7 Jan 2025 16:09:30 +0000 Subject: [PATCH 1/7] =?UTF-8?q?usePostFormWindow=E3=82=92=E4=B8=80?= =?UTF-8?q?=E5=BA=A6=E7=84=A1=E5=8A=B9=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/os.ts | 6 ++---- packages/frontend/src/pages/settings/ebisskey.vue | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts index 565f287b0ae8..dd754b5942aa 100644 --- a/packages/frontend/src/os.ts +++ b/packages/frontend/src/os.ts @@ -11,6 +11,7 @@ import * as Misskey from 'misskey-js'; import type { ComponentProps as CP } from 'vue-component-type-helpers'; import type { Form, GetFormResultType } from '@/scripts/form.js'; import type { MenuItem } from '@/types/menu.js'; +import type { PostFormProps } from '@/types/post-form.js'; import { misskeyApi } from '@/scripts/misskey-api.js'; import { defaultStore } from '@/store.js'; import { i18n } from '@/i18n.js'; @@ -25,12 +26,10 @@ import MkEmojiPickerDialog from '@/components/MkEmojiPickerDialog.vue'; import MkPopupMenu from '@/components/MkPopupMenu.vue'; import MkContextMenu from '@/components/MkContextMenu.vue'; import { copyToClipboard } from '@/scripts/copy-to-clipboard.js'; -import { defaultStore } from './store.js'; import { pleaseLogin } from '@/scripts/please-login.js'; import { showMovedDialog } from '@/scripts/show-moved-dialog.js'; import { getHTMLElementOrNull } from '@/scripts/get-dom-node-or-null.js'; import { focusParent } from '@/scripts/focus.js'; -import type { PostFormProps } from '@/types/post-form.js'; export const openingWindowsCount = ref(0); @@ -709,8 +708,7 @@ export function post(props: PostFormProps = {}): Promise { // Vueが渡されたコンポーネントに内部的に__propsというプロパティを生やす影響で、 // 複数のpost formを開いたときに場合によってはエラーになる // もちろん複数のpost formを開けること自体Misskeyサイドのバグなのだが - const component = defaultStore.state.usePostFormWindow ? MkPostFormWindow : MkPostFormDialog; - const { dispose } = popup(component, props, { + const { dispose } = popup(MkPostFormDialog, props, { closed: () => { resolve(); dispose(); diff --git a/packages/frontend/src/pages/settings/ebisskey.vue b/packages/frontend/src/pages/settings/ebisskey.vue index 9d874ebf7051..17c929b95eab 100644 --- a/packages/frontend/src/pages/settings/ebisskey.vue +++ b/packages/frontend/src/pages/settings/ebisskey.vue @@ -95,9 +95,10 @@ - + + From be313d0f2afe692618aed3bcd7935debbbba19a8 Mon Sep 17 00:00:00 2001 From: Ebise Date: Tue, 7 Jan 2025 16:19:33 +0000 Subject: [PATCH 2/7] =?UTF-8?q?=E7=B4=B0=E3=81=8B=E3=81=84=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/pages/settings/ebisskey.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/pages/settings/ebisskey.vue b/packages/frontend/src/pages/settings/ebisskey.vue index 17c929b95eab..77e52b210e08 100644 --- a/packages/frontend/src/pages/settings/ebisskey.vue +++ b/packages/frontend/src/pages/settings/ebisskey.vue @@ -89,7 +89,7 @@ - + From 510b46d8e01f894be75c25265b8fe08cea7cd44a Mon Sep 17 00:00:00 2001 From: Ebise Date: Tue, 7 Jan 2025 16:20:54 +0000 Subject: [PATCH 3/7] =?UTF-8?q?=E3=82=A8=E3=82=A2=E3=83=AA=E3=83=97?= =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=81=AE=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/components/MkPostForm.vue | 12 +++++++++--- packages/frontend/src/pages/settings/ebisskey.vue | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index be5985806f64..a1e6f07bf383 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- @@ -294,7 +294,7 @@ if (props.mention) { text.value += ' '; } -if (props.reply && (props.reply.user.username !== $i.username || (props.reply.user.host != null && props.reply.user.host !== host))) { +if (props.reply && !props.isAirReply && (props.reply.user.username !== $i.username || (props.reply.user.host != null && props.reply.user.host !== host))) { text.value = `@${props.reply.user.username}${props.reply.user.host != null ? '@' + toASCII(props.reply.user.host) : ''} `; } @@ -355,6 +355,12 @@ if (props.reply && ['home', 'followers', 'specified'].includes(props.reply.visib } } +// Shrimpia エアリプ機能を用いる場合の処理 +if (props.reply && props.isAirReply) { + visibility.value = props.reply.visibility; + localOnly.value = props.reply.localOnly ?? false; +} + if (props.specified) { visibility.value = 'specified'; pushVisibleUser(props.specified); diff --git a/packages/frontend/src/pages/settings/ebisskey.vue b/packages/frontend/src/pages/settings/ebisskey.vue index 77e52b210e08..c4c69f4d53c7 100644 --- a/packages/frontend/src/pages/settings/ebisskey.vue +++ b/packages/frontend/src/pages/settings/ebisskey.vue @@ -95,8 +95,8 @@
- - + From 423436c43a15b5b094716297fca4320e16002f8b Mon Sep 17 00:00:00 2001 From: Ebise Date: Tue, 7 Jan 2025 16:21:02 +0000 Subject: [PATCH 4/7] =?UTF-8?q?=E5=85=AC=E9=96=8B=E7=AF=84=E5=9B=B2?= =?UTF-8?q?=E3=81=AB=E3=82=88=E3=82=8B=E8=89=B2=E5=88=86=E3=81=91=E6=A9=9F?= =?UTF-8?q?=E8=83=BD=E3=81=AE=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/components/MkNote.vue | 2 +- packages/frontend/src/components/MkPostForm.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index ade0187c237f..59806006d100 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only :class="[$style.root, { [$style.showActionsOnlyHover]: defaultStore.state.showNoteActionsOnlyHover, [$style.skipRender]: defaultStore.state.skipNoteRender }]" :tabindex="isDeleted ? '-1' : '0'" > - +
{{ i18n.ts.pinnedNote }}
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index a1e6f07bf383..b9b8ca2e1f93 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only @dragleave="onDragleave" @drop.stop="onDrop" > - +
From ed93bc441019587177c79f182033b092de72d02e Mon Sep 17 00:00:00 2001 From: Ebise Date: Tue, 7 Jan 2025 17:21:16 +0000 Subject: [PATCH 5/7] =?UTF-8?q?=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=82=A8=E3=83=AA=E3=82=A2=E3=81=AE=E3=82=B5=E3=82=A4=E3=82=BA?= =?UTF-8?q?=E8=87=AA=E5=8B=95=E6=8C=87=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frontend/src/components/MkPostForm.vue | 2 +- .../frontend/src/components/MkTextarea.vue | 1 + packages/frontend/src/directives/autosize.ts | 22 +++++++++++++++++++ packages/frontend/src/directives/index.ts | 2 ++ .../page-editor/els/page-editor.el.text.vue | 4 ++-- .../frontend/src/pages/settings/ebisskey.vue | 17 ++++++++++---- packages/frontend/src/pages/user/home.vue | 1 + packages/frontend/src/store.ts | 4 ++++ .../frontend/src/widgets/WidgetAiscript.vue | 2 +- packages/frontend/src/widgets/WidgetMemo.vue | 2 +- 10 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 packages/frontend/src/directives/autosize.ts diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index b9b8ca2e1f93..7391a1a5da45 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -72,7 +72,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- +