summaryrefslogtreecommitdiff
path: root/src/server/web
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-03-11 09:59:14 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-03-11 09:59:14 +0900
commite3e08843f16a9f0f2ff04c21072a253c413097cd (patch)
tree27e977557e3753e416225ea4efcbd7d09518d824 /src/server/web
parentリストのエクスポートをできるように (diff)
parentUpdate README.md [AUTOGEN] (#4467) (diff)
downloadmisskey-e3e08843f16a9f0f2ff04c21072a253c413097cd.tar.gz
misskey-e3e08843f16a9f0f2ff04c21072a253c413097cd.tar.bz2
misskey-e3e08843f16a9f0f2ff04c21072a253c413097cd.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/server/web')
-rw-r--r--src/server/web/url-preview.ts7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/server/web/url-preview.ts b/src/server/web/url-preview.ts
index 90c1a4930a..aed475e6ff 100644
--- a/src/server/web/url-preview.ts
+++ b/src/server/web/url-preview.ts
@@ -3,6 +3,8 @@ import * as request from 'request-promise-native';
import summaly from 'summaly';
import fetchMeta from '../../misc/fetch-meta';
import Logger from '../../services/logger';
+import config from '../../config';
+import { query } from '../../prelude/url';
const logger = new Logger('url-preview');
@@ -44,7 +46,10 @@ module.exports = async (ctx: Koa.BaseContext) => {
function wrap(url: string): string {
return url != null
? url.match(/^https?:\/\//)
- ? `https://images.weserv.nl/?url=${encodeURIComponent(url.replace(/^http:\/\//, '').replace(/^https:\/\//, 'ssl:'))}&w=200&h=200`
+ ? `${config.url}/proxy/preview.jpg?${query({
+ url,
+ preview: '1'
+ })}`
: url
: null;
}