diff options
Diffstat (limited to 'server/lib')
-rw-r--r-- | server/lib/client-html.ts | 4 | ||||
-rw-r--r-- | server/lib/emailer.ts | 2 | ||||
-rw-r--r-- | server/lib/transcoding/video-transcoding-profiles.ts | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts index 3529acf5e..84b4ca97d 100644 --- a/server/lib/client-html.ts +++ b/server/lib/client-html.ts | |||
@@ -303,7 +303,6 @@ class ClientHtml { | |||
303 | 303 | ||
304 | let html = buffer.toString() | 304 | let html = buffer.toString() |
305 | 305 | ||
306 | if (paramLang) html = ClientHtml.addHtmlLang(html, paramLang) | ||
307 | html = ClientHtml.addManifestContentHash(html) | 306 | html = ClientHtml.addManifestContentHash(html) |
308 | html = ClientHtml.addFaviconContentHash(html) | 307 | html = ClientHtml.addFaviconContentHash(html) |
309 | html = ClientHtml.addLogoContentHash(html) | 308 | html = ClientHtml.addLogoContentHash(html) |
@@ -555,8 +554,7 @@ function sendHTML (html: string, res: express.Response) { | |||
555 | } | 554 | } |
556 | 555 | ||
557 | async function serveIndexHTML (req: express.Request, res: express.Response) { | 556 | async function serveIndexHTML (req: express.Request, res: express.Response) { |
558 | if (req.accepts(ACCEPT_HEADERS) === 'html' || | 557 | if (req.accepts(ACCEPT_HEADERS) === 'html' || !req.headers.accept) { |
559 | !req.headers.accept) { | ||
560 | try { | 558 | try { |
561 | await generateHTMLPage(req, res, req.params.language) | 559 | await generateHTMLPage(req, res, req.params.language) |
562 | return | 560 | return |
diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts index 6bb61484b..60284ea28 100644 --- a/server/lib/emailer.ts +++ b/server/lib/emailer.ts | |||
@@ -222,7 +222,7 @@ class Emailer { | |||
222 | sendmail: true, | 222 | sendmail: true, |
223 | newline: 'unix', | 223 | newline: 'unix', |
224 | path: CONFIG.SMTP.SENDMAIL, | 224 | path: CONFIG.SMTP.SENDMAIL, |
225 | logger: bunyanLogger as any | 225 | logger: bunyanLogger |
226 | }) | 226 | }) |
227 | } | 227 | } |
228 | 228 | ||
diff --git a/server/lib/transcoding/video-transcoding-profiles.ts b/server/lib/transcoding/video-transcoding-profiles.ts index 848b823e6..92971210c 100644 --- a/server/lib/transcoding/video-transcoding-profiles.ts +++ b/server/lib/transcoding/video-transcoding-profiles.ts | |||
@@ -65,7 +65,7 @@ const defaultAACOptionsBuilder: EncoderOptionsBuilder = async ({ input, streamNu | |||
65 | 65 | ||
66 | logger.debug('Calculating audio bitrate of %s by AAC encoder.', input, { bitrate: parsedAudio.bitrate, audioCodecName }) | 66 | logger.debug('Calculating audio bitrate of %s by AAC encoder.', input, { bitrate: parsedAudio.bitrate, audioCodecName }) |
67 | 67 | ||
68 | if (bitrate !== undefined && bitrate !== -1) { | 68 | if (bitrate !== -1) { |
69 | return { outputOptions: [ buildStreamSuffix('-b:a', streamNum), bitrate + 'k' ] } | 69 | return { outputOptions: [ buildStreamSuffix('-b:a', streamNum), bitrate + 'k' ] } |
70 | } | 70 | } |
71 | 71 | ||