summaryrefslogtreecommitdiff
path: root/src/server/web
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-03-11 01:03:09 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-03-11 01:03:09 +0900
commit4d425fc8a47444952f8761b8e198adc602adec9d (patch)
tree9c8065980b9a3dacf1ce621a5aa1e3f27a06127f /src/server/web
parentIgnore 4xx references in AP (#4463) (diff)
downloadsharkey-4d425fc8a47444952f8761b8e198adc602adec9d.tar.gz
sharkey-4d425fc8a47444952f8761b8e198adc602adec9d.tar.bz2
sharkey-4d425fc8a47444952f8761b8e198adc602adec9d.zip
Use proxy instead of weserv for url-preview images (#4466)
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;
}