diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-05-18 15:34:38 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-18 15:34:38 +0900 |
| commit | 0d0c45a4cfa541c2d2d4abc2a332ee06ff8e89ef (patch) | |
| tree | bb848206ce941fdf784418ad18060522d51eec18 /src/server | |
| parent | New translations ja.yml (Korean) (diff) | |
| parent | 2.10.0 (diff) | |
| download | misskey-0d0c45a4cfa541c2d2d4abc2a332ee06ff8e89ef.tar.gz misskey-0d0c45a4cfa541c2d2d4abc2a332ee06ff8e89ef.tar.bz2 misskey-0d0c45a4cfa541c2d2d4abc2a332ee06ff8e89ef.zip | |
Merge branch 'master' into l10n_master
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/web/url-preview.ts | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/server/web/url-preview.ts b/src/server/web/url-preview.ts index cd53837a25..99ee2eaebd 100644 --- a/src/server/web/url-preview.ts +++ b/src/server/web/url-preview.ts @@ -2,14 +2,20 @@ import * as Koa from 'koa'; import summaly from 'summaly'; module.exports = async (ctx: Koa.Context) => { - const summary = await summaly(ctx.query.url); - summary.icon = wrap(summary.icon); - summary.thumbnail = wrap(summary.thumbnail); + try { + const summary = await summaly(ctx.query.url, { + followRedirects: false + }); + summary.icon = wrap(summary.icon); + summary.thumbnail = wrap(summary.thumbnail); - // Cache 7days - ctx.set('Cache-Control', 'max-age=604800, immutable'); + // Cache 7days + ctx.set('Cache-Control', 'max-age=604800, immutable'); - ctx.body = summary; + ctx.body = summary; + } catch (e) { + ctx.status = 500; + } }; function wrap(url: string): string { |