From a54de07260c3555d0230492970448604ffb9d586 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 18 Feb 2020 08:41:32 +0900 Subject: Resolve #5963 --- src/server/api/endpoints/notes/global-timeline.ts | 4 +++- src/server/api/endpoints/notes/hybrid-timeline.ts | 3 +++ src/server/api/endpoints/notes/local-timeline.ts | 3 +++ src/server/api/endpoints/notes/timeline.ts | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) (limited to 'src/server/api/endpoints/notes') diff --git a/src/server/api/endpoints/notes/global-timeline.ts b/src/server/api/endpoints/notes/global-timeline.ts index 7475c8f078..0f69896de2 100644 --- a/src/server/api/endpoints/notes/global-timeline.ts +++ b/src/server/api/endpoints/notes/global-timeline.ts @@ -7,8 +7,8 @@ import { makePaginationQuery } from '../../common/make-pagination-query'; import { Notes } from '../../../../models'; import { generateMuteQuery } from '../../common/generate-mute-query'; import { activeUsersChart } from '../../../../services/chart'; -import { Brackets } from 'typeorm'; import { generateRepliesQuery } from '../../common/generate-replies-query'; +import { injectPromo } from '../../common/inject-promo'; export const meta = { desc: { @@ -90,6 +90,8 @@ export default define(meta, async (ps, user) => { const timeline = await query.take(ps.limit!).getMany(); + await injectPromo(user, timeline); + process.nextTick(() => { if (user) { activeUsersChart.update(user); diff --git a/src/server/api/endpoints/notes/hybrid-timeline.ts b/src/server/api/endpoints/notes/hybrid-timeline.ts index 5aa18b2e91..f30fbab8a1 100644 --- a/src/server/api/endpoints/notes/hybrid-timeline.ts +++ b/src/server/api/endpoints/notes/hybrid-timeline.ts @@ -10,6 +10,7 @@ import { generateVisibilityQuery } from '../../common/generate-visibility-query' import { generateMuteQuery } from '../../common/generate-mute-query'; import { activeUsersChart } from '../../../../services/chart'; import { generateRepliesQuery } from '../../common/generate-replies-query'; +import { injectPromo } from '../../common/inject-promo'; export const meta = { desc: { @@ -169,6 +170,8 @@ export default define(meta, async (ps, user) => { const timeline = await query.take(ps.limit!).getMany(); + await injectPromo(user, timeline); + process.nextTick(() => { if (user) { activeUsersChart.update(user); diff --git a/src/server/api/endpoints/notes/local-timeline.ts b/src/server/api/endpoints/notes/local-timeline.ts index 06f00969ac..68558fb84b 100644 --- a/src/server/api/endpoints/notes/local-timeline.ts +++ b/src/server/api/endpoints/notes/local-timeline.ts @@ -10,6 +10,7 @@ import { generateVisibilityQuery } from '../../common/generate-visibility-query' import { activeUsersChart } from '../../../../services/chart'; import { Brackets } from 'typeorm'; import { generateRepliesQuery } from '../../common/generate-replies-query'; +import { injectPromo } from '../../common/inject-promo'; export const meta = { desc: { @@ -122,6 +123,8 @@ export default define(meta, async (ps, user) => { const timeline = await query.take(ps.limit!).getMany(); + await injectPromo(user, timeline); + process.nextTick(() => { if (user) { activeUsersChart.update(user); diff --git a/src/server/api/endpoints/notes/timeline.ts b/src/server/api/endpoints/notes/timeline.ts index 2c25fbc968..8edf303e0d 100644 --- a/src/server/api/endpoints/notes/timeline.ts +++ b/src/server/api/endpoints/notes/timeline.ts @@ -8,6 +8,7 @@ import { generateMuteQuery } from '../../common/generate-mute-query'; import { activeUsersChart } from '../../../../services/chart'; import { Brackets } from 'typeorm'; import { generateRepliesQuery } from '../../common/generate-replies-query'; +import { injectPromo } from '../../common/inject-promo'; export const meta = { desc: { @@ -155,6 +156,8 @@ export default define(meta, async (ps, user) => { const timeline = await query.take(ps.limit!).getMany(); + await injectPromo(user, timeline); + process.nextTick(() => { if (user) { activeUsersChart.update(user); -- cgit v1.2.3-freya