diff options
author | Chocobozzz <me@florianbigard.com> | 2021-09-03 10:27:04 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-09-03 16:35:18 +0200 |
commit | 6d210220be0875d63461829d83c6e3a59d05cf7a (patch) | |
tree | 60ec5b596ef06295b70ebb553920a39b549e0f13 /client/src/app/core | |
parent | 2ede07153ce0282b116345dfee09bff902355a75 (diff) | |
download | PeerTube-6d210220be0875d63461829d83c6e3a59d05cf7a.tar.gz PeerTube-6d210220be0875d63461829d83c6e3a59d05cf7a.tar.zst PeerTube-6d210220be0875d63461829d83c6e3a59d05cf7a.zip |
Fix NSFW filter and add tests
Diffstat (limited to 'client/src/app/core')
-rw-r--r-- | client/src/app/core/users/user.service.ts | 6 |
1 files changed, 5 insertions, 1 deletions
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 { | |||
17 | UserUpdateMe, | 17 | UserUpdateMe, |
18 | UserVideoQuota | 18 | UserVideoQuota |
19 | } from '@shared/models' | 19 | } from '@shared/models' |
20 | import { ServerService } from '../' | ||
20 | import { environment } from '../../../environments/environment' | 21 | import { environment } from '../../../environments/environment' |
21 | import { RestExtractor, RestPagination, RestService } from '../rest' | 22 | import { RestExtractor, RestPagination, RestService } from '../rest' |
22 | import { LocalStorageService, SessionStorageService } from '../wrappers/storage.service' | 23 | import { LocalStorageService, SessionStorageService } from '../wrappers/storage.service' |
@@ -32,6 +33,7 @@ export class UserService { | |||
32 | 33 | ||
33 | constructor ( | 34 | constructor ( |
34 | private authHttp: HttpClient, | 35 | private authHttp: HttpClient, |
36 | private server: ServerService, | ||
35 | private authService: AuthService, | 37 | private authService: AuthService, |
36 | private restExtractor: RestExtractor, | 38 | private restExtractor: RestExtractor, |
37 | private restService: RestService, | 39 | private restService: RestService, |
@@ -298,9 +300,11 @@ export class UserService { | |||
298 | console.error('Cannot parse desired video languages from localStorage.', err) | 300 | console.error('Cannot parse desired video languages from localStorage.', err) |
299 | } | 301 | } |
300 | 302 | ||
303 | const defaultNSFWPolicy = this.server.getHTMLConfig().instance.defaultNSFWPolicy | ||
304 | |||
301 | return new User({ | 305 | return new User({ |
302 | // local storage keys | 306 | // local storage keys |
303 | nsfwPolicy: this.localStorageService.getItem(UserLocalStorageKeys.NSFW_POLICY), | 307 | nsfwPolicy: this.localStorageService.getItem(UserLocalStorageKeys.NSFW_POLICY) || defaultNSFWPolicy, |
304 | webTorrentEnabled: this.localStorageService.getItem(UserLocalStorageKeys.WEBTORRENT_ENABLED) !== 'false', | 308 | webTorrentEnabled: this.localStorageService.getItem(UserLocalStorageKeys.WEBTORRENT_ENABLED) !== 'false', |
305 | theme: this.localStorageService.getItem(UserLocalStorageKeys.THEME) || 'instance-default', | 309 | theme: this.localStorageService.getItem(UserLocalStorageKeys.THEME) || 'instance-default', |
306 | videoLanguages, | 310 | videoLanguages, |