summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-05-13 03:08:33 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-05-13 03:08:33 +0900
commit1836dd7312d9dca7944f166d0b749de326c538f1 (patch)
tree6133c983594652f4afc82ba1427f94bf51ee7ea4 /src/server
parentAdd note (diff)
parentMerge pull request #1576 from mei23/mei-preview (diff)
downloadmisskey-1836dd7312d9dca7944f166d0b749de326c538f1.tar.gz
misskey-1836dd7312d9dca7944f166d0b749de326c538f1.tar.bz2
misskey-1836dd7312d9dca7944f166d0b749de326c538f1.zip
Merge branch 'master' of https://github.com/syuilo/misskey
Diffstat (limited to 'src/server')
-rw-r--r--src/server/web/url-preview.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/web/url-preview.ts b/src/server/web/url-preview.ts
index 8a5e934b1d..cd53837a25 100644
--- a/src/server/web/url-preview.ts
+++ b/src/server/web/url-preview.ts
@@ -14,8 +14,8 @@ module.exports = async (ctx: Koa.Context) => {
function wrap(url: string): string {
return url != null
- ? url.startsWith('https://')
+ ? url.startsWith('https://') || url.startsWith('data:')
? url
- : `https://images.weserv.nl/?url=${url.replace(/^http:\/\//, '')}`
+ : `https://images.weserv.nl/?url=${encodeURIComponent(url.replace(/^http:\/\//, ''))}`
: null;
}