summaryrefslogtreecommitdiff
path: root/src/server/web
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-08-16 14:16:19 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-08-16 14:16:19 +0900
commited8b073e548938174406bf7d00a6490124d5cc2b (patch)
treedd1dd487661bef0eaaa3278a8aec32031bc992fe /src/server/web
parentFix #5260 (diff)
downloadsharkey-ed8b073e548938174406bf7d00a6490124d5cc2b.tar.gz
sharkey-ed8b073e548938174406bf7d00a6490124d5cc2b.tar.bz2
sharkey-ed8b073e548938174406bf7d00a6490124d5cc2b.zip
タイトルやアイコンがきちんと設定されないことがあるのを修正 (#5265)
* Fix: og:site_nameがbase系ページに正しく反映さんれない * instanceNameはAPIのmetaじゃなくてog:site_nameを参照するように * Fix: タイトルが変更されるページから通常ページに遷移してもタイトルが戻らない * Fix: タイトルが戻らない mobile / notifications * Fix: faviconの変更が効かないページがある
Diffstat (limited to 'src/server/web')
-rw-r--r--src/server/web/index.ts7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index 6c41bbde46..50f006e345 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -164,7 +164,8 @@ router.get('/@:user', async (ctx, next) => {
await ctx.render('user', {
user, profile, me,
- instanceName: meta.name || 'Misskey'
+ instanceName: meta.name || 'Misskey',
+ icon: meta.iconUrl
});
ctx.set('Cache-Control', 'public, max-age=30');
} else {
@@ -197,7 +198,8 @@ router.get('/notes/:note', async ctx => {
await ctx.render('note', {
note: _note,
summary: getNoteSummary(_note),
- instanceName: meta.name || 'Misskey'
+ instanceName: meta.name || 'Misskey',
+ icon: meta.iconUrl
});
if (['public', 'home'].includes(note.visibility)) {
@@ -283,6 +285,7 @@ router.get('*', async ctx => {
await ctx.render('base', {
img: meta.bannerUrl,
title: meta.name || 'Misskey',
+ instanceName: meta.name || 'Misskey',
desc: meta.description,
icon: meta.iconUrl
});