Merge remote-tracking branch 'mi-dev/develop' into emoji
# Conflicts: # packages/backend/src/models/RepositoryModule.ts # packages/misskey-js/etc/misskey-js.api.md
This commit is contained in:
commit
27a7d0bbf7
75 changed files with 2799 additions and 686 deletions
|
|
@ -229,6 +229,12 @@ export class RoleService implements OnApplicationShutdown {
|
|||
}
|
||||
}
|
||||
|
||||
@bindThis
|
||||
public async getRoles() {
|
||||
const roles = await this.rolesCache.fetch(() => this.rolesRepository.findBy({}));
|
||||
return roles;
|
||||
}
|
||||
|
||||
@bindThis
|
||||
public async getUserAssigns(userId: MiUser['id']) {
|
||||
const now = Date.now();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue