From 014440850014ee86d766bb07467c2970b17a1fc6 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 25 Nov 2020 21:31:34 +0900 Subject: nanka iroiro (#6853) * wip * Update maps.ts * wip * wip * wip * wip * Update base.vue * wip * wip * wip * wip * Update link.vue * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update privacy.vue * wip * wip * wip * wip * Update range.vue * wip * wip * wip * wip * Update profile.vue * wip * Update a.vue * Update index.vue * wip * Update sidebar.vue * wip * wip * Update account-info.vue * Update a.vue * wip * wip * Update sounds.vue * wip * wip * wip * wip * wip * wip * wip * wip * Update account-info.vue * Update account-info.vue * wip * wip * wip * Update d-persimmon.json5 * wip --- src/server/web/index.ts | 6 ++++++ src/server/web/views/clip.pug | 3 +++ src/server/web/views/note.pug | 6 +++--- src/server/web/views/page.pug | 3 +++ src/server/web/views/user.pug | 6 +++--- 5 files changed, 18 insertions(+), 6 deletions(-) (limited to 'src/server/web') diff --git a/src/server/web/index.ts b/src/server/web/index.ts index 0bc9f242ad..468ece5359 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -242,9 +242,11 @@ router.get('/notes/:note', async ctx => { if (note) { const _note = await Notes.pack(note); + const profile = await UserProfiles.findOne(note.userId).then(ensure); const meta = await fetchMeta(); await ctx.render('note', { note: _note, + profile, // TODO: Let locale changeable by instance setting summary: getNoteSummary(_note, locales['ja-JP']), instanceName: meta.name || 'Misskey', @@ -280,9 +282,11 @@ router.get('/@:user/pages/:page', async ctx => { if (page) { const _page = await Pages.pack(page); + const profile = await UserProfiles.findOne(page.userId).then(ensure); const meta = await fetchMeta(); await ctx.render('page', { page: _page, + profile, instanceName: meta.name || 'Misskey' }); @@ -307,9 +311,11 @@ router.get('/clips/:clip', async ctx => { if (clip) { const _clip = await Clips.pack(clip); + const profile = await UserProfiles.findOne(clip.userId).then(ensure); const meta = await fetchMeta(); await ctx.render('clip', { clip: _clip, + profile, instanceName: meta.name || 'Misskey' }); diff --git a/src/server/web/views/clip.pug b/src/server/web/views/clip.pug index 8cd1c673ed..8de53f19d6 100644 --- a/src/server/web/views/clip.pug +++ b/src/server/web/views/clip.pug @@ -19,6 +19,9 @@ block og meta(property='og:image' content= user.avatarUrl) block meta + if profile.noCrawle + meta(name='robots' content='noindex') + meta(name='misskey:user-username' content=user.username) meta(name='misskey:user-id' content=user.id) meta(name='misskey:clip-id' content=clip.id) diff --git a/src/server/web/views/note.pug b/src/server/web/views/note.pug index 0580e959f7..7030936975 100644 --- a/src/server/web/views/note.pug +++ b/src/server/web/views/note.pug @@ -19,6 +19,9 @@ block og meta(property='og:image' content= user.avatarUrl) block meta + if user.host || profile.noCrawle + meta(name='robots' content='noindex') + meta(name='misskey:user-username' content=user.username) meta(name='misskey:user-id' content=user.id) meta(name='misskey:note-id' content=note.id) @@ -26,9 +29,6 @@ block meta meta(name='twitter:card' content='summary') // todo - if user.host - meta(name='robots' content='noindex') - if user.twitter meta(name='twitter:creator' content=`@${user.twitter.screenName}`) diff --git a/src/server/web/views/page.pug b/src/server/web/views/page.pug index 55f64ff054..cb9e1039e1 100644 --- a/src/server/web/views/page.pug +++ b/src/server/web/views/page.pug @@ -19,6 +19,9 @@ block og meta(property='og:image' content= page.eyeCatchingImage ? page.eyeCatchingImage.thumbnailUrl : user.avatarUrl) block meta + if profile.noCrawle + meta(name='robots' content='noindex') + meta(name='misskey:user-username' content=user.username) meta(name='misskey:user-id' content=user.id) meta(name='misskey:page-id' content=page.id) diff --git a/src/server/web/views/user.pug b/src/server/web/views/user.pug index d41b0bbac0..1a8a6b4413 100644 --- a/src/server/web/views/user.pug +++ b/src/server/web/views/user.pug @@ -19,14 +19,14 @@ block og meta(property='og:image' content= img) block meta + if user.host || profile.noCrawle + meta(name='robots' content='noindex') + meta(name='misskey:user-username' content=user.username) meta(name='misskey:user-id' content=user.id) meta(name='twitter:card' content='summary') - if user.host - meta(name='robots' content='noindex') - if profile.twitter meta(name='twitter:creator' content=`@${profile.twitter.screenName}`) -- cgit v1.2.3-freya