From 7e15f7191631a2f50fabae940a8affe808793aca Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Tue, 24 Oct 2023 14:02:06 +0900
Subject: [PATCH 1/2] ci: fix pullreq number may not get correctly (#12127)
* Revert "remove save-pr-number"
This reverts commit 085f4bd76992fa0b3e4219a5c132b72f68c3d2cc.
* Revert "Update report-api-diff.yml"
This reverts commit b73daf4c0ec4240ea39b183a6b93f209b63e6d81.
* Revert "Update report-api-diff.yml"
This reverts commit cbf2b5ad8a7cba769446fa9bcf1f129c6f03db8c.
* Revert "try to get pull request id from github.event.workflow_run.pull_requests"
This reverts commit 07517ce501c12e75da03d325c23968d75ac37d00.
---
.github/workflows/get-api-diff.yml | 13 +++++++++++++
.github/workflows/report-api-diff.yml | 9 +--------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/get-api-diff.yml b/.github/workflows/get-api-diff.yml
index 6454de080c..eeb2fa0855 100644
--- a/.github/workflows/get-api-diff.yml
+++ b/.github/workflows/get-api-diff.yml
@@ -171,3 +171,16 @@ jobs:
path: api-head.json
- name: Kill Misskey Job
run: screen -S misskey -X quit
+
+ save-pr-number:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Save PR number
+ env:
+ PR_NUMBER: ${{ github.event.number }}
+ run: |
+ echo "$PR_NUMBER" > ./pr_number
+ - uses: actions/upload-artifact@v3
+ with:
+ name: api-artifact
+ path: pr_number
diff --git a/.github/workflows/report-api-diff.yml b/.github/workflows/report-api-diff.yml
index 9e7f47f923..55d13100fb 100644
--- a/.github/workflows/report-api-diff.yml
+++ b/.github/workflows/report-api-diff.yml
@@ -39,14 +39,7 @@ jobs:
run: unzip api-artifact.zip -d artifacts
- name: Load PR Number
id: load-pr-num
- env:
- PULL_REQUESTS: ${{ toJson(github.event.workflow_run.pull_requests.*) }}
- REPO_ID: ${{ github.repository_id }}
- run: |
- # find first pull requests that targets this repository
- PR_NUMBER="$(echo "$PULL_REQUESTS" \
- | jq --arg REPO_ID "$REPO_ID" '[.[] | select ($REPO_ID == (.base.repo.id | tostring)) | .number ][0]')"
- echo "pr-number=$PR_NUMBER" >> "$GITHUB_OUTPUT"
+ run: echo "pr-number=$(cat artifacts/pr_number)" >> "$GITHUB_OUTPUT"
- name: Output base
run: cat ./artifacts/api-base.json
From 0c730968a363482a36f20ddec0a77eef1fd8639e Mon Sep 17 00:00:00 2001
From: yukineko <27853966+hideki0403@users.noreply.github.com>
Date: Tue, 24 Oct 2023 14:34:32 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20Redis=E3=81=B8=E3=81=AETL=E3=82=AD?=
=?UTF-8?q?=E3=83=A3=E3=83=83=E3=82=B7=E3=83=A5=E3=81=8C=E6=9C=89=E5=8A=B9?=
=?UTF-8?q?=E3=81=AE=E5=A0=B4=E5=90=88=E3=81=ABHTL/LTL/STL/=E3=83=AA?=
=?UTF-8?q?=E3=82=B9=E3=83=88=E3=81=8C=E7=A9=BA=E3=81=AB=E3=81=AA=E3=82=8B?=
=?UTF-8?q?=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B=E5=95=8F=E9=A1=8C?=
=?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20(#12088)=20(#12124)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix: RedisTimelineが有効の場合にHTLがリセットされた状態になる問題を修正
* add: CHANGELOG.md
* fix: LTL, STLでもTLが空になることがある問題を修正
* update: CHANGELOG.md
* fix: DBへのフォールバック時にwithRenotesが考慮されていないのを修正
* feat: リストにもDBフォールバックを実装
* fix: リストのDBフォールバック時の挙動を修正
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
CHANGELOG.md | 1 +
.../api/endpoints/notes/hybrid-timeline.ts | 14 +-
.../api/endpoints/notes/local-timeline.ts | 14 +-
.../server/api/endpoints/notes/timeline.ts | 24 ++-
.../api/endpoints/notes/user-list-timeline.ts | 150 ++++++++++++++----
5 files changed, 154 insertions(+), 49 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc89995cf7..0f875b4b70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
- Fix: リストTLに自分のフォロワー限定投稿が含まれない問題を修正
- Fix: ローカルタイムラインに投稿者自身の投稿への返信が含まれない問題を修正
- Fix: 自分のフォローしているユーザーの自分のフォローしていないユーザーの visibility: followers な投稿への返信がストリーミングで流れてくる問題を修正
+- Fix: RedisへのTLキャッシュが有効の場合にHTL/LTL/STLが空になることがある問題を修正
## 2023.10.2
diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
index 518c34b949..7d0c9f1185 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -131,6 +131,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
shouldFallbackToDb = shouldFallbackToDb || (noteIds.length === 0);
+ let redisTimeline: MiNote[] = [];
+
if (!shouldFallbackToDb) {
const query = this.notesRepository.createQueryBuilder('note')
.where('note.id IN (:...noteIds)', { noteIds: noteIds })
@@ -141,9 +143,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
.leftJoinAndSelect('renote.user', 'renoteUser')
.leftJoinAndSelect('note.channel', 'channel');
- let timeline = await query.getMany();
+ redisTimeline = await query.getMany();
- timeline = timeline.filter(note => {
+ redisTimeline = redisTimeline.filter(note => {
if (note.userId === me.id) {
return true;
}
@@ -159,15 +161,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
return true;
});
- // TODO: フィルタした結果件数が足りなかった場合の対応
-
- timeline.sort((a, b) => a.id > b.id ? -1 : 1);
+ redisTimeline.sort((a, b) => a.id > b.id ? -1 : 1);
+ }
+ if (redisTimeline.length > 0) {
process.nextTick(() => {
this.activeUsersChart.read(me);
});
- return await this.noteEntityService.packMany(timeline, me);
+ return await this.noteEntityService.packMany(redisTimeline, me);
} else { // fallback to db
return await this.getFromDb({
untilId,
diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
index 879f71a2f6..94a640e70a 100644
--- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
@@ -110,6 +110,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
noteIds = noteIds.slice(0, ps.limit);
+ let redisTimeline: MiNote[] = [];
+
if (noteIds.length > 0) {
const query = this.notesRepository.createQueryBuilder('note')
.where('note.id IN (:...noteIds)', { noteIds: noteIds })
@@ -120,9 +122,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
.leftJoinAndSelect('renote.user', 'renoteUser')
.leftJoinAndSelect('note.channel', 'channel');
- let timeline = await query.getMany();
+ redisTimeline = await query.getMany();
- timeline = timeline.filter(note => {
+ redisTimeline = redisTimeline.filter(note => {
if (me && (note.userId === me.id)) {
return true;
}
@@ -139,17 +141,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
return true;
});
- // TODO: フィルタした結果件数が足りなかった場合の対応
-
- timeline.sort((a, b) => a.id > b.id ? -1 : 1);
+ redisTimeline.sort((a, b) => a.id > b.id ? -1 : 1);
+ }
+ if (redisTimeline.length > 0) {
process.nextTick(() => {
if (me) {
this.activeUsersChart.read(me);
}
});
- return await this.noteEntityService.packMany(timeline, me);
+ return await this.noteEntityService.packMany(redisTimeline, me);
} else { // fallback to db
return await this.getFromDb({
untilId,
diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts
index c435fa7ec9..ac88c1f82b 100644
--- a/packages/backend/src/server/api/endpoints/notes/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts
@@ -5,7 +5,7 @@
import { Brackets } from 'typeorm';
import { Inject, Injectable } from '@nestjs/common';
-import type { NotesRepository } from '@/models/_.js';
+import type { MiNote, NotesRepository } from '@/models/_.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { QueryService } from '@/core/QueryService.js';
import ActiveUsersChart from '@/core/chart/charts/active-users.js';
@@ -89,6 +89,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
let noteIds = await this.funoutTimelineService.get(ps.withFiles ? `homeTimelineWithFiles:${me.id}` : `homeTimeline:${me.id}`, untilId, sinceId);
noteIds = noteIds.slice(0, ps.limit);
+ let redisTimeline: MiNote[] = [];
+
if (noteIds.length > 0) {
const query = this.notesRepository.createQueryBuilder('note')
.where('note.id IN (:...noteIds)', { noteIds: noteIds })
@@ -99,9 +101,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
.leftJoinAndSelect('renote.user', 'renoteUser')
.leftJoinAndSelect('note.channel', 'channel');
- let timeline = await query.getMany();
+ redisTimeline = await query.getMany();
- timeline = timeline.filter(note => {
+ redisTimeline = redisTimeline.filter(note => {
if (note.userId === me.id) {
return true;
}
@@ -120,15 +122,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
return true;
});
- // TODO: フィルタした結果件数が足りなかった場合の対応
-
- timeline.sort((a, b) => a.id > b.id ? -1 : 1);
+ redisTimeline.sort((a, b) => a.id > b.id ? -1 : 1);
+ }
+ if (redisTimeline.length > 0) {
process.nextTick(() => {
this.activeUsersChart.read(me);
});
- return await this.noteEntityService.packMany(timeline, me);
+ return await this.noteEntityService.packMany(redisTimeline, me);
} else { // fallback to db
return await this.getFromDb({
untilId,
@@ -138,6 +140,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
includeRenotedMyNotes: ps.includeRenotedMyNotes,
includeLocalRenotes: ps.includeLocalRenotes,
withFiles: ps.withFiles,
+ withRenotes: ps.withRenotes,
}, me);
}
} else {
@@ -149,12 +152,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
includeRenotedMyNotes: ps.includeRenotedMyNotes,
includeLocalRenotes: ps.includeLocalRenotes,
withFiles: ps.withFiles,
+ withRenotes: ps.withRenotes,
}, me);
}
});
}
- private async getFromDb(ps: { untilId: string | null; sinceId: string | null; limit: number; includeMyRenotes: boolean; includeRenotedMyNotes: boolean; includeLocalRenotes: boolean; withFiles: boolean; }, me: MiLocalUser) {
+ private async getFromDb(ps: { untilId: string | null; sinceId: string | null; limit: number; includeMyRenotes: boolean; includeRenotedMyNotes: boolean; includeLocalRenotes: boolean; withFiles: boolean; withRenotes: boolean; }, me: MiLocalUser) {
const followees = await this.userFollowingService.getFollowees(me.id);
//#region Construct query
@@ -222,6 +226,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
if (ps.withFiles) {
query.andWhere('note.fileIds != \'{}\'');
}
+
+ if (ps.withRenotes === false) {
+ query.andWhere('note.renoteId IS NULL');
+ }
//#endregion
const timeline = await query.limit(ps.limit).getMany();
diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
index 96e1e94f7c..9ead1410c2 100644
--- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
@@ -4,7 +4,7 @@
*/
import { Inject, Injectable } from '@nestjs/common';
-import type { NotesRepository, UserListsRepository } from '@/models/_.js';
+import type { MiNote, NotesRepository, UserListMembershipsRepository, UserListsRepository } from '@/models/_.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
import ActiveUsersChart from '@/core/chart/charts/active-users.js';
@@ -13,7 +13,9 @@ import { CacheService } from '@/core/CacheService.js';
import { IdService } from '@/core/IdService.js';
import { isUserRelated } from '@/misc/is-user-related.js';
import { FunoutTimelineService } from '@/core/FunoutTimelineService.js';
+import { QueryService } from '@/core/QueryService.js';
import { ApiError } from '../../error.js';
+import { Brackets } from 'typeorm';
export const meta = {
tags: ['notes', 'lists'],
@@ -70,11 +72,16 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
@Inject(DI.userListsRepository)
private userListsRepository: UserListsRepository,
+ @Inject(DI.userListMembershipsRepository)
+ private userListMembershipsRepository: UserListMembershipsRepository,
+
private noteEntityService: NoteEntityService,
private activeUsersChart: ActiveUsersChart,
private cacheService: CacheService,
private idService: IdService,
private funoutTimelineService: FunoutTimelineService,
+ private queryService: QueryService,
+
) {
super(meta, paramDef, async (ps, me) => {
const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
@@ -102,44 +109,129 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
let noteIds = await this.funoutTimelineService.get(ps.withFiles ? `userListTimelineWithFiles:${list.id}` : `userListTimeline:${list.id}`, untilId, sinceId);
noteIds = noteIds.slice(0, ps.limit);
- if (noteIds.length === 0) {
- return [];
+ let redisTimeline: MiNote[] = [];
+
+ if (noteIds.length > 0) {
+ const query = this.notesRepository.createQueryBuilder('note')
+ .where('note.id IN (:...noteIds)', { noteIds: noteIds })
+ .innerJoinAndSelect('note.user', 'user')
+ .leftJoinAndSelect('note.reply', 'reply')
+ .leftJoinAndSelect('note.renote', 'renote')
+ .leftJoinAndSelect('reply.user', 'replyUser')
+ .leftJoinAndSelect('renote.user', 'renoteUser')
+ .leftJoinAndSelect('note.channel', 'channel');
+
+ redisTimeline = await query.getMany();
+
+ redisTimeline = redisTimeline.filter(note => {
+ if (note.userId === me.id) {
+ return true;
+ }
+ if (isUserRelated(note, userIdsWhoBlockingMe)) return false;
+ if (isUserRelated(note, userIdsWhoMeMuting)) return false;
+ if (note.renoteId) {
+ if (note.text == null && note.fileIds.length === 0 && !note.hasPoll) {
+ if (isUserRelated(note, userIdsWhoMeMutingRenotes)) return false;
+ if (ps.withRenotes === false) return false;
+ }
+ }
+
+ return true;
+ });
+
+ redisTimeline.sort((a, b) => a.id > b.id ? -1 : 1);
}
- const query = this.notesRepository.createQueryBuilder('note')
- .where('note.id IN (:...noteIds)', { noteIds: noteIds })
- .innerJoinAndSelect('note.user', 'user')
- .leftJoinAndSelect('note.reply', 'reply')
- .leftJoinAndSelect('note.renote', 'renote')
- .leftJoinAndSelect('reply.user', 'replyUser')
- .leftJoinAndSelect('renote.user', 'renoteUser')
- .leftJoinAndSelect('note.channel', 'channel');
+ if (redisTimeline.length > 0) {
+ this.activeUsersChart.read(me);
+ return await this.noteEntityService.packMany(redisTimeline, me);
+ } else { // fallback to db
+ //#region Construct query
+ const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
+ .innerJoin(this.userListMembershipsRepository.metadata.targetName, 'userListMemberships', 'userListMemberships.userId = note.userId')
+ .innerJoinAndSelect('note.user', 'user')
+ .leftJoinAndSelect('note.reply', 'reply')
+ .leftJoinAndSelect('note.renote', 'renote')
+ .leftJoinAndSelect('reply.user', 'replyUser')
+ .leftJoinAndSelect('renote.user', 'renoteUser')
+ .andWhere('userListMemberships.userListId = :userListId', { userListId: list.id })
+ .andWhere('note.channelId IS NULL') // チャンネルノートではない
+ .andWhere(new Brackets(qb => {
+ qb
+ .where('note.replyId IS NULL') // 返信ではない
+ .orWhere(new Brackets(qb => {
+ qb // 返信だけど投稿者自身への返信
+ .where('note.replyId IS NOT NULL')
+ .andWhere('note.replyUserId = note.userId');
+ }))
+ .orWhere(new Brackets(qb => {
+ qb // 返信だけど自分宛ての返信
+ .where('note.replyId IS NOT NULL')
+ .andWhere('note.replyUserId = :meId', { meId: me.id });
+ }))
+ .orWhere(new Brackets(qb => {
+ qb // 返信だけどwithRepliesがtrueの場合
+ .where('note.replyId IS NOT NULL')
+ .andWhere('userListMemberships.withReplies = true');
+ }));
+ }));
- let timeline = await query.getMany();
+ this.queryService.generateVisibilityQuery(query, me);
+ this.queryService.generateMutedUserQuery(query, me);
+ this.queryService.generateBlockedUserQuery(query, me);
+ this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
- timeline = timeline.filter(note => {
- if (note.userId === me.id) {
- return true;
- }
- if (isUserRelated(note, userIdsWhoBlockingMe)) return false;
- if (isUserRelated(note, userIdsWhoMeMuting)) return false;
- if (note.renoteId) {
- if (note.text == null && note.fileIds.length === 0 && !note.hasPoll) {
- if (isUserRelated(note, userIdsWhoMeMutingRenotes)) return false;
- if (ps.withRenotes === false) return false;
- }
+ if (ps.includeMyRenotes === false) {
+ query.andWhere(new Brackets(qb => {
+ qb.orWhere('note.userId != :meId', { meId: me.id });
+ qb.orWhere('note.renoteId IS NULL');
+ qb.orWhere('note.text IS NOT NULL');
+ qb.orWhere('note.fileIds != \'{}\'');
+ qb.orWhere('0 < (SELECT COUNT(*) FROM poll WHERE poll."noteId" = note.id)');
+ }));
}
- return true;
- });
+ if (ps.includeRenotedMyNotes === false) {
+ query.andWhere(new Brackets(qb => {
+ qb.orWhere('note.renoteUserId != :meId', { meId: me.id });
+ qb.orWhere('note.renoteId IS NULL');
+ qb.orWhere('note.text IS NOT NULL');
+ qb.orWhere('note.fileIds != \'{}\'');
+ qb.orWhere('0 < (SELECT COUNT(*) FROM poll WHERE poll."noteId" = note.id)');
+ }));
+ }
- // TODO: フィルタした結果件数が足りなかった場合の対応
+ if (ps.includeLocalRenotes === false) {
+ query.andWhere(new Brackets(qb => {
+ qb.orWhere('note.renoteUserHost IS NOT NULL');
+ qb.orWhere('note.renoteId IS NULL');
+ qb.orWhere('note.text IS NOT NULL');
+ qb.orWhere('note.fileIds != \'{}\'');
+ qb.orWhere('0 < (SELECT COUNT(*) FROM poll WHERE poll."noteId" = note.id)');
+ }));
+ }
- timeline.sort((a, b) => a.id > b.id ? -1 : 1);
+ if (ps.withRenotes === false) {
+ query.andWhere(new Brackets(qb => {
+ qb.orWhere('note.renoteId IS NULL');
+ qb.orWhere(new Brackets(qb => {
+ qb.orWhere('note.text IS NOT NULL');
+ qb.orWhere('note.fileIds != \'{}\'');
+ }));
+ }));
+ }
- this.activeUsersChart.read(me);
+ if (ps.withFiles) {
+ query.andWhere('note.fileIds != \'{}\'');
+ }
+ //#endregion
- return await this.noteEntityService.packMany(timeline, me);
+ const timeline = await query.limit(ps.limit).getMany();
+
+ this.activeUsersChart.read(me);
+
+ return await this.noteEntityService.packMany(timeline, me);
+ }
});
}
}