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/common/inject-promo.ts | 36 ++++++++++++++ src/server/api/endpoints/admin/promo/create.ts | 58 +++++++++++++++++++++++ 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 ++ 6 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 src/server/api/common/inject-promo.ts create mode 100644 src/server/api/endpoints/admin/promo/create.ts (limited to 'src/server/api') diff --git a/src/server/api/common/inject-promo.ts b/src/server/api/common/inject-promo.ts new file mode 100644 index 0000000000..785d7af085 --- /dev/null +++ b/src/server/api/common/inject-promo.ts @@ -0,0 +1,36 @@ +import rndstr from 'rndstr'; +import { Note } from '../../../models/entities/note'; +import { User } from '../../../models/entities/user'; +import { PromoReads, PromoNotes, Notes, Users } from '../../../models'; +import { ensure } from '../../../prelude/ensure'; + +export async function injectPromo(user: User, timeline: Note[]) { + if (timeline.length < 5) return; + + // TODO: readやexpireフィルタはクエリ側でやる + + const reads = await PromoReads.find({ + userId: user.id + }); + + let promos = await PromoNotes.find(); + + promos = promos.filter(n => n.expiresAt.getTime() > Date.now()); + promos = promos.filter(n => !reads.map(r => r.noteId).includes(n.noteId)); + + if (promos.length === 0) return; + + const promo = promos[Math.floor(Math.random() * promos.length)]; + + // Pick random promo + const note = await Notes.findOne(promo.noteId).then(ensure); + + // Join + note.user = await Users.findOne(note.userId).then(ensure); + + (note as any)._prInjectionId_ = rndstr('a-z0-9', 8); + + // Inject promo + timeline.splice(3, 0, note); + timeline.pop(); +} diff --git a/src/server/api/endpoints/admin/promo/create.ts b/src/server/api/endpoints/admin/promo/create.ts new file mode 100644 index 0000000000..50fbb6563c --- /dev/null +++ b/src/server/api/endpoints/admin/promo/create.ts @@ -0,0 +1,58 @@ +import $ from 'cafy'; +import { ID } from '../../../../../misc/cafy-id'; +import define from '../../../define'; +import { ApiError } from '../../../error'; +import { getNote } from '../../../common/getters'; +import { PromoNotes } from '../../../../../models'; + +export const meta = { + requireCredential: true as const, + requireModerator: true, + + params: { + noteId: { + validator: $.type(ID), + }, + + expiresAt: { + validator: $.num.int() + }, + }, + + errors: { + noSuchNote: { + message: 'No such note.', + code: 'NO_SUCH_NOTE', + id: 'ee449fbe-af2a-453b-9cae-cf2fe7c895fc' + }, + + alreadyPromoted: { + message: 'The note has already promoted.', + code: 'ALREADY_PROMOTED', + id: 'ae427aa2-7a41-484f-a18c-2c1104051604' + }, + } +}; + +export default define(meta, async (ps, user) => { + // Get favoritee + const note = await getNote(ps.noteId).catch(e => { + if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote); + throw e; + }); + + // if already favorited + const exist = await PromoNotes.findOne(note.id); + + if (exist != null) { + throw new ApiError(meta.errors.alreadyPromoted); + } + + // Create favorite + await PromoNotes.save({ + noteId: note.id, + createdAt: new Date(), + expiresAt: new Date(ps.expiresAt), + userId: note.userId, + }); +}); 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