monkee.ch/monkeeShark
1
0
Fork 0
Code Pull requests Activity

Merge branch 'master' of https://github.com/syuilo/misskey

Browse source
This commit is contained in:
syuilo 2018-05-13 03:08:33 +09:00
commit 1836dd7312
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/app/common/views/components/url-preview.vue
View file

@ -45,7 +45,7 @@ export default Vue.extend({
} else if (url.hostname == 'youtu.be') { } else if (url.hostname == 'youtu.be') {
this.youtubeId = url.pathname; this.youtubeId = url.pathname;
} else { } else {
fetch('/url?url=' + this.url).then(res => { fetch('/url?url=' + encodeURIComponent(this.url)).then(res => {
res.json().then(info => { res.json().then(info => {
this.title = info.title; this.title = info.title;
this.description = info.description; this.description = info.description;

4
src/server/web/url-preview.ts
View file

@ -14,8 +14,8 @@ module.exports = async (ctx: Koa.Context) => {
function wrap(url: string): string { function wrap(url: string): string {
return url != null return url != null
? url.startsWith('https://') ? url.startsWith('https://') || url.startsWith('data:')
? url ? url
: `https://images.weserv.nl/?url=${url.replace(/^http:\/\//, '')}` : `https://images.weserv.nl/?url=${encodeURIComponent(url.replace(/^http:\/\//, ''))}`
: null; : null;
} }