diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-02-06 22:27:23 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-02-06 22:27:23 +0900 |
| commit | 41ba06a5e601f85a42baa14b9c5f92de0a8477ac (patch) | |
| tree | a998055819d4a262870f9912f0e797c30d04014d /src/server/web | |
| parent | Revert "余計なマージンを削除 (#4168)" (diff) | |
| download | sharkey-41ba06a5e601f85a42baa14b9c5f92de0a8477ac.tar.gz sharkey-41ba06a5e601f85a42baa14b9c5f92de0a8477ac.tar.bz2 sharkey-41ba06a5e601f85a42baa14b9c5f92de0a8477ac.zip | |
Fix bug
Diffstat (limited to 'src/server/web')
| -rw-r--r-- | src/server/web/index.ts | 10 | ||||
| -rw-r--r-- | src/server/web/views/note.pug | 2 | ||||
| -rw-r--r-- | src/server/web/views/user.pug | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/server/web/index.ts b/src/server/web/index.ts index afb05923cd..3f2e1ed19f 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -143,7 +143,11 @@ router.get('/@:user', async (ctx, next) => { }); if (user != null) { - await ctx.render('user', { user }); + const meta = await fetchMeta(); + await ctx.render('user', { + user, + instanceName: meta.name + }); ctx.set('Cache-Control', 'public, max-age=180'); } else { // リモートユーザーなので @@ -179,9 +183,11 @@ router.get('/notes/:note', async ctx => { if (note) { const _note = await packNote(note); + const meta = await fetchMeta(); await ctx.render('note', { note: _note, - summary: getNoteSummary(_note) + summary: getNoteSummary(_note), + instanceName: meta.name }); if (['public', 'home'].includes(note.visibility)) { diff --git a/src/server/web/views/note.pug b/src/server/web/views/note.pug index 2d07aff2ed..782a32a504 100644 --- a/src/server/web/views/note.pug +++ b/src/server/web/views/note.pug @@ -6,7 +6,7 @@ block vars - const url = `${config.url}/notes/${note.id}`; block title - = `${title} | ${config.name}` + = `${title} | ${instanceName}` block desc meta(name='description' content= summary) diff --git a/src/server/web/views/user.pug b/src/server/web/views/user.pug index 7810a8b9b2..04109c687b 100644 --- a/src/server/web/views/user.pug +++ b/src/server/web/views/user.pug @@ -6,7 +6,7 @@ block vars - const img = user.avatarUrl || null; block title - = `${title} | ${config.name}` + = `${title} | ${instanceName}` block desc meta(name='description' content= user.description) |