From 6d210220be0875d63461829d83c6e3a59d05cf7a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 3 Sep 2021 10:27:04 +0200 Subject: Fix NSFW filter and add tests --- client/src/app/core/users/user.service.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'client/src/app/core') diff --git a/client/src/app/core/users/user.service.ts b/client/src/app/core/users/user.service.ts index be9e66c3c..632361e9b 100644 --- a/client/src/app/core/users/user.service.ts +++ b/client/src/app/core/users/user.service.ts @@ -17,6 +17,7 @@ import { UserUpdateMe, UserVideoQuota } from '@shared/models' +import { ServerService } from '../' import { environment } from '../../../environments/environment' import { RestExtractor, RestPagination, RestService } from '../rest' import { LocalStorageService, SessionStorageService } from '../wrappers/storage.service' @@ -32,6 +33,7 @@ export class UserService { constructor ( private authHttp: HttpClient, + private server: ServerService, private authService: AuthService, private restExtractor: RestExtractor, private restService: RestService, @@ -298,9 +300,11 @@ export class UserService { console.error('Cannot parse desired video languages from localStorage.', err) } + const defaultNSFWPolicy = this.server.getHTMLConfig().instance.defaultNSFWPolicy + return new User({ // local storage keys - nsfwPolicy: this.localStorageService.getItem(UserLocalStorageKeys.NSFW_POLICY), + nsfwPolicy: this.localStorageService.getItem(UserLocalStorageKeys.NSFW_POLICY) || defaultNSFWPolicy, webTorrentEnabled: this.localStorageService.getItem(UserLocalStorageKeys.WEBTORRENT_ENABLED) !== 'false', theme: this.localStorageService.getItem(UserLocalStorageKeys.THEME) || 'instance-default', videoLanguages, -- cgit v1.2.3