From d9986b7a2fabffff50068f4114a16d315941591f Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 18 Feb 2020 19:05:11 +0900 Subject: Implement featured note injection --- src/server/api/endpoints/notes/featured.ts | 1 + src/server/api/endpoints/notes/global-timeline.ts | 4 +++- src/server/api/endpoints/notes/hybrid-timeline.ts | 4 +++- src/server/api/endpoints/notes/local-timeline.ts | 4 +++- src/server/api/endpoints/notes/timeline.ts | 4 +++- 5 files changed, 13 insertions(+), 4 deletions(-) (limited to 'src/server/api/endpoints/notes') diff --git a/src/server/api/endpoints/notes/featured.ts b/src/server/api/endpoints/notes/featured.ts index 5fc60eeccf..0dc705de7a 100644 --- a/src/server/api/endpoints/notes/featured.ts +++ b/src/server/api/endpoints/notes/featured.ts @@ -46,6 +46,7 @@ export default define(meta, async (ps, user) => { const query = Notes.createQueryBuilder('note') .addSelect('note.score') .where('note.userHost IS NULL') + .andWhere(`note.score > 0`) .andWhere(`note.createdAt > :date`, { date: new Date(Date.now() - day) }) .andWhere(`note.visibility = 'public'`) .leftJoinAndSelect('note.user', 'user'); diff --git a/src/server/api/endpoints/notes/global-timeline.ts b/src/server/api/endpoints/notes/global-timeline.ts index 0f69896de2..26b0cb0f5a 100644 --- a/src/server/api/endpoints/notes/global-timeline.ts +++ b/src/server/api/endpoints/notes/global-timeline.ts @@ -9,6 +9,7 @@ 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'; +import { injectFeatured } from '../../common/inject-featured'; export const meta = { desc: { @@ -90,7 +91,8 @@ export default define(meta, async (ps, user) => { const timeline = await query.take(ps.limit!).getMany(); - await injectPromo(user, timeline); + await injectPromo(timeline, user); + await injectFeatured(timeline, user); process.nextTick(() => { if (user) { diff --git a/src/server/api/endpoints/notes/hybrid-timeline.ts b/src/server/api/endpoints/notes/hybrid-timeline.ts index f30fbab8a1..b0a73d1d7d 100644 --- a/src/server/api/endpoints/notes/hybrid-timeline.ts +++ b/src/server/api/endpoints/notes/hybrid-timeline.ts @@ -11,6 +11,7 @@ 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'; +import { injectFeatured } from '../../common/inject-featured'; export const meta = { desc: { @@ -170,7 +171,8 @@ export default define(meta, async (ps, user) => { const timeline = await query.take(ps.limit!).getMany(); - await injectPromo(user, timeline); + await injectPromo(timeline, user); + await injectFeatured(timeline, user); process.nextTick(() => { if (user) { diff --git a/src/server/api/endpoints/notes/local-timeline.ts b/src/server/api/endpoints/notes/local-timeline.ts index 68558fb84b..a74dc3b15c 100644 --- a/src/server/api/endpoints/notes/local-timeline.ts +++ b/src/server/api/endpoints/notes/local-timeline.ts @@ -11,6 +11,7 @@ import { activeUsersChart } from '../../../../services/chart'; import { Brackets } from 'typeorm'; import { generateRepliesQuery } from '../../common/generate-replies-query'; import { injectPromo } from '../../common/inject-promo'; +import { injectFeatured } from '../../common/inject-featured'; export const meta = { desc: { @@ -123,7 +124,8 @@ export default define(meta, async (ps, user) => { const timeline = await query.take(ps.limit!).getMany(); - await injectPromo(user, timeline); + await injectPromo(timeline, user); + await injectFeatured(timeline, user); process.nextTick(() => { if (user) { diff --git a/src/server/api/endpoints/notes/timeline.ts b/src/server/api/endpoints/notes/timeline.ts index 8edf303e0d..3eed9f0ca8 100644 --- a/src/server/api/endpoints/notes/timeline.ts +++ b/src/server/api/endpoints/notes/timeline.ts @@ -9,6 +9,7 @@ import { activeUsersChart } from '../../../../services/chart'; import { Brackets } from 'typeorm'; import { generateRepliesQuery } from '../../common/generate-replies-query'; import { injectPromo } from '../../common/inject-promo'; +import { injectFeatured } from '../../common/inject-featured'; export const meta = { desc: { @@ -156,7 +157,8 @@ export default define(meta, async (ps, user) => { const timeline = await query.take(ps.limit!).getMany(); - await injectPromo(user, timeline); + await injectPromo(timeline, user); + await injectFeatured(timeline, user); process.nextTick(() => { if (user) { -- cgit v1.2.3-freya