diff options
| author | Amelia Yukii <amelia.yukii@shourai.de> | 2024-05-30 14:22:00 +0000 |
|---|---|---|
| committer | Amelia Yukii <amelia.yukii@shourai.de> | 2024-05-30 14:22:00 +0000 |
| commit | 55fc2879f39c2811ec03bfc09c3633b3411ebab4 (patch) | |
| tree | 0296211959884b36a9187180bc8252036c906289 | |
| parent | merge: fix: start only one instance of ChartManagementService scheduled job (... (diff) | |
| parent | set the correct "marked an NSFW" when loading admin-user (diff) | |
| download | sharkey-55fc2879f39c2811ec03bfc09c3633b3411ebab4.tar.gz sharkey-55fc2879f39c2811ec03bfc09c3633b3411ebab4.tar.bz2 sharkey-55fc2879f39c2811ec03bfc09c3633b3411ebab4.zip | |
merge: set the correct "marked an NSFW" when loading admin-user (!483)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/483
Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com>
| -rw-r--r-- | packages/backend/src/core/DriveService.ts | 3 | ||||
| -rw-r--r-- | packages/frontend/src/pages/admin-user.vue | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts index f64568ee9a..4203b03c74 100644 --- a/packages/backend/src/core/DriveService.ts +++ b/packages/backend/src/core/DriveService.ts @@ -632,7 +632,8 @@ export class DriveService { @bindThis 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)) { throw new DriveService.InvalidFileNameError(); diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue index eb9ca602ab..f99145ae6a 100644 --- a/packages/frontend/src/pages/admin-user.vue +++ b/packages/frontend/src/pages/admin-user.vue @@ -266,6 +266,7 @@ function createFetcher() { moderator.value = info.value.isModerator; silenced.value = info.value.isSilenced; approved.value = info.value.approved; + markedAsNSFW.value = info.value.alwaysMarkNsfw; suspended.value = info.value.isSuspended; moderationNote.value = info.value.moderationNote; |