mirror of
https://github.com/paricafe/misskey.git
synced 2024-11-24 12:56:43 -06:00
fix: follow request list api pagination (#9548)
* fix: follow request list api pagination * fix: improve alias Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
This commit is contained in:
parent
a5becfc042
commit
98469117bf
1 changed files with 13 additions and 5 deletions
|
@ -1,5 +1,6 @@
|
||||||
import { Inject, Injectable } from '@nestjs/common';
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
import { Endpoint } from '@/server/api/endpoint-base.js';
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
||||||
|
import { QueryService } from '@/core/QueryService.js';
|
||||||
import type { FollowRequestsRepository } from '@/models/index.js';
|
import type { FollowRequestsRepository } from '@/models/index.js';
|
||||||
import { FollowRequestEntityService } from '@/core/entities/FollowRequestEntityService.js';
|
import { FollowRequestEntityService } from '@/core/entities/FollowRequestEntityService.js';
|
||||||
import { DI } from '@/di-symbols.js';
|
import { DI } from '@/di-symbols.js';
|
||||||
|
@ -40,7 +41,11 @@ export const meta = {
|
||||||
|
|
||||||
export const paramDef = {
|
export const paramDef = {
|
||||||
type: 'object',
|
type: 'object',
|
||||||
properties: {},
|
properties: {
|
||||||
|
sinceId: { type: 'string', format: 'misskey:id' },
|
||||||
|
untilId: { type: 'string', format: 'misskey:id' },
|
||||||
|
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
|
||||||
|
},
|
||||||
required: [],
|
required: [],
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
|
@ -52,13 +57,16 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
|
||||||
private followRequestsRepository: FollowRequestsRepository,
|
private followRequestsRepository: FollowRequestsRepository,
|
||||||
|
|
||||||
private followRequestEntityService: FollowRequestEntityService,
|
private followRequestEntityService: FollowRequestEntityService,
|
||||||
|
private queryService: QueryService,
|
||||||
) {
|
) {
|
||||||
super(meta, paramDef, async (ps, me) => {
|
super(meta, paramDef, async (ps, me) => {
|
||||||
const reqs = await this.followRequestsRepository.findBy({
|
const query = this.queryService.makePaginationQuery(this.followRequestsRepository.createQueryBuilder('request'), ps.sinceId, ps.untilId);
|
||||||
followeeId: me.id,
|
|
||||||
});
|
|
||||||
|
|
||||||
return await Promise.all(reqs.map(req => this.followRequestEntityService.pack(req)));
|
const requests = await query
|
||||||
|
.take(ps.limit)
|
||||||
|
.getMany();
|
||||||
|
|
||||||
|
return await Promise.all(requests.map(req => this.followRequestEntityService.pack(req)));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue