diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
| commit | 73471b1a52f242e86364ffb077ea6cadb3b07ae2 (patch) | |
| tree | 43dbb7748e281f8d80f15326f489cdea10ec857d /server/helpers/express-utils.ts | |
| parent | c22419dd265c0c7185bf4197a1cb286eb3d8ebc0 (diff) | |
| parent | f5305c04aae14467d6f957b713c5a902275cbb89 (diff) | |
| download | PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.gz PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.zst PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.zip | |
Merge branch 'release/v1.2.0'
Diffstat (limited to 'server/helpers/express-utils.ts')
| -rw-r--r-- | server/helpers/express-utils.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/helpers/express-utils.ts b/server/helpers/express-utils.ts index 162fe2244..9a72ee96d 100644 --- a/server/helpers/express-utils.ts +++ b/server/helpers/express-utils.ts | |||
| @@ -7,12 +7,12 @@ import { extname } from 'path' | |||
| 7 | import { isArray } from './custom-validators/misc' | 7 | import { isArray } from './custom-validators/misc' |
| 8 | import { UserModel } from '../models/account/user' | 8 | import { UserModel } from '../models/account/user' |
| 9 | 9 | ||
| 10 | function buildNSFWFilter (res: express.Response, paramNSFW?: string) { | 10 | function buildNSFWFilter (res?: express.Response, paramNSFW?: string) { |
| 11 | if (paramNSFW === 'true') return true | 11 | if (paramNSFW === 'true') return true |
| 12 | if (paramNSFW === 'false') return false | 12 | if (paramNSFW === 'false') return false |
| 13 | if (paramNSFW === 'both') return undefined | 13 | if (paramNSFW === 'both') return undefined |
| 14 | 14 | ||
| 15 | if (res.locals.oauth) { | 15 | if (res && res.locals.oauth) { |
| 16 | const user: UserModel = res.locals.oauth.token.User | 16 | const user: UserModel = res.locals.oauth.token.User |
| 17 | 17 | ||
| 18 | // User does not want NSFW videos | 18 | // User does not want NSFW videos |