From c2d7929391d18072b46e6f829c956fd8d99e4b80 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sat, 29 Aug 2020 08:56:32 +0900 Subject: Expose proxyAccountName (#6670) --- src/server/web/index.ts | 4 ++++ src/server/web/views/info.pug | 3 +++ 2 files changed, 7 insertions(+) (limited to 'src/server/web') diff --git a/src/server/web/index.ts b/src/server/web/index.ts index 18cd102eba..507ddac3ce 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -326,6 +326,9 @@ router.get('/info', async ctx => { const emojis = await Emojis.find({ where: { host: null } }); + + const proxyAccount = meta.proxyAccountId ? await Users.pack(meta.proxyAccountId).catch(() => null) : null; + await ctx.render('info', { version: config.version, machine: os.hostname(), @@ -339,6 +342,7 @@ router.get('/info', async ctx => { }, emojis: emojis, meta: meta, + proxyAccountName: proxyAccount ? proxyAccount.username : null, originalUsersCount: await Users.count({ host: null }), originalNotesCount: await Notes.count({ userHost: null }) }); diff --git a/src/server/web/views/info.pug b/src/server/web/views/info.pug index 4553d2e2b9..eed69fc99e 100644 --- a/src/server/web/views/info.pug +++ b/src/server/web/views/info.pug @@ -79,6 +79,9 @@ html td = meta.maintainerName | <#{meta.maintainerEmail}> + tr + th Proxy account name + td= proxyAccountName || '(none)' tr th System td= os -- cgit v1.2.3-freya