From 7795ff0c956134ca22950f561cddffa2dd109719 Mon Sep 17 00:00:00 2001 From: futchitwo <74236683+futchitwo@users.noreply.github.com> Date: Sun, 15 Jan 2023 23:47:04 +0900 Subject: [PATCH 001/116] fix: note embedding in Pages editor (#9604) --- .../page-editor/els/page-editor.el.note.vue | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue b/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue index 3efad47fc9..d8a7eb85aa 100644 --- a/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue +++ b/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue @@ -37,20 +37,16 @@ const emit = defineEmits<{ let id: any = $ref(props.modelValue.note); let note: any = $ref(null); -watch(id, async () => { +watch($$(id), async () => { if (id && (id.startsWith('http://') || id.startsWith('https://'))) { - emit('update:modelValue', { - ...props.modelValue, - note: (id.endsWith('/') ? id.slice(0, -1) : id).split('/').pop(), - }); - } else { - emit('update:modelValue', { - ...props.modelValue, - note: id, - }); + id = (id.endsWith('/') ? id.slice(0, -1) : id).split('/').pop(); } - note = await os.api('notes/show', { noteId: props.modelValue.note }); + emit('update:modelValue', { + ...props.modelValue, + note: id, + }); + note = await os.api('notes/show', { noteId: id }); }, { immediate: true, }); From 9385767b12d2c609dd513580852fffd33b41854f Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 15 Jan 2023 16:32:24 +0000 Subject: [PATCH 002/116] fix(client): add :disable-link="true" to some Fix #9606 --- packages/frontend/src/components/MkMenu.vue | 6 +++--- packages/frontend/src/components/MkPostForm.vue | 2 +- .../frontend/src/components/MkReactionsViewer.details.vue | 2 +- packages/frontend/src/components/global/MkPageHeader.vue | 4 ++-- packages/frontend/src/pages/settings/accounts.vue | 2 +- packages/frontend/src/pages/user/home.vue | 2 +- packages/frontend/src/ui/_common_/navbar-for-mobile.vue | 2 +- packages/frontend/src/ui/_common_/navbar.vue | 2 +- packages/frontend/src/ui/classic.header.vue | 2 +- packages/frontend/src/ui/classic.sidebar.vue | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue index 94dabcac90..5db5158557 100644 --- a/packages/frontend/src/components/MkMenu.vue +++ b/packages/frontend/src/components/MkMenu.vue @@ -17,7 +17,7 @@ - + {{ item.text }} @@ -27,7 +27,7 @@ @@ -40,7 +40,7 @@ diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index 6822caf4f4..24ac380d17 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -9,7 +9,7 @@
{{ maxTextLength - textLength }} diff --git a/packages/frontend/src/components/MkReactionsViewer.details.vue b/packages/frontend/src/components/MkReactionsViewer.details.vue index b4210be911..0ada1ac4d0 100644 --- a/packages/frontend/src/components/MkReactionsViewer.details.vue +++ b/packages/frontend/src/components/MkReactionsViewer.details.vue @@ -7,7 +7,7 @@
- +
+{{ count - 10 }}
diff --git a/packages/frontend/src/components/global/MkPageHeader.vue b/packages/frontend/src/components/global/MkPageHeader.vue index 7f5658ee13..f55c4f6a75 100644 --- a/packages/frontend/src/components/global/MkPageHeader.vue +++ b/packages/frontend/src/components/global/MkPageHeader.vue @@ -1,11 +1,11 @@