From caa892d823caf8b5366a88510ec9e8c0b77e2c15 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Tue, 8 Oct 2024 15:41:21 +0900 Subject: [PATCH 01/67] =?UTF-8?q?enhance(frontend):=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8=20=EB=B0=8F=20=EB=A7=88=EC=9D=B4=EA=B7=B8?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20=EC=95=8C=EB=A6=BC=EC=97=90?= =?UTF-8?q?=EC=84=9C=20CherryPick=EC=9D=98=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EC=82=AC=ED=95=AD=EB=A7=8C=20=ED=91=9C=EC=8B=9C=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_CHERRYPICK.md | 11 +++++++++++ packages/frontend/src/components/MkMigrated.vue | 6 ++++-- packages/frontend/src/components/MkUpdated.vue | 4 +++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index b6105e353e..0c4eaaa972 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -23,6 +23,17 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE # 릴리즈 노트 이 문서는 CherryPick의 변경 사항만 포함합니다. +## 4.x.x +출시일: unreleased
+기반 Misskey 버전: 2024.x.x
+Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGELOG.md#2024xx) 문서를 참고하십시오. + +### Client +- Enhance: 업데이트 및 마이그레이션 알림에서 CherryPick의 변경 사항만 표시함 + +--- + + ## 4.12.0 출시일: 2024/10/08
기반 Misskey 버전: 2024.9.0
diff --git a/packages/frontend/src/components/MkMigrated.vue b/packages/frontend/src/components/MkMigrated.vue index 2008c9c438..2b061791c3 100644 --- a/packages/frontend/src/components/MkMigrated.vue +++ b/packages/frontend/src/components/MkMigrated.vue @@ -17,18 +17,20 @@ SPDX-License-Identifier: AGPL-3.0-only
✨{{ version }}🚀
{{ basedMisskeyVersion }}
- {{ i18n.ts.whatIsNew }} + {{ i18n.ts.whatIsNew }} {{ i18n.ts.gotIt }} + From 5879a3521fd711a2dd2139c8e8d07ecf992d43f3 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Thu, 10 Oct 2024 10:05:45 +0900 Subject: [PATCH 07/67] Update deps --- packages/frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 173abe2c93..c8ad33c968 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -70,7 +70,7 @@ "sass": "1.79.3", "shiki": "1.12.0", "strict-event-emitter-types": "2.0.0", - "temml": "0.10.20", + "temml": "0.10.29", "textarea-caret": "3.1.0", "three": "0.169.0", "throttle-debounce": "5.0.2", From 5e6ac01a4accdb691acaa8a8fc4b927a1b669c29 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Thu, 10 Oct 2024 10:12:16 +0900 Subject: [PATCH 08/67] =?UTF-8?q?enhance(frontend):=20=ED=99=98=EC=98=81?= =?UTF-8?q?=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=9D=98=20=ED=83=80=EC=9E=84?= =?UTF-8?q?=EB=9D=BC=EC=9D=B8=EC=97=90=EC=84=9C=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8A=94=20=EC=9D=BC=EB=B6=80?= =?UTF-8?q?=20=EB=85=B8=ED=8A=B8=20=EB=A9=94=EB=89=B4=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=20=20=20-=20QR=20=EC=BD=94=EB=93=9C=20=EC=83=9D=EC=84=B1=20=20?= =?UTF-8?q?=20-=20=EC=83=88=20=ED=83=AD=EC=97=90=EC=84=9C=20=EC=97=B4?= =?UTF-8?q?=EA=B8=B0=20=20=20-=20=EB=A6=AC=EB=85=B8=ED=8A=B8=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=20=20-=20=EB=A6=AC=EC=95=A1=EC=85=98=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=20=20-=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=86=8C?= =?UTF-8?q?=EC=8A=A4=20=EB=B3=B4=EA=B8=B0=20=20=20-=20=EA=B3=A0=EC=96=91?= =?UTF-8?q?=EC=9D=B4=EC=B2=B4=EB=A1=9C=20=ED=91=9C=EC=8B=9C=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(frontend): 노트 메뉴에 `링크 복사` 옵션이 표시되지 않음 --- CHANGELOG_CHERRYPICK.md | 8 ++ .../frontend/src/scripts/get-note-menu.ts | 101 +++++++++++++----- 2 files changed, 83 insertions(+), 26 deletions(-) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index 9f66ef5593..5b9bc90695 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -31,9 +31,17 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE ### Client - Enhance: 업데이트 및 마이그레이션 알림에서 CherryPick의 변경 사항만 표시함 - Enhance: 검색과 같은 입력 블록에서 `Enter`를 입력하면 자동으로 가상 키보드를 숨김 +- Enhance: 환영 페이지의 타임라인에서 사용할 수 있는 일부 노트 메뉴 추가 + - QR 코드 생성 + - 새 탭에서 열기 + - 리노트 목록 + - 리액션 목록 + - 텍스트 소스 보기 + - 고양이체로 표시하지 않기 - Fix: 임베디드 코드에서 CherryPick의 색상 설정이 반영되지 않음 - Fix: 임베디드 코드에 `fade`와 Temml(KaTex)가 반영되지 않음 - Fix: 노트의 QR 코드를 생성했을 때 `링크 복사` 버튼을 누르면 잘못된 토스트 알림이 표시됨 +- Fix: 노트 메뉴에 `링크 복사` 옵션이 표시되지 않음 --- diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts index 5fce5c0c85..7f1c26d9d6 100644 --- a/packages/frontend/src/scripts/get-note-menu.ts +++ b/packages/frontend/src/scripts/get-note-menu.ts @@ -405,20 +405,16 @@ export function getNoteMenu(props: { }); } - getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink); - - menuItems.push({ + menuItems.push(getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink), { + icon: 'ti ti-copy', + text: i18n.ts.copyContent, + action: copyContent, + }, { icon: 'ti ti-qrcode', text: i18n.ts.getQRCode, action: () => { os.displayQRCode(`${url}/notes/${appearNote.id}`); }, - }); - - menuItems.push({ - icon: 'ti ti-copy', - text: i18n.ts.copyContent, - action: copyContent, }, { icon: 'ti ti-external-link', text: i18n.ts.openInNewTab, @@ -625,27 +621,80 @@ export function getNoteMenu(props: { }); } } else { - menuItems.push({ - icon: 'ti ti-info-circle', - text: i18n.ts.details, - action: openDetail, - }, { + menuItems.push(getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink), { icon: 'ti ti-copy', text: i18n.ts.copyContent, action: copyContent, - }, getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink)); + }, { + icon: 'ti ti-qrcode', + text: i18n.ts.getQRCode, + action: () => { + os.displayQRCode(`${url}/notes/${appearNote.id}`); + }, + }, { + icon: 'ti ti-external-link', + text: i18n.ts.openInNewTab, + action: openInNewTab, + }); - if (appearNote.url ?? appearNote.uri) { - menuItems.push({ - icon: 'ti ti-external-link', - text: i18n.ts.showOnRemote, - action: () => { - window.open(appearNote.url ?? appearNote.uri, '_blank', 'noopener'); - }, - }); - } else { - menuItems.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.genEmbedCode)); - } + menuItems.push({ + type: 'parent', + icon: 'ti ti-note', + text: i18n.ts.note, + children: async () => { + const noteChildMenu = [] as MenuItem[]; + + noteChildMenu.push({ + icon: 'ti ti-info-circle', + text: i18n.ts.details, + action: openDetail, + }, { + icon: 'ti ti-repeat', + text: i18n.ts.renotesList, + action: showRenotes, + }, { + icon: 'ti ti-icons', + text: i18n.ts.reactionsList, + action: showReactions, + }); + + if (appearNote.url ?? appearNote.uri) { + noteChildMenu.push({ + icon: 'ti ti-external-link', + text: i18n.ts.showOnRemote, + action: () => { + window.open(appearNote.url ?? appearNote.uri, '_blank', 'noopener'); + }, + }); + } else { + noteChildMenu.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.genEmbedCode)); + } + + noteChildMenu.push({ type: 'divider' }); + + noteChildMenu.push({ + icon: 'ti ti-source-code', + text: i18n.ts.viewTextSource, + action: showViewTextSource, + }); + + if (props.noNyaize.value) { + noteChildMenu.push({ + icon: 'ti ti-paw-filled', + text: i18n.ts.revertNoNyaization, + action: revertNoNyaizeText, + }); + } else { + noteChildMenu.push({ + icon: 'ti ti-paw-off', + text: i18n.ts.noNyaization, + action: noNyaizeText, + }); + } + + return noteChildMenu; + }, + }); } if (noteActions.length > 0) { From 4c33a2c93cbbb11e87be67b0e4d04482e1c0499f Mon Sep 17 00:00:00 2001 From: NoriDev Date: Thu, 10 Oct 2024 10:33:00 +0900 Subject: [PATCH 09/67] =?UTF-8?q?fix(frontend):=20=EC=84=9C=EB=B2=84=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=EC=97=90=20=EB=A7=88=ED=81=AC=EC=97=85=20?= =?UTF-8?q?=EC=96=B8=EC=96=B4=EA=B0=80=20=ED=8F=AC=ED=95=A8=EB=90=98?= =?UTF-8?q?=EC=96=B4=20=EC=9E=88=EC=9C=BC=EB=A9=B4=20=EC=99=B8=EB=B6=80=20?= =?UTF-8?q?=EC=82=AC=EC=9D=B4=ED=8A=B8=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= =?UTF-8?q?=ED=95=A0=20=EB=95=8C=20=ED=91=9C=EC=8B=9C=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EB=8C=80=ED=99=94=EC=83=81=EC=9E=90=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EC=9D=B4=EB=A6=84=EC=9D=B4=20=EC=9E=98?= =?UTF-8?q?=EB=AA=BB=20=ED=91=9C=EC=8B=9C=EB=90=A0=20=EC=88=98=20=EC=9E=88?= =?UTF-8?q?=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_CHERRYPICK.md | 1 + packages/frontend/src/components/MkUrlWarningDialog.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index 5b9bc90695..93820ee5b9 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -42,6 +42,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE - Fix: 임베디드 코드에 `fade`와 Temml(KaTex)가 반영되지 않음 - Fix: 노트의 QR 코드를 생성했을 때 `링크 복사` 버튼을 누르면 잘못된 토스트 알림이 표시됨 - Fix: 노트 메뉴에 `링크 복사` 옵션이 표시되지 않음 +- Fix: 서버 이름에 마크업 언어가 포함되어 있으면 외부 사이트로 이동할 때 표시되는 대화상자에서 서버 이름이 잘못 표시될 수 있음 --- diff --git a/packages/frontend/src/components/MkUrlWarningDialog.vue b/packages/frontend/src/components/MkUrlWarningDialog.vue index 4b2d06b734..f5ad9184eb 100644 --- a/packages/frontend/src/components/MkUrlWarningDialog.vue +++ b/packages/frontend/src/components/MkUrlWarningDialog.vue @@ -13,7 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._externalNavigationWarning.title }}
-
+
{{ url }}
{{ i18n.ts._externalNavigationWarning.trustThisDomain }} From d1e059e320e6ddf0c3489b77c879f9861b43d93e Mon Sep 17 00:00:00 2001 From: NoriDev Date: Thu, 10 Oct 2024 10:42:17 +0900 Subject: [PATCH 10/67] =?UTF-8?q?fix(frontend):=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=ED=95=98=EC=A7=80=20=EC=95=8A=EC=9D=80=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=EA=B0=80=20=EB=85=B8=ED=8A=B8=20=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=EC=97=90=20=ED=8F=AC=ED=95=A8=EB=90=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=AA=A8=EC=A7=80=EB=A5=BC=20=EB=88=84=EB=A5=B4=EB=A9=B4=20?= =?UTF-8?q?=EC=9D=B4=EB=AA=A8=EC=A7=80=20=EB=B3=B5=EC=82=AC=20=EB=B0=8F=20?= =?UTF-8?q?=EB=A6=AC=EC=95=A1=EC=85=98=20=EB=A9=94=EB=89=B4=EC=97=90=20?= =?UTF-8?q?=EC=A0=91=EA=B7=BC=ED=95=A0=20=EC=88=98=20=EC=9E=88=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_CHERRYPICK.md | 1 + packages/frontend/src/components/MkNote.vue | 12 ++++++------ packages/frontend/src/components/MkNoteDetailed.vue | 12 ++++++------ .../frontend/src/components/MkSubNoteContent.vue | 8 ++++---- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index 93820ee5b9..05180ff970 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -43,6 +43,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE - Fix: 노트의 QR 코드를 생성했을 때 `링크 복사` 버튼을 누르면 잘못된 토스트 알림이 표시됨 - Fix: 노트 메뉴에 `링크 복사` 옵션이 표시되지 않음 - Fix: 서버 이름에 마크업 언어가 포함되어 있으면 외부 사이트로 이동할 때 표시되는 대화상자에서 서버 이름이 잘못 표시될 수 있음 +- Fix: 로그인 하지 않은 사용자가 노트 내용에 포함된 이모지를 누르면 이모지 복사 및 리액션 메뉴에 접근할 수 있음 --- diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index ada3c73be9..e298553ccf 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -73,8 +73,8 @@ SPDX-License-Identifier: AGPL-3.0-only :text="appearNote.cw" :author="appearNote.user" :nyaize="noNyaize ? false : 'respect'" - :enableEmojiMenu="true" - :enableEmojiMenuReaction="true" + :enableEmojiMenu="!!$i" + :enableEmojiMenuReaction="!!$i" />

@@ -89,8 +89,8 @@ SPDX-License-Identifier: AGPL-3.0-only :author="appearNote.user" :nyaize="noNyaize ? false : 'respect'" :emojiUrls="appearNote.emojis" - :enableEmojiMenu="true" - :enableEmojiMenuReaction="true" + :enableEmojiMenu="!!$i" + :enableEmojiMenuReaction="!!$i" />
@@ -105,8 +105,8 @@ SPDX-License-Identifier: AGPL-3.0-only :author="appearNote.user" :nyaize="noNyaize ? false : 'respect'" :emojiUrls="appearNote.emojis" - :enableEmojiMenu="true" - :enableEmojiMenuReaction="true" + :enableEmojiMenu="!!$i" + :enableEmojiMenuReaction="!!$i" @click.stop />
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index 2ed0a309f4..1dbb33ca04 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -96,8 +96,8 @@ SPDX-License-Identifier: AGPL-3.0-only :text="appearNote.cw" :author="appearNote.user" :nyaize="noNyaize ? false : 'respect'" - :enableEmojiMenu="true" - :enableEmojiMenuReaction="true" + :enableEmojiMenu="!!$i" + :enableEmojiMenuReaction="!!$i" />

@@ -111,8 +111,8 @@ SPDX-License-Identifier: AGPL-3.0-only :author="appearNote.user" :nyaize="noNyaize ? false : 'respect'" :emojiUrls="appearNote.emojis" - :enableEmojiMenu="true" - :enableEmojiMenuReaction="true" + :enableEmojiMenu="!!$i" + :enableEmojiMenuReaction="!!$i" /> RN:
@@ -128,8 +128,8 @@ SPDX-License-Identifier: AGPL-3.0-only :author="appearNote.user" :nyaize="noNyaize ? false : 'respect'" :emojiUrls="appearNote.emojis" - :enableEmojiMenu="true" - :enableEmojiMenuReaction="true" + :enableEmojiMenu="!!$i" + :enableEmojiMenuReaction="!!$i" />
diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue index 1427915b20..0441ddbab0 100644 --- a/packages/frontend/src/components/MkSubNoteContent.vue +++ b/packages/frontend/src/components/MkSubNoteContent.vue @@ -16,8 +16,8 @@ SPDX-License-Identifier: AGPL-3.0-only :author="note.user" :nyaize="noNyaize ? false : 'respect'" :emojiUrls="note.emojis" - :enableEmojiMenu="true" - :enableEmojiMenuReaction="true" + :enableEmojiMenu="!!$i" + :enableEmojiMenuReaction="!!$i" /> RN: ...
@@ -33,8 +33,8 @@ SPDX-License-Identifier: AGPL-3.0-only :author="note.user" :nyaize="noNyaize ? false : 'respect'" :emojiUrls="note.emojis" - :enableEmojiMenu="true" - :enableEmojiMenuReaction="true" + :enableEmojiMenu="!!$i" + :enableEmojiMenuReaction="!!$i" @click.stop />
From 1bfd47b18fb0b42119cc2608c57f400a0d0cce08 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Thu, 10 Oct 2024 10:46:22 +0900 Subject: [PATCH 11/67] =?UTF-8?q?fix(frontend):=20=EB=AA=A8=EB=B0=94?= =?UTF-8?q?=EC=9D=BC=20=ED=99=98=EA=B2=BD=EC=97=90=EC=84=9C=20=EB=85=B8?= =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1=20=ED=8F=BC=EC=9D=98=20=EB=AF=B8?= =?UTF-8?q?=EB=A6=AC=EB=B3=B4=EA=B8=B0=20=EB=94=94=EC=9E=90=EC=9D=B8?= =?UTF-8?q?=EC=9D=B4=20=EC=9E=98=EB=AA=BB=20=ED=91=9C=EC=8B=9C=EB=90=A0=20?= =?UTF-8?q?=EC=88=98=20=EC=9E=88=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_CHERRYPICK.md | 1 + packages/frontend/src/components/MkPostForm.vue | 2 +- packages/frontend/src/components/MkPostFormSimple.vue | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index 05180ff970..522aa5af63 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -44,6 +44,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE - Fix: 노트 메뉴에 `링크 복사` 옵션이 표시되지 않음 - Fix: 서버 이름에 마크업 언어가 포함되어 있으면 외부 사이트로 이동할 때 표시되는 대화상자에서 서버 이름이 잘못 표시될 수 있음 - Fix: 로그인 하지 않은 사용자가 노트 내용에 포함된 이모지를 누르면 이모지 복사 및 리액션 메뉴에 접근할 수 있음 +- Fix: 모바일 환경에서 노트 작성 폼의 미리보기 디자인이 잘못 표시될 수 있음 --- diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index 540af025b7..23edd951ee 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -1585,7 +1585,7 @@ html[data-color-scheme=light] .preview { } .preview { - padding: 16px 14px 0 14px; + padding: 16px 14px; } .withQuote { diff --git a/packages/frontend/src/components/MkPostFormSimple.vue b/packages/frontend/src/components/MkPostFormSimple.vue index eb799e60d5..e41d84f27c 100644 --- a/packages/frontend/src/components/MkPostFormSimple.vue +++ b/packages/frontend/src/components/MkPostFormSimple.vue @@ -1634,7 +1634,7 @@ html[data-color-scheme=light] .preview { } .preview { - padding: 16px 14px 0 14px; + padding: 16px 14px; } .withQuote { From b3fa7504360babf0082b03221fb95262338c1ddc Mon Sep 17 00:00:00 2001 From: NoriDev Date: Thu, 10 Oct 2024 13:36:24 +0900 Subject: [PATCH 12/67] =?UTF-8?q?enhance(frontend):=20(Friendly)=20?= =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=ED=99=98=EA=B2=BD=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EA=B3=84=EC=A0=95=20=EB=AA=A9=EB=A1=9D=EC=9D=84=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C=ED=95=A0=20=EB=95=8C=20=EB=82=B4=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=ED=95=84=EC=9D=84=20=ED=91=9C=EC=8B=9C=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit enhance(frontend): 노트 작성 폼의 사용자 선택 메뉴에서 현재 계정과 로그인된 추가 계정 영역을 구분함 --- CHANGELOG_CHERRYPICK.md | 2 ++ packages/frontend/src/account.ts | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index 522aa5af63..6587198ec4 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -29,6 +29,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGELOG.md#2024xx) 문서를 참고하십시오. ### Client +- Enhance: (Friendly) 모바일 환경에서 계정 목록을 표시할 때 내 프로필을 표시함 - Enhance: 업데이트 및 마이그레이션 알림에서 CherryPick의 변경 사항만 표시함 - Enhance: 검색과 같은 입력 블록에서 `Enter`를 입력하면 자동으로 가상 키보드를 숨김 - Enhance: 환영 페이지의 타임라인에서 사용할 수 있는 일부 노트 메뉴 추가 @@ -38,6 +39,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE - 리액션 목록 - 텍스트 소스 보기 - 고양이체로 표시하지 않기 +- Enhance: 노트 작성 폼의 사용자 선택 메뉴에서 현재 계정과 로그인된 추가 계정 영역을 구분함 - Fix: 임베디드 코드에서 CherryPick의 색상 설정이 반영되지 않음 - Fix: 임베디드 코드에 `fade`와 Temml(KaTex)가 반영되지 않음 - Fix: 노트의 QR 코드를 생성했을 때 `링크 복사` 버튼을 누르면 잘못된 토스트 알림이 표시됨 diff --git a/packages/frontend/src/account.ts b/packages/frontend/src/account.ts index b454d9bb80..ab50528ccb 100644 --- a/packages/frontend/src/account.ts +++ b/packages/frontend/src/account.ts @@ -382,6 +382,18 @@ export async function openAccountMenu(opts: { } else { if (opts.includeCurrentAccount) { menuItems.push(createItem($i)); + if (accountItemPromises.length > 0) menuItems.push({ type: 'divider' }); + } + + if (opts.withExtraOperationFriendly) { + menuItems.push({ + type: 'link', + text: $i.name, + to: `/@${$i.username}`, + avatar: $i, + }); + + if (accountItemPromises.length > 0) menuItems.push({ type: 'divider' }); } menuItems.push(...accountItemPromises); From c76c95d1b17b85b7919a5d55d92af0f1f625a75b Mon Sep 17 00:00:00 2001 From: NoriDev Date: Thu, 10 Oct 2024 13:39:28 +0900 Subject: [PATCH 13/67] Update en-US.yml --- locales/en-US.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index e42d5cdb1f..8db1c8b697 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -2958,7 +2958,7 @@ _reversi: canPutEverywhere: "Tiles are placeable everywhere" timeLimitForEachTurn: "Time limit for turn" freeMatch: "Free Match" - lookingForPlayer: "Finding opponent..." + lookingForPlayer: "Finding opponent" gameCanceled: "The game has been cancelled." shareToTlTheGameWhenStart: "Share Game to timeline when started" iStartedAGame: "The game has begun! #MisskeyReversi" From cb7379852e80c5214dfd3d2dd1d50344529578f2 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Thu, 10 Oct 2024 14:08:27 +0900 Subject: [PATCH 14/67] chore --- packages/sw/src/sw.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sw/src/sw.ts b/packages/sw/src/sw.ts index e15b162591..eb133a8342 100644 --- a/packages/sw/src/sw.ts +++ b/packages/sw/src/sw.ts @@ -36,7 +36,7 @@ async function offlineContentHTML() { reload: i18n.ts?.reload ?? 'Reload', }; - return `${messages.title}
${messages.header}
v${_VERSION_}_${_BASEDMISSKEYVERSION_}
`; + return `${messages.title}
${messages.header}
v${_VERSION_}_${_BASEDMISSKEYVERSION_}
`; } globalThis.addEventListener('fetch', ev => { From 297c0c5bdfb9cc944d990af5d3c63c5dae0e5112 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Thu, 10 Oct 2024 14:20:09 +0900 Subject: [PATCH 15/67] =?UTF-8?q?fix(frontend):=20=EB=A6=AC=EB=B2=84?= =?UTF-8?q?=EC=8B=9C=EC=97=90=EC=84=9C=20=EC=BB=A4=EC=8A=A4=ED=85=80=20?= =?UTF-8?q?=EC=9D=B4=EB=AA=A8=EC=A7=80=EB=A5=BC=20=EB=A6=AC=EC=95=A1?= =?UTF-8?q?=EC=85=98=EC=9C=BC=EB=A1=9C=20=EB=B3=B4=EB=82=BC=20=EC=88=98=20?= =?UTF-8?q?=EC=97=86=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_CHERRYPICK.md | 1 + packages/frontend/src/pages/reversi/game.board.vue | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index 6587198ec4..957d3fe6db 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -47,6 +47,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE - Fix: 서버 이름에 마크업 언어가 포함되어 있으면 외부 사이트로 이동할 때 표시되는 대화상자에서 서버 이름이 잘못 표시될 수 있음 - Fix: 로그인 하지 않은 사용자가 노트 내용에 포함된 이모지를 누르면 이모지 복사 및 리액션 메뉴에 접근할 수 있음 - Fix: 모바일 환경에서 노트 작성 폼의 미리보기 디자인이 잘못 표시될 수 있음 +- Fix: 리버시에서 커스텀 이모지를 리액션으로 보낼 수 없음 --- diff --git a/packages/frontend/src/pages/reversi/game.board.vue b/packages/frontend/src/pages/reversi/game.board.vue index 04e420e1bf..f6298fc576 100644 --- a/packages/frontend/src/pages/reversi/game.board.vue +++ b/packages/frontend/src/pages/reversi/game.board.vue @@ -513,7 +513,7 @@ function getKey(emoji: string | Misskey.entities.EmojiSimple | UnicodeEmojiDef): // 既にでている絵文字をクリックした際の挙動 function onReactionEmojiClick(emoji: string, ev?: MouseEvent) { - console.log('emoji click'); + if (_DEV_) console.log('emoji click'); const el = ev && (ev.currentTarget ?? ev.target) as HTMLElement | null | undefined; if (el) { const rect = el.getBoundingClientRect(); @@ -535,7 +535,7 @@ function onReactionEmojiClick(emoji: string, ev?: MouseEvent) { const reactButton = ref(null); function onReactionPickerClick() { - reactionPicker.show(reactButton.value ?? null, reaction => { + reactionPicker.show(reactButton.value ?? null, null, reaction => { const key = getKey(reaction); sendReaction(key); @@ -547,7 +547,7 @@ function onReactionPickerClick() { // #endregion function sendReaction(emojiKey: string) { - console.log('send emoji'); + if (_DEV_) console.log('send emoji'); if (!canReact.value) return; canReact.value = false; @@ -575,11 +575,11 @@ function onReacted(payload: Parameters Date: Thu, 10 Oct 2024 14:52:05 +0900 Subject: [PATCH 16/67] =?UTF-8?q?fix(frontend):=20=ED=8A=B9=EC=A0=95=20?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=EC=97=90=EC=84=9C=20=EB=85=B8=ED=8A=B8=20?= =?UTF-8?q?=EB=8F=99=EC=9E=91=20=EB=B2=84=ED=8A=BC=EC=9D=84=20=EB=B9=84?= =?UTF-8?q?=ED=99=9C=EC=84=B1=ED=99=94=20=ED=95=B4=EB=8F=84=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=EC=9D=B4=20=EC=82=AC=EB=9D=BC=EC=A7=80=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EC=9D=8C=20=20=20-=20=EB=85=B8=ED=8A=B8=EC=97=90=20?= =?UTF-8?q?=EB=8B=B5=EA=B8=80=EC=9D=84=20=EC=9E=91=EC=84=B1=ED=95=A0=20?= =?UTF-8?q?=EC=88=98=20=EC=97=86=EC=9D=84=20=EB=95=8C=20=20=20-=20?= =?UTF-8?q?=EB=85=B8=ED=8A=B8=EB=A5=BC=20=EB=A6=AC=EB=85=B8=ED=8A=B8?= =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=97=86=EC=9D=84=20=EB=95=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_CHERRYPICK.md | 3 ++ packages/frontend/src/components/MkNote.vue | 48 ++++++++++--------- .../src/components/MkNoteDetailed.vue | 48 ++++++++++--------- .../src/components/MkSubNoteContent.vue | 48 ++++++++++--------- 4 files changed, 81 insertions(+), 66 deletions(-) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index 957d3fe6db..f4531dd722 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -48,6 +48,9 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE - Fix: 로그인 하지 않은 사용자가 노트 내용에 포함된 이모지를 누르면 이모지 복사 및 리액션 메뉴에 접근할 수 있음 - Fix: 모바일 환경에서 노트 작성 폼의 미리보기 디자인이 잘못 표시될 수 있음 - Fix: 리버시에서 커스텀 이모지를 리액션으로 보낼 수 없음 +- Fix: 특정 조건에서 노트 동작 버튼을 비활성화 해도 버튼이 사라지지 않음 + - 노트에 답글을 작성할 수 없을 때 + - 노트를 리노트할 수 없을 때 --- diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index e298553ccf..46aaeaa7a8 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -149,28 +149,32 @@ SPDX-License-Identifier: AGPL-3.0-only
- - - - + + diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index 1dbb33ca04..53321c5a69 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -164,28 +164,32 @@ SPDX-License-Identifier: AGPL-3.0-only
- - - - + + diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue index 0441ddbab0..c851621fe2 100644 --- a/packages/frontend/src/components/MkSubNoteContent.vue +++ b/packages/frontend/src/components/MkSubNoteContent.vue @@ -74,28 +74,32 @@ SPDX-License-Identifier: AGPL-3.0-only