From 440cf139bb7d5998523ae29c0c5e6394f570bc6c Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 6 May 2018 01:34:48 +0900 Subject: メタ情報をレンダリングするように MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/web/views/note.pug | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/server/web/views/note.pug (limited to 'src/server/web/views/note.pug') diff --git a/src/server/web/views/note.pug b/src/server/web/views/note.pug new file mode 100644 index 0000000000..3107c0329c --- /dev/null +++ b/src/server/web/views/note.pug @@ -0,0 +1,20 @@ +extends ../../../../src/client/app/base + +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` + +block desc + meta(name='description' content= summary) + +block meta + meta(name='twitter:card' content='summary') + meta(property='og:title' content= title) + meta(property='og:description' content= summary) + meta(property='og:url' content= url) + meta(property='og:image' content= img) -- cgit v1.2.3-freya From 11716fa9d3abe67edf1e878a020cbb2cee71aa40 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 6 May 2018 01:37:32 +0900 Subject: Provide og:type --- src/server/web/views/note.pug | 1 + src/server/web/views/user.pug | 1 + 2 files changed, 2 insertions(+) (limited to 'src/server/web/views/note.pug') diff --git a/src/server/web/views/note.pug b/src/server/web/views/note.pug index 3107c0329c..faf0e5d730 100644 --- a/src/server/web/views/note.pug +++ b/src/server/web/views/note.pug @@ -14,6 +14,7 @@ block desc block meta meta(name='twitter:card' content='summary') + meta(property='og:type' content='article') meta(property='og:title' content= title) meta(property='og:description' content= summary) meta(property='og:url' content= url) diff --git a/src/server/web/views/user.pug b/src/server/web/views/user.pug index cdfacb32b4..b5ea2f6eb4 100644 --- a/src/server/web/views/user.pug +++ b/src/server/web/views/user.pug @@ -13,6 +13,7 @@ block desc block meta meta(name='twitter:card' content='summary') + meta(property='og:type' content='blog') meta(property='og:title' content= title) meta(property='og:description' content= user.description) meta(property='og:url' content= url) -- cgit v1.2.3-freya From 29ad7ab0cf1fc5d87d5ee3912356e6f330d43467 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 6 May 2018 01:43:53 +0900 Subject: Provide prev and next note link --- src/server/web/views/note.pug | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/server/web/views/note.pug') diff --git a/src/server/web/views/note.pug b/src/server/web/views/note.pug index faf0e5d730..8cb1d954da 100644 --- a/src/server/web/views/note.pug +++ b/src/server/web/views/note.pug @@ -19,3 +19,8 @@ block meta meta(property='og:description' content= summary) meta(property='og:url' content= url) meta(property='og:image' content= img) + + if note.prev + link(rel='prev' href=`${config.url}/notes/${note.prev.id}`) + if note.next + link(rel='next' href=`${config.url}/notes/${note.next.id}`) -- cgit v1.2.3-freya From c32c3c137028e32695a5464b7a7fc9faa3f13d96 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 6 May 2018 01:46:35 +0900 Subject: Fix bug --- src/models/note.ts | 4 ++-- src/server/web/views/note.pug | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/web/views/note.pug') diff --git a/src/models/note.ts b/src/models/note.ts index 3256a8c153..b2b93453e6 100644 --- a/src/models/note.ts +++ b/src/models/note.ts @@ -286,7 +286,7 @@ export const pack = async ( _id: -1 } }); - return prev ? prev._id : null; + return prev ? prev._id.toHexString() : null; })(); // Get next note info @@ -304,7 +304,7 @@ export const pack = async ( _id: 1 } }); - return next ? next._id : null; + return next ? next._id.toHexString() : null; })(); if (_note.replyId) { diff --git a/src/server/web/views/note.pug b/src/server/web/views/note.pug index 8cb1d954da..bc8dcdab8f 100644 --- a/src/server/web/views/note.pug +++ b/src/server/web/views/note.pug @@ -21,6 +21,6 @@ block meta meta(property='og:image' content= img) if note.prev - link(rel='prev' href=`${config.url}/notes/${note.prev.id}`) + link(rel='prev' href=`${config.url}/notes/${note.prev}`) if note.next - link(rel='next' href=`${config.url}/notes/${note.next.id}`) + link(rel='next' href=`${config.url}/notes/${note.next}`) -- cgit v1.2.3-freya From 650f79d0fdd63650cdab99debdb648d7cc49b5c9 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 6 May 2018 02:08:27 +0900 Subject: Fix bugs --- src/server/web/url-preview.ts | 4 +++- src/server/web/views/note.pug | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/server/web/views/note.pug') 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}`) -- cgit v1.2.3-freya