Merge upstream

This commit is contained in:
オスカー、 2024-10-18 21:41:33 +09:00
commit d34eadc8b0
No known key found for this signature in database
GPG key ID: 139D6573F92DA9F7
35 changed files with 504 additions and 73 deletions

View file

@ -0,0 +1,61 @@
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import type { UsersRepository } from '@/models/_.js';
import generateUserToken from '@/misc/generate-native-user-token.js';
import { GlobalEventService } from '@/core/GlobalEventService.js';
import { DI } from '@/di-symbols.js';
import { ModerationLogService } from '@/core/ModerationLogService.js';
export const meta = {
tags: ['admin'],
requireCredential: true,
requireModerator: true,
kind: 'write:admin:regenerate-user-token',
} as const;
export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },
},
required: ['userId'],
} as const;
// eslint-disable-next-line import/no-default-export
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> {
constructor(
@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
private globalEventService: GlobalEventService,
private moderationLogService: ModerationLogService,
) {
super(meta, paramDef, async (ps, me) => {
const user = await this.usersRepository.findOneBy({ id: ps.userId });
if (user == null) {
throw new Error('user not found');
}
const oldToken = user.token;
if (oldToken == null) return;
const newToken = generateUserToken();
await this.usersRepository.update(user.id, {
token: newToken,
});
// Publish event
this.globalEventService.publishInternalEvent('userTokenRegenerated', { id: user.id, oldToken, newToken });
this.globalEventService.publishMainStream(user.id, 'myTokenRegenerated');
this.moderationLogService.log(me, 'regenerateUserToken', {
userId: user.id,
userUsername: user.username,
userHost: user.host,
});
});
}
}

View file

@ -14,7 +14,7 @@ export const meta = {
requireCredential: true,
requireModerator: true,
kind: 'write:admin:unset-user-avatar',
kind: 'write:admin:user-avatar',
} as const;
export const paramDef = {

View file

@ -14,7 +14,7 @@ export const meta = {
requireCredential: true,
requireModerator: true,
kind: 'write:admin:unset-user-banner',
kind: 'write:admin:user-banner',
} as const;
export const paramDef = {

View file

@ -12,7 +12,7 @@ export const meta = {
requireCredential: true,
requireModerator: true,
kind: 'write:admin:unset-user-mutual-link',
kind: 'write:admin:user-mutual-link',
} as const;
export const paramDef = {

View file

@ -0,0 +1,53 @@
import { Inject, Injectable } from '@nestjs/common';
import type { UsersRepository } from '@/models/_.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { ModerationLogService } from '@/core/ModerationLogService.js';
export const meta = {
tags: ['admin'],
requireCredential: true,
requireModerator: true,
kind: 'write:admin:user-name',
} as const;
export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },
name: { type: 'string' },
},
required: ['userId'],
} as const;
// eslint-disable-next-line import/no-default-export
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> {
constructor(
@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
private moderationLogService: ModerationLogService,
) {
super(meta, paramDef, async (ps, me) => {
const user = await this.usersRepository.findOneBy({ id: ps.userId });
if (user == null) {
throw new Error('user not found');
}
await this.usersRepository.update(user.id, {
name: ps.name ?? null,
});
this.moderationLogService.log(me, 'updateUserName', {
userId: user.id,
userUsername: user.username,
userHost: user.host,
before: user.name,
after: ps.name ?? null,
});
});
}
}