Show content warnings
This commit is contained in:
@@ -342,6 +342,7 @@ exports.init = function (sbot, config) {
|
|||||||
pull(
|
pull(
|
||||||
pull.values(sort(links)),
|
pull.values(sort(links)),
|
||||||
paramap(addAuthorAbout, 8),
|
paramap(addAuthorAbout, 8),
|
||||||
|
paramap(addVoteMessage, 8),
|
||||||
paramap(addBlog, 8),
|
paramap(addBlog, 8),
|
||||||
paramap(addGatheringAbout, 8),
|
paramap(addGatheringAbout, 8),
|
||||||
format,
|
format,
|
||||||
@@ -383,8 +384,11 @@ exports.init = function (sbot, config) {
|
|||||||
function addVoteMessage(msg, cb) {
|
function addVoteMessage(msg, cb) {
|
||||||
if (msg.value.content.type == 'vote' && msg.value.content.vote && msg.value.content.vote.link[0] == '%')
|
if (msg.value.content.type == 'vote' && msg.value.content.vote && msg.value.content.vote.link[0] == '%')
|
||||||
getMsg(msg.value.content.vote.link, function (err, linkedMsg) {
|
getMsg(msg.value.content.vote.link, function (err, linkedMsg) {
|
||||||
|
var linkedC = linkedMsg && linkedMsg.value.content
|
||||||
if (linkedMsg)
|
if (linkedMsg)
|
||||||
msg.value.content.vote.linkedText = linkedMsg.value.content.text
|
msg.value.content.vote.linkedText =
|
||||||
|
(typeof linkedC.contentWarning === 'string' ? '[CW: ' + linkedC.contentWarning + '] ' : '') +
|
||||||
|
linkedC.text
|
||||||
cb(null, msg)
|
cb(null, msg)
|
||||||
})
|
})
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -578,7 +578,14 @@ function renderPost(opts, id, c) {
|
|||||||
content += 'Re: ' + h('a',
|
content += 'Re: ' + h('a',
|
||||||
{ href: '/' + encodeURIComponent(c.root) },
|
{ href: '/' + encodeURIComponent(c.root) },
|
||||||
c.root.substring(0, 10)).outerHTML + '<br>'
|
c.root.substring(0, 10)).outerHTML + '<br>'
|
||||||
s.innerHTML = content + marked(String(c.text), opts.marked)
|
var textHTML = marked(String(c.text), opts.marked)
|
||||||
|
if (typeof c.contentWarning === 'string') {
|
||||||
|
textHTML = h('details',
|
||||||
|
h('summary', 'Content warning: ' + c.contentWarning),
|
||||||
|
h('div', {innerHTML: textHTML})
|
||||||
|
).outerHTML
|
||||||
|
}
|
||||||
|
s.innerHTML = content + textHTML
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user