diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-05-06 02:08:27 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-05-06 02:08:27 +0900 |
| commit | 650f79d0fdd63650cdab99debdb648d7cc49b5c9 (patch) | |
| tree | 03b556b2ca245d1b326386d61b8d5203c10b69ce /src/server | |
| parent | 2.3.0 (diff) | |
| download | sharkey-650f79d0fdd63650cdab99debdb648d7cc49b5c9.tar.gz sharkey-650f79d0fdd63650cdab99debdb648d7cc49b5c9.tar.bz2 sharkey-650f79d0fdd63650cdab99debdb648d7cc49b5c9.zip | |
Fix bugs
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/web/url-preview.ts | 4 | ||||
| -rw-r--r-- | src/server/web/views/note.pug | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/server/web/url-preview.ts b/src/server/web/url-preview.ts index d5464d0cd4..8a5e934b1d 100644 --- a/src/server/web/url-preview.ts +++ b/src/server/web/url-preview.ts @@ -14,6 +14,8 @@ module.exports = async (ctx: Koa.Context) => { function wrap(url: string): string { return url != null - ? `https://images.weserv.nl/?url=${url.replace(/^https?:\/\//, '')}` + ? url.startsWith('https://') + ? url + : `https://images.weserv.nl/?url=${url.replace(/^http:\/\//, '')}` : null; } diff --git a/src/server/web/views/note.pug b/src/server/web/views/note.pug index bc8dcdab8f..22f1834059 100644 --- a/src/server/web/views/note.pug +++ b/src/server/web/views/note.pug @@ -4,7 +4,6 @@ block vars - const user = note.user; - const title = user.name ? `${user.name} (@${user.username})` : `@${user.username}`; - const url = `${config.url}/notes/${note.id}`; - - const img = user.avatarId ? `${config.drive_url}/${user.avatarId}` : null; block title = `${title} | Misskey` @@ -18,7 +17,7 @@ block meta meta(property='og:title' content= title) meta(property='og:description' content= summary) meta(property='og:url' content= url) - meta(property='og:image' content= img) + meta(property='og:image' content= user.avatarUrl) if note.prev link(rel='prev' href=`${config.url}/notes/${note.prev}`) |