feat: お知らせの優先順位機能 (#118)

ついでにお知らせのページング処理、わかったのボタン押したとき更新されるように

packages/backend/src/server/api/endpoints/admin/announcements/create.ts

@@ -42,6 +42,10 @@ export const meta = {
 				type: 'string',
 				optional: false, nullable: true,
 			},
+			displayOrder: {
+				type: 'number',
+				optional: false, nullable: false,
+			},
 			userId: {
 				type: 'string',
 				optional: false, nullable: true,
@@ -60,6 +64,7 @@ export const paramDef = {
 		title: { type: 'string', minLength: 1 },
 		text: { type: 'string', minLength: 1 },
 		imageUrl: { type: 'string', nullable: true, minLength: 1 },
+		displayOrder: { type: 'number' },
 		userId: { type: 'string', nullable: true, format: 'misskey:id' },
 		closeDuration: { type: 'number', nullable: false },
 	},
@@ -83,6 +88,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				title: ps.title,
 				text: ps.text,
 				imageUrl: ps.imageUrl,
+				displayOrder: ps.displayOrder,
 				userId: ps.userId ?? null,
 				closeDuration: ps.closeDuration,
 			}).then(x => this.announcementsRepository.findOneByOrFail(x.identifiers[0]));

packages/backend/src/server/api/endpoints/admin/announcements/list.ts

@@ -48,6 +48,10 @@ export const meta = {
 					type: 'string',
 					optional: false, nullable: true,
 				},
+				displayOrder: {
+					type: 'number',
+					optional: false, nullable: false,
+				},
 				userId: {
 					type: 'string',
 					optional: false, nullable: true,
@@ -74,8 +78,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 },
 		userId: { type: 'string', format: 'misskey:id' },
 	},
 	required: [],
@@ -94,20 +97,25 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
-		private queryService: QueryService,
 		private userEntityService: UserEntityService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			const builder = this.announcementsRepository.createQueryBuilder('announcement');
+			const query = this.announcementsRepository.createQueryBuilder('announcement');
 			if (ps.userId) {
-				builder.where('"userId" = :userId', { userId: ps.userId });
+				query.where('"userId" = :userId', { userId: ps.userId });
 			} else {
-				builder.where('"userId" IS NULL');
+				query.where('"userId" IS NULL');
 			}
 
-			const query = this.queryService.makePaginationQuery(builder, ps.sinceId, ps.untilId);
+			query.orderBy({
+				'announcement."displayOrder"': 'DESC',
+				'announcement."createdAt"': 'DESC',
+			});
 
-			const announcements = await query.limit(ps.limit).getMany();
+			const announcements = await query
+				.offset(ps.offset)
+				.limit(ps.limit)
+				.getMany();
 
 			const reads = new Map<Announcement, number>();
 
@@ -131,6 +139,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				title: announcement.title,
 				text: announcement.text,
 				imageUrl: announcement.imageUrl,
+				displayOrder: announcement.displayOrder,
 				userId: announcement.userId,
 				user: packedUsers.find(user => user.id === announcement.userId),
 				reads: reads.get(announcement)!,

packages/backend/src/server/api/endpoints/admin/announcements/update.ts

@@ -26,6 +26,7 @@ export const paramDef = {
 		title: { type: 'string', minLength: 1 },
 		text: { type: 'string', minLength: 1 },
 		imageUrl: { type: 'string', nullable: true, minLength: 0 },
+		displayOrder: { type: 'number' },
 		userId: { type: 'string', nullable: true, format: 'misskey:id' },
 		closeDuration: { type: 'number', nullable: false },
 	},
@@ -57,6 +58,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				text: ps.text,
 				/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- 空の文字列の場合、nullを渡すようにするため */
 				imageUrl: ps.imageUrl || null,
+				displayOrder: ps.displayOrder,
 				userId: ps.userId ?? null,
 				closeDuration: ps.closeDuration,
 			});