Node.js based forum software built for the modern web
feat(activitypub): include contentWarning in post summaries and teasers
Julian Lambfabeba668ae
diff --git a/src/controllers/accounts/posts.js b/src/controllers/accounts/posts.jsindex 1535ed0737..b824b46252 100644--- a/src/controllers/accounts/posts.js+++ b/src/controllers/accounts/posts.js@@ -63,7 +63,7 @@ const templateToData = {getTopics: async (sets, req, start, stop) => {let pids = await db.getSortedSetRevRangeByScore(sets, start, stop - start + 1, '+inf', 1);pids = await privileges.posts.filter('topics:read', pids, req.uid);- const postObjs = await posts.getPostSummaryByPids(pids, req.uid, { stripTags: false });+ const postObjs = await posts.getPostSummaryByPids(pids, req.uid, { stripTags: false, extraFields: ['contentWarning'] });return { posts: postObjs, nextStart: stop + 1 };},getItemCount: async (sets) => {@@ -82,7 +82,7 @@ const templateToData = {getTopics: async (sets, req, start, stop) => {let pids = await db.getSortedSetRangeByScore(sets, start, stop - start + 1, '-inf', -1);pids = await privileges.posts.filter('topics:read', pids, req.uid);- const postObjs = await posts.getPostSummaryByPids(pids, req.uid, { stripTags: false });+ const postObjs = await posts.getPostSummaryByPids(pids, req.uid, { stripTags: false, extraFields: ['contentWarning'] });return { posts: postObjs, nextStart: stop + 1 };},getItemCount: async (sets) => {diff --git a/src/controllers/accounts/profile.js b/src/controllers/accounts/profile.jsindex 94e5fc2987..dfa86fba78 100644--- a/src/controllers/accounts/profile.js+++ b/src/controllers/accounts/profile.js@@ -117,7 +117,7 @@ async function getPosts(callerUid, userData, setSuffix) {setSuffix,pids,}));- const p = await posts.getPostSummaryByPids(pids, callerUid, { stripTags: false });+ const p = await posts.getPostSummaryByPids(pids, callerUid, { stripTags: false, extraFields: ['contentWarning'] });postData.push(...p.filter(p => p && p.topic && (isAdmin ||diff --git a/src/controllers/activitypub/actors.js b/src/controllers/activitypub/actors.jsindex c9d9399a8b..eeb0b0529a 100644--- a/src/controllers/activitypub/actors.js+++ b/src/controllers/activitypub/actors.js@@ -109,7 +109,7 @@ Actors.note = async function (req, res, next) {const post = (await posts.getPostSummaryByPids([req.params.pid], activitypub._constants.uid, {parse: false,- extraFields: ['edited'],+ extraFields: ['edited', 'contentWarning'],})).pop();if (!post || post.timestamp > Date.now()) {return next();diff --git a/src/controllers/topics.js b/src/controllers/topics.jsindex e549f036d4..48e1aa2ee3 100644--- a/src/controllers/topics.js+++ b/src/controllers/topics.js@@ -435,7 +435,7 @@ topicsController.teaser = async function (req, res, next) {if (!pid) {return res.status(404).json('not-found');}- const postData = await posts.getPostSummaryByPids([pid], req.uid, { stripTags: false });+ const postData = await posts.getPostSummaryByPids([pid], req.uid, { stripTags: false, extraFields: ['contentWarning'] });if (!postData.length) {return res.status(404).json('not-found');}diff --git a/src/posts/index.js b/src/posts/index.jsindex 5fd958d03f..58f26e846a 100644--- a/src/posts/index.js+++ b/src/posts/index.js@@ -59,7 +59,7 @@ Posts.getPostsByPids = async function (pids, uid) {Posts.getPostSummariesFromSet = async function (set, uid, start, stop) {let pids = await db.getSortedSetRevRange(set, start, stop);pids = await privileges.posts.filter('topics:read', pids, uid);- const posts = await Posts.getPostSummaryByPids(pids, uid, { stripTags: false });+ const posts = await Posts.getPostSummaryByPids(pids, uid, { stripTags: false, extraFields: ['contentWarning'] });return { posts: posts, nextStart: stop + 1 };};diff --git a/src/topics/teaser.js b/src/topics/teaser.jsindex 92073803ca..8b25122e2d 100644--- a/src/topics/teaser.js+++ b/src/topics/teaser.js@@ -46,7 +46,7 @@ module.exports = function (Topics) {});const [allPostData, callerSettings] = await Promise.all([- posts.getPostsFields(teaserPids, ['pid', 'uid', 'timestamp', 'tid', 'content', 'sourceContent', 'deleted']),+ posts.getPostsFields(teaserPids, ['pid', 'uid', 'timestamp', 'tid', 'content', 'sourceContent', 'deleted', 'contentWarning']),user.getSettings(uid),]);let postData = allPostData.filter(post => post && post.pid && !post.deleted);