summaryrefslogtreecommitdiff
path: root/src/server/web
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2020-08-29 08:56:32 +0900
committerGitHub <noreply@github.com>2020-08-29 08:56:32 +0900
commitc2d7929391d18072b46e6f829c956fd8d99e4b80 (patch)
tree6237d96b196909044ab85d8aa6948d68931926fe /src/server/web
parentUpdate create-notification.ts (diff)
downloadsharkey-c2d7929391d18072b46e6f829c956fd8d99e4b80.tar.gz
sharkey-c2d7929391d18072b46e6f829c956fd8d99e4b80.tar.bz2
sharkey-c2d7929391d18072b46e6f829c956fd8d99e4b80.zip
Expose proxyAccountName (#6670)
Diffstat (limited to 'src/server/web')
-rw-r--r--src/server/web/index.ts4
-rw-r--r--src/server/web/views/info.pug3
2 files changed, 7 insertions, 0 deletions
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
@@ -80,6 +80,9 @@ html
= meta.maintainerName
| &lt;#{meta.maintainerEmail}&gt;
tr
+ th Proxy account name
+ td= proxyAccountName || '(none)'
+ tr
th System
td= os
tr