From 845713bdbf48388eabc3e678d1dc555867f9912a Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 22 Oct 2023 09:28:59 +0900 Subject: [PATCH 1/5] Update about-misskey.vue --- packages/frontend/src/pages/about-misskey.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue index 6314f9f5d2..c443cdeb76 100644 --- a/packages/frontend/src/pages/about-misskey.vue +++ b/packages/frontend/src/pages/about-misskey.vue @@ -294,6 +294,7 @@ const patrons = [ '美少女JKぐーちゃん', 'てば', 'たっくん', + 'SHO SEKIGUCHI', ]; let thereIsTreasure = $ref($i && !claimedAchievements.includes('foundTreasure')); From fd8d253e1efbe027da9e41e0c4d9958a3f35518a Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 22 Oct 2023 09:43:55 +0900 Subject: [PATCH 2/5] :art: --- packages/frontend/src/pages/settings/profile.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue index c44a58d04a..f3d0c12dce 100644 --- a/packages/frontend/src/pages/settings/profile.vue +++ b/packages/frontend/src/pages/settings/profile.vue @@ -94,7 +94,7 @@ SPDX-License-Identifier: AGPL-3.0-only :class="[$style.avatarDecoration, { [$style.avatarDecorationActive]: $i.avatarDecorations.some(x => x.id === avatarDecoration.id) }]" @click="toggleDecoration(avatarDecoration)" > -
{{ avatarDecoration.name }}
+
{{ avatarDecoration.name }}
@@ -377,13 +377,17 @@ definePageMetadata({ .avatarDecoration { cursor: pointer; - padding: 16px 16px 24px 16px; + padding: 16px 16px 28px 16px; border: solid 2px var(--divider); border-radius: 8px; text-align: center; + font-size: 90%; + overflow: clip; + contain: content; } .avatarDecorationActive { + background-color: var(--accentedBg); border-color: var(--accent); } @@ -391,6 +395,6 @@ definePageMetadata({ position: relative; z-index: 10; font-weight: bold; - margin-bottom: 16px; + margin-bottom: 20px; } From 72327716ca34dd28e515ebbc281fc4808d2291f1 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 22 Oct 2023 10:40:53 +0900 Subject: [PATCH 3/5] =?UTF-8?q?fix(backend):=20=E3=83=AA=E3=82=B9=E3=83=88?= =?UTF-8?q?TL=E3=81=AB=E8=87=AA=E5=88=86=E3=81=AE=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=AD=E3=83=AF=E3=83=BC=E9=99=90=E5=AE=9A=E6=8A=95=E7=A8=BF?= =?UTF-8?q?=E3=81=8C=E5=90=AB=E3=81=BE=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F?= =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #12110 --- CHANGELOG.md | 4 ++-- packages/backend/src/core/NoteCreateService.ts | 2 +- packages/backend/test/e2e/timelines.ts | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2613e6682c..d6db941cdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ --> -## 2023.x.x (unreleased) +## 2023.11.0 (unreleased) ### General - @@ -23,7 +23,7 @@ https://misskey-hub.net/docs/advanced/publish-on-your-website.html ### Server -- +- Fix: リストTLに自分のフォロワー限定投稿が含まれない問題を修正 ## 2023.10.2 diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts index 364a300d23..fae512336d 100644 --- a/packages/backend/src/core/NoteCreateService.ts +++ b/packages/backend/src/core/NoteCreateService.ts @@ -868,7 +868,7 @@ export class NoteCreateService implements OnApplicationShutdown { if (note.visibility === 'followers') { // TODO: 重そうだから何とかしたい Set 使う？ - userListMemberships = userListMemberships.filter(x => followings.some(f => f.followerId === x.userListUserId)); + userListMemberships = userListMemberships.filter(x => x.userListUserId === user.id || followings.some(f => f.followerId === x.userListUserId)); } // TODO: あまりにも数が多いと redisPipeline.exec に失敗する(理由は不明)ため、3万件程度を目安に分割して実行するようにする diff --git a/packages/backend/test/e2e/timelines.ts b/packages/backend/test/e2e/timelines.ts index 28f07bf3f7..974d2f6820 100644 --- a/packages/backend/test/e2e/timelines.ts +++ b/packages/backend/test/e2e/timelines.ts @@ -947,6 +947,22 @@ describe('Timelines', () => { assert.strictEqual(res.body.find((note: any) => note.id === bobNote.id).text, 'hi'); }); + test.concurrent('リスインしている自分の visibility: followers なノートが含まれる', async () => { + const [alice] = await Promise.all([signup(), signup()]); + + const list = await api('/users/lists/create', { name: 'list' }, alice).then(res => res.body); + await api('/users/lists/push', { listId: list.id, userId: alice.id }, alice); + await sleep(1000); + const aliceNote = await post(alice, { text: 'hi', visibility: 'followers' }); + + await waitForPushToTl(); + + const res = await api('/notes/user-list-timeline', { listId: list.id }, alice); + + assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true); + assert.strictEqual(res.body.find((note: any) => note.id === aliceNote.id).text, 'hi'); + }); + test.concurrent('リスインしているユーザーのチャンネルノートが含まれない', async () => { const [alice, bob] = await Promise.all([signup(), signup()]); From 69795e74bf4255e74985b01b30f83103f18f88b1 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 22 Oct 2023 10:42:08 +0900 Subject: [PATCH 4/5] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6db941cdb..5d623609ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,8 @@ ## 2023.11.0 (unreleased) ### General -- +- Feat: アイコンデコレーション機能 +- Enhance: すでにフォローしたすべての人の返信をTLに追加できるように ## Client - Feat: プラグイン・テーマを外部サイトから直接インストールできるようになりました @@ -35,7 +36,6 @@ - Enhance: フォロー/フォロー解除したときに過去分のHTLにも含まれる投稿が反映されるように - Enhance: ローカリゼーションの更新 - Enhance: 依存関係の更新 -- Enhance: すでにフォローしたすべての人の返信をTLに追加できるように ### Client - Enhance: TLの返信表示オプションを記憶するように From 4b295088fd6b4bead05087537415b10419eee78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Sun, 22 Oct 2023 10:52:06 +0900 Subject: [PATCH 5/5] Update schemas.ts (#12103) --- packages/backend/src/server/api/openapi/schemas.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/server/api/openapi/schemas.ts b/packages/backend/src/server/api/openapi/schemas.ts index 0b9eb4fe24..1a1d973e56 100644 --- a/packages/backend/src/server/api/openapi/schemas.ts +++ b/packages/backend/src/server/api/openapi/schemas.ts @@ -26,7 +26,12 @@ export function convertSchemaToOpenApiSchema(schema: Schema) { if (schema.allOf) res.allOf = schema.allOf.map(convertSchemaToOpenApiSchema); if (schema.ref) { - res.$ref = `#/components/schemas/${schema.ref}`; + const $ref = `#/components/schemas/${schema.ref}`; + if (schema.nullable || schema.optional) { + res.allOf = [{ $ref }]; + } else { + res.$ref = $ref; + } } return res;