From 7c150836df64c36f479cc6abd480ecda64a51361 Mon Sep 17 00:00:00 2001 From: Thomas Lynch Date: Sun, 20 Dec 2020 20:17:55 +0000 Subject: [PATCH] make spoilers use the same thing as strip filename, duh --- models/forms/makepost.js | 2 +- views/mixins/uploaditem.pug | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/models/forms/makepost.js b/models/forms/makepost.js index 7fb756a0..e6bca830 100644 --- a/models/forms/makepost.js +++ b/models/forms/makepost.js @@ -236,7 +236,7 @@ ${res.locals.numFiles > 0 ? req.files.file.map(f => f.name+'|'+(f.phash || '')). //get metadata let processedFile = { - spoiler: (res.locals.permLevel >= 4 || userPostSpoiler) && req.body.spoiler && req.body.spoiler.includes(file.name), + spoiler: (res.locals.permLevel >= 4 || userPostSpoiler) && req.body.spoiler && req.body.spoiler.includes(file.sha256), hash: file.sha256, filename: file.filename, //could probably remove since we have hash and extension originalFilename: req.body.strip_filename && req.body.strip_filename.includes(file.sha256) ? file.filename : file.name, diff --git a/views/mixins/uploaditem.pug b/views/mixins/uploaditem.pug index 0b89d7f2..e20207f1 100644 --- a/views/mixins/uploaditem.pug +++ b/views/mixins/uploaditem.pug @@ -4,12 +4,12 @@ mixin uploaditem(item) img.upload-thumb(src=item.url) p #{item.name} a.close X - .row.sb - if item.spoilers - label - input(type='checkbox', name='spoiler', value=item.name) - | Spoiler - if item.hash + if item.hash + .row.sb + if item.spoilers + label + input(type='checkbox', name='spoiler', value=item.hash) + | Spoiler label input(type='checkbox', name='strip_filename', value=item.hash) | Strip Filename