From cd95a6e9c9ec0661892d824f520a48416e96adef Mon Sep 17 00:00:00 2001 From: anatawa12 Date: Thu, 18 Jul 2024 14:23:47 +0900 Subject: [PATCH 01/11] fix: remove unreleased section (#14246) --- CHANGELOG.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d4ef23d27..9f78ba677d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,3 @@ -## Unreleased - -### General -- - -### Client -- - -### Server -- - - ## 2024.5.0 ### Note From c8626912a0983a3e1e0ce9db02b0cf7ad03269f6 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Sat, 27 Jul 2024 15:41:30 +0900 Subject: [PATCH 02/11] =?UTF-8?q?fix(frontend):=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EB=B8=94=EB=A1=9D=EC=9D=98=20=ED=95=98=EC=9D=B4=EB=9D=BC?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8=EA=B0=80=20=EC=8B=A4=EC=A0=9C=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=EC=99=80=20=EB=8B=A4=EB=A5=B4=EA=B2=8C=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=EB=90=A0=20=EC=88=98=20=EC=9E=88=EC=9D=8C=20(kokonect?= =?UTF-8?q?-link/cherrypick#475)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_CHERRYPICK.md | 1 + packages/frontend/src/components/MkCode.core.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index 3b74d5985c..dcd1eee0c4 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -33,6 +33,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE - Fix: 타임라인 노트의 리액션 뷰어에 리모트 서버의 커스텀 이모지가 표시되지 않음 - Fix: '리노트 공개 범위 지정' 옵션이 `없음`으로 설정된 경우 리노트를 할 수 없음 - Fix: 아바타 장식을 설정할 때 설정 팝업이 두 번 표시될 수 있음 +- Fix: 코드 블록의 하이라이트가 실제 위치와 다르게 표시될 수 있음 (kokonect-link/cherrypick#475) ### Server - Feat: 리모트 유저의 아바타 장식을 여러 개 불러올 수 있음([yunochi/misskey@696787b3](https://github.com/yunochi/misskey/commit/696787b38bac31e7586899a5a59611a6fe50b9a1), [yunochi/misskey@4a5fcfe4](https://github.com/yunochi/misskey/commit/4a5fcfe43880f08380541caa6b7593b90306d103)) diff --git a/packages/frontend/src/components/MkCode.core.vue b/packages/frontend/src/components/MkCode.core.vue index 171df8c8d1..52d3374ece 100644 --- a/packages/frontend/src/components/MkCode.core.vue +++ b/packages/frontend/src/components/MkCode.core.vue @@ -90,7 +90,7 @@ watch(() => props.lang, (to) => { & pre, & code { - font-family: "JetBrains Mono", "Pretendard JP", Pretendard, Consolas, Monaco, "Andale Mono", "Ubuntu Mono", monospace; + font-family: Consolas, Monaco, "Andale Mono", "Ubuntu Mono", monospace; } } From 745e00666e8814f01a9c8f61bd57c406024a6b58 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Sat, 27 Jul 2024 15:49:12 +0900 Subject: [PATCH 03/11] 4.9.0 --- CHANGELOG_CHERRYPICK.md | 8 ++++---- package.json | 2 +- packages/cherrypick-js/package.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index dcd1eee0c4..424e23f1ea 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -23,10 +23,10 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE # 릴리즈 노트 이 문서는 CherryPick의 변경 사항만 포함합니다. -## 4.x.x -출시일: unreleased
-기반 Misskey 버전: 2024.x.x
-Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGELOG.md#2024xx) 문서를 참고하십시오. +## 4.9.0 +출시일: 2024/7/27
+기반 Misskey 버전: 2024.5.0
+Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#202450](CHANGELOG.md#202450) 문서를 참고하십시오. ### Client - Enhance: 노트 작성 폼에서 '공개 범위 기억하기' 설정을 변경할 수 있음 diff --git a/package.json b/package.json index 69ef7b0303..bb6c2ce1c7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cherrypick", - "version": "4.9.0-beta.2", + "version": "4.9.0", "basedMisskeyVersion": "2024.5.0", "codename": "nasubi", "repository": { diff --git a/packages/cherrypick-js/package.json b/packages/cherrypick-js/package.json index 5c0c9d9677..fc3d1efcb7 100644 --- a/packages/cherrypick-js/package.json +++ b/packages/cherrypick-js/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "cherrypick-js", - "version": "4.9.0-beta.2", + "version": "4.9.0", "basedMisskeyVersion": "2024.5.0", "description": "CherryPick SDK for JavaScript", "license": "MIT", From 1dc0d259488ef62c20fe3e201b76a0337b57f0df Mon Sep 17 00:00:00 2001 From: kozakura913 <98575220+kozakura913@users.noreply.github.com> Date: Sat, 27 Jul 2024 18:42:23 +0900 Subject: [PATCH 04/11] =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E3=81=BF=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4=20(#235)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_yojo.md | 2 +- .../src/server/api/endpoints/notes/create.ts | 12 +--- packages/cherrypick-js/src/autogen/types.ts | 2 - .../frontend/src/components/MkPostForm.vue | 72 +------------------ .../src/components/MkPostFormDialog.vue | 2 - .../src/components/MkPostFormSimple.vue | 68 +----------------- .../src/components/MkVisibilityPicker.vue | 3 +- 7 files changed, 6 insertions(+), 155 deletions(-) diff --git a/CHANGELOG_yojo.md b/CHANGELOG_yojo.md index b0fdb9407c..bf6703e571 100644 --- a/CHANGELOG_yojo.md +++ b/CHANGELOG_yojo.md @@ -21,7 +21,7 @@ ### Release Date ### General -- +- 連合過激派によってローカルのみ投稿機能は削除されました ### Client - diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts index fe5dfbd1e2..662aa4580a 100644 --- a/packages/backend/src/server/api/endpoints/notes/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/create.ts @@ -143,7 +143,6 @@ export const paramDef = { type: 'string', format: 'misskey:id', } }, cw: { type: 'string', nullable: true, minLength: 1, maxLength: 100 }, - localOnly: { type: 'boolean', default: false }, reactionAcceptance: { type: 'string', nullable: true, enum: [null, 'likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote'], default: null }, disableRightClick: { type: 'boolean', default: false }, noExtractMentions: { type: 'boolean', default: false }, @@ -364,14 +363,7 @@ export default class extends Endpoint { // eslint- } } - let channel: MiChannel | null = null; - if (ps.channelId != null) { - channel = await this.channelsRepository.findOneBy({ id: ps.channelId, isArchived: false }); - - if (channel == null) { - throw new ApiError(meta.errors.noSuchChannel); - } - } + const channel: MiChannel | null = null; // 投稿を作成 try { @@ -393,7 +385,7 @@ export default class extends Endpoint { // eslint- metadata: ps.event.metadata ?? {}, } : undefined, cw: ps.cw, - localOnly: ps.localOnly, + localOnly: false, reactionAcceptance: ps.reactionAcceptance, disableRightClick: ps.disableRightClick, visibility: ps.visibility, diff --git a/packages/cherrypick-js/src/autogen/types.ts b/packages/cherrypick-js/src/autogen/types.ts index 08aec978fc..05c02895b5 100644 --- a/packages/cherrypick-js/src/autogen/types.ts +++ b/packages/cherrypick-js/src/autogen/types.ts @@ -21727,8 +21727,6 @@ export type operations = { visibility?: 'public' | 'home' | 'followers' | 'specified'; visibleUserIds?: string[]; cw?: string | null; - /** @default false */ - localOnly?: boolean; /** * @default null * @enum {string|null} diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index 406572fb10..1bdc94c364 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -32,10 +32,6 @@ SPDX-License-Identifier: AGPL-3.0-only {{ channel.name }} - - - +
- {{ appearNote.channel.name }} -
@@ -21,7 +22,7 @@ SPDX-License-Identifier: AGPL-3.0-only -
+

{{ i18n.ts._disabledTimeline.title }} @@ -120,23 +121,23 @@ const choose = async (ev) => { text: i18n.ts._timelines.home, icon: 'ti ti-home', action: () => { setSrc('home'); }, - }, { + }, isLocalTimelineAvailable ? { text: i18n.ts._timelines.local, icon: 'ti ti-planet', action: () => { setSrc('local'); }, - }, { - text: i18n.ts._timelines.media, - icon: 'ti ti-photo', - action: () => { setSrc('media'); }, - }, { + } : undefined, isLocalTimelineAvailable ? { text: i18n.ts._timelines.social, icon: 'ti ti-universe', action: () => { setSrc('social'); }, - }, { + } : undefined, isGlobalTimelineAvailable ? { text: i18n.ts._timelines.global, icon: 'ti ti-world', action: () => { setSrc('global'); }, - }, antennaItems.length > 0 ? { type: 'divider' } : undefined, ...antennaItems, listItems.length > 0 ? { type: 'divider' } : undefined, ...listItems], ev.currentTarget ?? ev.target).then(() => { + } : undefined, isGlobalTimelineAvailable ? { + text: i18n.ts._timelines.media, + icon: 'ti ti-photo', + action: () => { setSrc('media'); }, + } : undefined, antennaItems.length > 0 ? { type: 'divider' } : undefined, ...antennaItems, listItems.length > 0 ? { type: 'divider' } : undefined, ...listItems], ev.currentTarget ?? ev.target).then(() => { menuOpened.value = false; }); }; From 03e55890f6f65347e46b65a7d44b92c23497a982 Mon Sep 17 00:00:00 2001 From: kozakura913 <98575220+kozakura913@users.noreply.github.com> Date: Sun, 28 Jul 2024 14:03:11 +0900 Subject: [PATCH 09/11] =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=88=E6=99=82=E3=81=AB=E7=B7=A8?= =?UTF-8?q?=E9=9B=86=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=82=92?= =?UTF-8?q?=E5=87=BA=E3=81=99=20(#243)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_yojo.md | 2 ++ .../src/components/global/MkCustomEmoji.vue | 11 ++++++--- .../src/pages/custom-emojis-manager.vue | 7 ++++-- packages/frontend/src/scripts/import-emoji.ts | 24 +++++++++++++++++++ 4 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 packages/frontend/src/scripts/import-emoji.ts diff --git a/CHANGELOG_yojo.md b/CHANGELOG_yojo.md index b3e43f6f9c..c43db98116 100644 --- a/CHANGELOG_yojo.md +++ b/CHANGELOG_yojo.md @@ -28,7 +28,9 @@ Cherrypick 4.9.0 - Fix: 引用とCWを併用した場合にタイムラインと詳細で表示が異なる不具合を修正 [#231](https://github.com/yojo-art/cherrypick/issues/231) - Feat: サイコロウィジェット (Cherry-picked from https://github.com/1673beta/cherrypick/pull/73) +- Enhance: 絵文字のインポート時にリモートから取得した値で埋めた編集ダイアログを表示する - Fix: メディアタイムラインの可視性を変更できない問題を修正 [#54](https://github.com/yojo-art/cherrypick/issues/54) + ### Server - diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue index d1df0b7ed7..765cefddb2 100644 --- a/packages/frontend/src/components/global/MkCustomEmoji.vue +++ b/packages/frontend/src/components/global/MkCustomEmoji.vue @@ -29,7 +29,7 @@ SPDX-License-Identifier: AGPL-3.0-only