natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use proxy instead of weserv for url-preview images (#4466)

This commit is contained in:
MeiMei 2019-03-11 01:03:09 +09:00 committed by syuilo
parent c6cdfa2f5a
commit 4d425fc8a4
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/proxy/proxy-media.ts
View File

@ -6,7 +6,7 @@ import * as request from 'request';
import fileType from 'file-type'; import fileType from 'file-type';
import { serverLogger } from '..'; import { serverLogger } from '..';
import config from '../../config'; import config from '../../config';
import { IImage, ConvertToPng } from '../../services/drive/image-processor'; import { IImage, ConvertToPng, ConvertToJpeg } from '../../services/drive/image-processor';
import checkSvg from '../../misc/check-svg'; import checkSvg from '../../misc/check-svg';
export async function proxyMedia(ctx: Koa.BaseContext) { export async function proxyMedia(ctx: Koa.BaseContext) {
@ -29,6 +29,8 @@ export async function proxyMedia(ctx: Koa.BaseContext) {
if ('static' in ctx.query && ['image/png', 'image/gif'].includes(type)) { if ('static' in ctx.query && ['image/png', 'image/gif'].includes(type)) {
image = await ConvertToPng(path, 498, 280); image = await ConvertToPng(path, 498, 280);
} else if ('preview' in ctx.query && ['image/jpeg', 'image/png', 'image/gif'].includes(type)) {
image = await ConvertToJpeg(path, 200, 200);
} else { } else {
image = { image = {
data: fs.readFileSync(path), data: fs.readFileSync(path),

7
src/server/web/url-preview.ts
View File

@ -3,6 +3,8 @@ import * as request from 'request-promise-native';
import summaly from 'summaly'; import summaly from 'summaly';
import fetchMeta from '../../misc/fetch-meta'; import fetchMeta from '../../misc/fetch-meta';
import Logger from '../../services/logger'; import Logger from '../../services/logger';
import config from '../../config';
import { query } from '../../prelude/url';
const logger = new Logger('url-preview'); const logger = new Logger('url-preview');
@ -44,7 +46,10 @@ module.exports = async (ctx: Koa.BaseContext) => {
function wrap(url: string): string { function wrap(url: string): string {
return url != null return url != null
? url.match(/^https?:\/\//) ? 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 : url
: null; : null;
} }