HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

set the correct "marked an NSFW" when loading admin-user

Browse source
This commit is contained in:
dakkar 2024-05-30 14:22:00 +00:00 committed by Amelia Yukii
parent 58bc8f2c10
commit 3050dcbef7
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/backend/src/core/DriveService.ts
View file

@ -632,7 +632,8 @@ export class DriveService {
@bindThis @bindThis
public async updateFile(file: MiDriveFile, values: Partial<MiDriveFile>, updater: MiUser) { public async updateFile(file: MiDriveFile, values: Partial<MiDriveFile>, updater: MiUser) {
const alwaysMarkNsfw = (await this.roleService.getUserPolicies(file.userId)).alwaysMarkNsfw; const profile = await this.userProfilesRepository.findOneBy({ userId: file.userId });
const alwaysMarkNsfw = (await this.roleService.getUserPolicies(file.userId)).alwaysMarkNsfw || (profile !== null && profile!.alwaysMarkNsfw);
if (values.name != null && !this.driveFileEntityService.validateFileName(values.name)) { if (values.name != null && !this.driveFileEntityService.validateFileName(values.name)) {
throw new DriveService.InvalidFileNameError(); throw new DriveService.InvalidFileNameError();

1
packages/frontend/src/pages/admin-user.vue
View file

@ -265,6 +265,7 @@ function createFetcher() {
moderator.value = info.value.isModerator; moderator.value = info.value.isModerator;
silenced.value = info.value.isSilenced; silenced.value = info.value.isSilenced;
approved.value = info.value.approved; approved.value = info.value.approved;
markedAsNSFW.value = info.value.alwaysMarkNsfw;
suspended.value = info.value.isSuspended; suspended.value = info.value.isSuspended;
moderationNote.value = info.value.moderationNote; moderationNote.value = info.value.moderationNote;