make spoilers use the same thing as strip filename, duh

merge-requests/208/head
Thomas Lynch 4 years ago
parent b2f84350bf
commit 7c150836df
  1. 2
      models/forms/makepost.js
  2. 12
      views/mixins/uploaditem.pug

@ -236,7 +236,7 @@ ${res.locals.numFiles > 0 ? req.files.file.map(f => f.name+'|'+(f.phash || '')).
//get metadata //get metadata
let processedFile = { 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, hash: file.sha256,
filename: file.filename, //could probably remove since we have hash and extension 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, originalFilename: req.body.strip_filename && req.body.strip_filename.includes(file.sha256) ? file.filename : file.name,

@ -4,12 +4,12 @@ mixin uploaditem(item)
img.upload-thumb(src=item.url) img.upload-thumb(src=item.url)
p #{item.name} p #{item.name}
a.close X a.close X
.row.sb if item.hash
if item.spoilers .row.sb
label if item.spoilers
input(type='checkbox', name='spoiler', value=item.name) label
| Spoiler input(type='checkbox', name='spoiler', value=item.hash)
if item.hash | Spoiler
label label
input(type='checkbox', name='strip_filename', value=item.hash) input(type='checkbox', name='strip_filename', value=item.hash)
| Strip Filename | Strip Filename

Loading…
Cancel
Save