Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: お知らせの確認待機時間・優先順位機能

Browse source 
b7fd6bf33a835fd73c2a86eb007074d3680f6efd によるリワーク

This reverts commit eeef3965b7
This reverts commit 04fefb2056
This reverts commit 576251200f
This commit is contained in:
まっちゃとーにゅ 2023-08-19 04:48:28 +09:00
parent 3c2b83c3ae
commit 6893e5d60b
No known key found for this signature in database
GPG key ID: 6AFBBF529601C1DB
27 changed files with 832 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

14
packages/backend/src/server/api/endpoints/announcements.ts
View file

@ -31,8 +31,7 @@ export const paramDef = {
type: 'object',
properties: {
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
sinceId: { type: 'string', format: 'misskey:id' },
untilId: { type: 'string', format: 'misskey:id' },
offset: { type: 'integer', default: 0 },
isActive: { type: 'boolean', default: true },
},
required: [],
@ -52,16 +51,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
private announcementService: AnnouncementService,
) {
super(meta, paramDef, async (ps, me) => {
const query = this.queryService.makePaginationQuery(this.announcementsRepository.createQueryBuilder('announcement'), ps.sinceId, ps.untilId)
.where('announcement.isActive = :isActive', { isActive: ps.isActive })
.andWhere(new Brackets(qb => {
if (me) qb.orWhere('announcement.userId = :meId', { meId: me.id });
qb.orWhere('announcement.userId IS NULL');
}));
const announcements = await query.limit(ps.limit).getMany();
return this.announcementService.packMany(announcements, me);
return this.announcementService.getAnnouncements(me, ps.limit, ps.offset, ps.isActive);
});
}
}