diff --git a/package.json b/package.json index 70e743760992..e7516c2cf029 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2023.10.1-kakurega.1.20.2", + "version": "2023.10.1-kakurega.1.20.3", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts index 760d52c9db0e..a0f3cdccf978 100644 --- a/packages/backend/src/server/api/endpoints/notes/timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts @@ -16,6 +16,7 @@ import { IdService } from '@/core/IdService.js'; import { CacheService } from '@/core/CacheService.js'; import { isUserRelated } from '@/misc/is-user-related.js'; import { RedisTimelineService } from '@/core/RedisTimelineService.js'; +import { ApiLoggerService } from '@/server/api/ApiLoggerService.js'; export const meta = { tags: ['notes'], @@ -64,6 +65,7 @@ export default class extends Endpoint { // eslint- private idService: IdService, private cacheService: CacheService, private redisTimelineService: RedisTimelineService, + private apiLoggerService: ApiLoggerService, ) { super(meta, paramDef, async (ps, me) => { const untilId = ps.untilId ?? (ps.untilDate ? this.idService.genId(new Date(ps.untilDate!)) : null); @@ -85,6 +87,7 @@ export default class extends Endpoint { // eslint- noteIds = noteIds.slice(0, ps.limit); if (noteIds.length === 0) { + this.apiLoggerService.logger.warn(`Redis timeline is empty. me: ${me.id}, untilId: ${untilId}, sinceId: ${sinceId}, includeMyRenotes: ${ps.includeMyRenotes}, includeRenotedMyNotes: ${ps.includeRenotedMyNotes}, includeLocalRenotes: ${ps.includeLocalRenotes}, withFiles: ${ps.withFiles}, withRenotes: ${ps.withRenotes}`); return []; } @@ -122,6 +125,10 @@ export default class extends Endpoint { // eslint- timeline.sort((a, b) => a.id > b.id ? -1 : 1); + if (timeline.length === 0) { + this.apiLoggerService.logger.warn(`Timeline is empty. me: ${me.id}, untilId: ${untilId}, sinceId: ${sinceId}, includeMyRenotes: ${ps.includeMyRenotes}, includeRenotedMyNotes: ${ps.includeRenotedMyNotes}, includeLocalRenotes: ${ps.includeLocalRenotes}, withFiles: ${ps.withFiles}, withRenotes: ${ps.withRenotes}`); + } + process.nextTick(() => { this.activeUsersChart.read(me); }); diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue index eb05dc09377b..95345a0ab1bc 100644 --- a/packages/frontend/src/components/MkPagination.vue +++ b/packages/frontend/src/components/MkPagination.vue @@ -44,6 +44,7 @@ SPDX-License-Identifier: AGPL-3.0-only