From c0de57c08d5dfe39f7326474287f84dc38e8053d Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Sat, 17 Aug 2024 17:52:06 +0900 Subject: [PATCH 01/11] Update about-misskey.vue --- packages/frontend/src/pages/about-misskey.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue index 9b5b4a5000..bf541b6a8a 100644 --- a/packages/frontend/src/pages/about-misskey.vue +++ b/packages/frontend/src/pages/about-misskey.vue @@ -267,6 +267,9 @@ const patronsWithIcon = [{ }, { name: 'Macop', icon: 'https://assets.misskey-hub.net/patrons/ee052bf550014d36a643ce3dce595640.jpg', +}, { + name: 'なっかあ', + icon: 'https://assets.misskey-hub.net/patrons/c2f5f3e394e74a64912284a2f4ca710e.jpg', }]; const patrons = [ From 4e0d57000cd97991e286b27cb4dd1c14aeb2faab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?= <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Sat, 17 Aug 2024 18:04:52 +0900 Subject: [PATCH 02/11] =?UTF-8?q?fix(frontend):=20=E4=BB=A5=E5=89=8D?= =?UTF-8?q?=E3=81=AEpopup=E3=81=AE=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=97?= =?UTF-8?q?=E6=96=B9=E3=82=92=E4=BF=AE=E6=AD=A3=20(#14421)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/pages/flash/flash.vue | 6 ++++-- packages/frontend/src/pages/gallery/post.vue | 6 ++++-- packages/frontend/src/pages/page.vue | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/frontend/src/pages/flash/flash.vue b/packages/frontend/src/pages/flash/flash.vue index 7b7f8bb5f2..a6a99ba633 100644 --- a/packages/frontend/src/pages/flash/flash.vue +++ b/packages/frontend/src/pages/flash/flash.vue @@ -236,10 +236,12 @@ function reportAbuse() { const pageUrl = `${url}/play/${flash.value.id}`; - os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), { + const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), { user: flash.value.user, initialComment: `Play: ${pageUrl}\n-----\n`, - }, {}, 'closed'); + }, { + closed: () => dispose(), + }); } function showMenu(ev: MouseEvent) { diff --git a/packages/frontend/src/pages/gallery/post.vue b/packages/frontend/src/pages/gallery/post.vue index f7f6251702..5a9c978dab 100644 --- a/packages/frontend/src/pages/gallery/post.vue +++ b/packages/frontend/src/pages/gallery/post.vue @@ -160,10 +160,12 @@ function reportAbuse() { const pageUrl = `${url}/gallery/${post.value.id}`; - os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), { + const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), { user: post.value.user, initialComment: `Post: ${pageUrl}\n-----\n`, - }, {}, 'closed'); + }, { + closed: () => dispose(), + }); } function showMenu(ev: MouseEvent) { diff --git a/packages/frontend/src/pages/page.vue b/packages/frontend/src/pages/page.vue index 40d76f86ed..cb1ce9b918 100644 --- a/packages/frontend/src/pages/page.vue +++ b/packages/frontend/src/pages/page.vue @@ -245,10 +245,12 @@ function reportAbuse() { const pageUrl = `${url}/@${props.username}/pages/${props.pageName}`; - os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), { + const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), { user: page.value.user, initialComment: `Page: ${pageUrl}\n-----\n`, - }, {}, 'closed'); + }, { + closed: () => dispose(), + }); } function showMenu(ev: MouseEvent) { From 0b985543192d72f6c371037196ff2a1c929c1d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?= <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Sat, 17 Aug 2024 18:05:29 +0900 Subject: [PATCH 03/11] Update CHANGELOG.md Co-authored-by: taichan <40626578+tai-cha@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0de0d40877..c3d6dcf535 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ - Fix: 特定の条件下でノートの削除ボタンが出ないのを修正 ### Server -- enhance: 照会時にURLがhtmlかつheadタグ内に`rel="alternate"`, `type="application/activity+json"`の`link`タグがある場合に追ってリンク先を照会できるように +- Enhance: 照会時にURLがhtmlかつheadタグ内に`rel="alternate"`, `type="application/activity+json"`の`link`タグがある場合に追ってリンク先を照会できるように - Enhance: 凍結されたアカウントのフォローリクエストを表示しないように - Fix: WSの`readAllNotifications` メッセージが `body` を持たない場合に動作しない問題 #14374 - 通知ページや通知カラム(デッキ)を開いている状態において、新たに発生した通知が既読されない問題が修正されます。 From 83c04c55add7280ff3f65816c75f08d17964c53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?= <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Sat, 17 Aug 2024 18:15:46 +0900 Subject: [PATCH 04/11] fix(misskey-js): eliminate any (follow-up of #13523) (#14422) --- packages/misskey-js/src/consts.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/misskey-js/src/consts.ts b/packages/misskey-js/src/consts.ts index 0972f0dd37..b4fbcffa97 100644 --- a/packages/misskey-js/src/consts.ts +++ b/packages/misskey-js/src/consts.ts @@ -4,9 +4,12 @@ import type { Ad, Announcement, EmojiDetailed, + Flash, + GalleryPost, InviteCode, MetaDetailed, Note, + Page, Role, ReversiGameDetailed, SystemWebhook, @@ -405,18 +408,18 @@ export type ModerationLogPayloads = { pageId: string; pageUserId: string; pageUserUsername: string; - page: any; + page: Page; }; deleteFlash: { flashId: string; flashUserId: string; flashUserUsername: string; - flash: any; + flash: Flash; }; deleteGalleryPost: { postId: string; postUserId: string; postUserUsername: string; - post: any; + post: GalleryPost; }; }; From 129af061989f535ab4c79f497ba55cc5f6bf0385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?= <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Sat, 17 Aug 2024 18:25:46 +0900 Subject: [PATCH 05/11] Update packages/backend/src/core/activitypub/ApRequestService.ts --- packages/backend/src/core/activitypub/ApRequestService.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts index 69b09ba808..3d1bd44648 100644 --- a/packages/backend/src/core/activitypub/ApRequestService.ts +++ b/packages/backend/src/core/activitypub/ApRequestService.ts @@ -203,7 +203,9 @@ export class ApRequestService { }); //#region リクエスト先がhtmlかつactivity+jsonへのalternate linkタグがあるとき - if (res.headers.get('Content-type')?.startsWith('text/html;') && _followAlternate === true) { + const contentType = res.headers.get('content-type'); + + if ((contentType === 'text/html' || contentType?.startsWith('text/html;')) && _followAlternate === true) { const html = await res.text(); const window = new Window(); const document = window.document; From bf8c42eecd3d645652ddd7e69b727ced2a15457d Mon Sep 17 00:00:00 2001 From: taichan <40626578+tai-cha@users.noreply.github.com> Date: Sat, 17 Aug 2024 19:51:56 +0900 Subject: [PATCH 06/11] Fix(beckend): html content-type detection on signedGet (#14424) * fix(backend): contenttype detection of html in signedGet * code style * fix by review --- packages/backend/src/core/activitypub/ApRequestService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts index 3d1bd44648..7cf8359212 100644 --- a/packages/backend/src/core/activitypub/ApRequestService.ts +++ b/packages/backend/src/core/activitypub/ApRequestService.ts @@ -204,8 +204,8 @@ export class ApRequestService { //#region リクエスト先がhtmlかつactivity+jsonへのalternate linkタグがあるとき const contentType = res.headers.get('content-type'); - - if ((contentType === 'text/html' || contentType?.startsWith('text/html;')) && _followAlternate === true) { + + if ((contentType ?? '').split(';')[0].trimEnd().toLowerCase() === 'text/html' && _followAlternate === true) { const html = await res.text(); const window = new Window(); const document = window.document; From e790aa0548dc981e7304a63994eebcb46d3f3e67 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Sat, 17 Aug 2024 20:25:15 +0900 Subject: [PATCH 07/11] [skip ci] New Crowdin updates (#14423) * New translations ja-jp.yml (English) * New translations ja-jp.yml (Chinese Simplified) --- locales/en-US.yml | 1 + locales/zh-CN.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/locales/en-US.yml b/locales/en-US.yml index 32356ab4e5..a02d7fa804 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -2499,6 +2499,7 @@ _moderationLogTypes: createAbuseReportNotificationRecipient: "Create a recipient for abuse reports" updateAbuseReportNotificationRecipient: "Update recipients for abuse reports" deleteAbuseReportNotificationRecipient: "Delete a recipient for abuse reports" + deleteFlash: "Delete Play" _fileViewer: title: "File details" type: "File type" diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index 7b68a5cfdb..f55d65e343 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -2499,6 +2499,8 @@ _moderationLogTypes: createAbuseReportNotificationRecipient: "新建了举报通知" updateAbuseReportNotificationRecipient: "更新了举报通知" deleteAbuseReportNotificationRecipient: "删除了举报通知" + deletePage: "删除了页面" + deleteFlash: "删除了 Play" _fileViewer: title: "文件信息" type: "文件类型" From ba9c5c37b83e7bf6b600aa7b7d754d8405920751 Mon Sep 17 00:00:00 2001 From: woxtu Date: Sun, 18 Aug 2024 03:40:21 +0900 Subject: [PATCH 08/11] Remove undefined style (#14427) --- packages/frontend/src/components/MkPreview.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/components/MkPreview.vue b/packages/frontend/src/components/MkPreview.vue index d950d66c6e..649dee2fdb 100644 --- a/packages/frontend/src/components/MkPreview.vue +++ b/packages/frontend/src/components/MkPreview.vue @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only