diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-03-01 10:20:03 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-01 10:20:03 +0900 |
| commit | 1c5291f8185651c231903129ee7c1cee263f9f03 (patch) | |
| tree | 36668447b343dc4c50222390761fd73d143278e9 /packages/backend/src/server/api/endpoints/roles | |
| parent | enhance(client): ノートの操作部をホバー時のみ表示するオプ... (diff) | |
| download | misskey-1c5291f8185651c231903129ee7c1cee263f9f03.tar.gz misskey-1c5291f8185651c231903129ee7c1cee263f9f03.tar.bz2 misskey-1c5291f8185651c231903129ee7c1cee263f9f03.zip | |
feat: 時限ロール (#10145)
* feat: 時限ロール
* クライアントから期限を確認できるように
* リファクタとか
* fix test
* fix test
* fix test
* clean up
Diffstat (limited to 'packages/backend/src/server/api/endpoints/roles')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/roles/users.ts | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/backend/src/server/api/endpoints/roles/users.ts b/packages/backend/src/server/api/endpoints/roles/users.ts index 6e221b6c67..2a8684e6d7 100644 --- a/packages/backend/src/server/api/endpoints/roles/users.ts +++ b/packages/backend/src/server/api/endpoints/roles/users.ts @@ -1,4 +1,5 @@ import { Inject, Injectable } from '@nestjs/common'; +import { Brackets } from 'typeorm'; import type { RoleAssignmentsRepository, RolesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; @@ -56,6 +57,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { const query = this.queryService.makePaginationQuery(this.roleAssignmentsRepository.createQueryBuilder('assign'), ps.sinceId, ps.untilId) .andWhere('assign.roleId = :roleId', { roleId: role.id }) + .andWhere(new Brackets(qb => { qb + .where('assign.expiresAt IS NOT NULL') + .orWhere('assign.expiresAt > :now', { now: new Date() }); + })) .innerJoinAndSelect('assign.user', 'user'); const assigns = await query |