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
prevent a "always nsfw" user from unmarking their media
2024-09-23 02:01:59 +03:00 · 2024-04-07 15:38:32 +00:00 · 2024-03-29 19:03:52 +00:00 · 2024-03-29 18:40:21 +00:00
2 changed files with 3 additions and 1 deletions
--- 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();
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@ -265,6 +265,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;
Author	SHA1	Message	Date
dakkar	880d1872c6	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	2024-04-07 15:38:32 +00:00
dakkar	a7d19d0c36	prevent a "always nsfw" user from unmarking their media	2024-03-29 19:03:52 +00:00
dakkar	da8b248898	set the correct "marked an NSFW" when loading admin-user	2024-03-29 18:40:21 +00:00