diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2024-10-20 12:17:17 +0000 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2024-10-20 12:17:17 +0000 |
| commit | 90d8050df442115f25b14da882756d2807c3a814 (patch) | |
| tree | 1bb62cbd2ab4916a163256bcb07852ecc7328e35 /packages/backend/src/core/DriveService.ts | |
| parent | merge: upd: remove file on cleaner, fix load more not working (!699) (diff) | |
| parent | fix: default sensitive not letting users unmark files (diff) | |
| download | sharkey-90d8050df442115f25b14da882756d2807c3a814.tar.gz sharkey-90d8050df442115f25b14da882756d2807c3a814.tar.bz2 sharkey-90d8050df442115f25b14da882756d2807c3a814.zip | |
merge: Fix "Mark as Sensitive by default" locking files into a Sensitive state (!700)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/700
Closes #760
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Diffstat (limited to 'packages/backend/src/core/DriveService.ts')
| -rw-r--r-- | packages/backend/src/core/DriveService.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts index 744bc65be7..520c339d7d 100644 --- a/packages/backend/src/core/DriveService.ts +++ b/packages/backend/src/core/DriveService.ts @@ -560,7 +560,7 @@ export class DriveService { file.maybeSensitive = info.sensitive; file.maybePorn = info.porn; file.isSensitive = user - ? this.userEntityService.isLocalUser(user) && profile!.alwaysMarkNsfw ? true : + ? this.userEntityService.isLocalUser(user) && (profile!.alwaysMarkNsfw || profile!.defaultSensitive) ? true : sensitive ?? false : false; |