From b8df980d408af8599a448cb1086701d107a28e1e Mon Sep 17 00:00:00 2001 From: Thomas Lynch Date: Fri, 17 Sep 2021 09:40:48 +0000 Subject: [PATCH] when hiding name from public logs, also hide in ban page to banned user. close #374 --- models/forms/addban.js | 1 + views/mixins/ban.pug | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/models/forms/addban.js b/models/forms/addban.js index e7658c06..4bbec8a1 100644 --- a/models/forms/addban.js +++ b/models/forms/addban.js @@ -24,6 +24,7 @@ module.exports = async (req, res, redirect) => { 'board': req.params.board || null, 'posts': null, 'issuer': req.session.user, + 'showUser': req.body.hide_name != null, 'date': actionDate, 'expireAt': new Date(actionDate.getTime() + (req.body.ban_duration || defaultBanDuration)), 'allowAppeal': req.body.no_appeal ? false : true, diff --git a/views/mixins/ban.pug b/views/mixins/ban.pug index e80a0524..bc862238 100644 --- a/views/mixins/ban.pug +++ b/views/mixins/ban.pug @@ -13,7 +13,7 @@ mixin ban(ban, banpage) - const ip = permLevel > ipHashPermLevel ? ban.ip.single.slice(-10) : ban.ip.raw; td #{ip} td #{ban.type} - td #{ban.issuer} + td #{(!banpage || ban.showUser === true) ? ban.issuer : 'Hidden User'} - const banDate = new Date(ban.date); td: time.right.reltime(datetime=banDate.toISOString()) #{banDate.toLocaleString(undefined, {hourCycle:'h23'})} - const expireDate = new Date(ban.expireAt);