Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-29 10:06:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #9398, crash on post flag

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-03-15 17:55:14 -04:00
parent 8d3ec23483
commit 90d64fe1df
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/flags.js
View File

@@ -440,7 +440,7 @@ Flags.create = async function (type, id, uid, reason, timestamp) {
await Promise.all(batched); await Promise.all(batched);
if (doHistoryAppend) { if (doHistoryAppend) {
Flags.update(flagId, uid, { state: 'open' }); await Flags.update(flagId, uid, { state: 'open' });
} }
const flagObj = await Flags.get(flagId); const flagObj = await Flags.get(flagId);
@@ -725,7 +725,7 @@ Flags.notify = async function (flagObj, uid) {
notifObj = await notifications.create({ notifObj = await notifications.create({
type: 'new-post-flag', type: 'new-post-flag',
bodyShort: `[[notifications:user_flagged_post_in, ${flagObj.reports[flagObj.reports.length - 1].reporter.username}, ${titleEscaped}]]`, bodyShort: `[[notifications:user_flagged_post_in, ${flagObj.reports[flagObj.reports.length - 1].reporter.username}, ${titleEscaped}]]`,
bodyLong: await plugins.hooks.fire('filter:parse.raw', flagObj.description), bodyLong: await plugins.hooks.fire('filter:parse.raw', String(flagObj.description || '')),
pid: flagObj.targetId, pid: flagObj.targetId,
path: `/flags/${flagObj.flagId}`, path: `/flags/${flagObj.flagId}`,
nid: `flag:post:${flagObj.targetId}`, nid: `flag:post:${flagObj.targetId}`,
@@ -738,7 +738,7 @@ Flags.notify = async function (flagObj, uid) {
notifObj = await notifications.create({ notifObj = await notifications.create({
type: 'new-user-flag', type: 'new-user-flag',
bodyShort: `[[notifications:user_flagged_user, ${flagObj.reports[flagObj.reports.length - 1].reporter.username}, ${flagObj.target.username}]]`, bodyShort: `[[notifications:user_flagged_user, ${flagObj.reports[flagObj.reports.length - 1].reporter.username}, ${flagObj.target.username}]]`,
bodyLong: await plugins.hooks.fire('filter:parse.raw', flagObj.description), bodyLong: await plugins.hooks.fire('filter:parse.raw', String(flagObj.description || '')),
path: `/flags/${flagObj.flagId}`, path: `/flags/${flagObj.flagId}`,
nid: `flag:user:${flagObj.targetId}`, nid: `flag:user:${flagObj.targetId}`,
from: uid, from: uid,

2
src/groups/index.js
View File

@@ -134,7 +134,7 @@ Groups.get = async function (groupName, options) {
if (!groupData) { if (!groupData) {
return null; return null;
} }
const descriptionParsed = await plugins.hooks.fire('filter:parse.raw', groupData.description); const descriptionParsed = await plugins.hooks.fire('filter:parse.raw', String(groupData.description || ''));
groupData.descriptionParsed = descriptionParsed; groupData.descriptionParsed = descriptionParsed;
groupData.members = members; groupData.members = members;
groupData.membersNextStart = stop + 1; groupData.membersNextStart = stop + 1;

2
src/messaging/index.js
View File

@@ -64,7 +64,7 @@ async function canGet(hook, callerUid, uid) {
} }
Messaging.parse = async (message, fromuid, uid, roomId, isNew) => { Messaging.parse = async (message, fromuid, uid, roomId, isNew) => {
const parsed = await plugins.hooks.fire('filter:parse.raw', message); const parsed = await plugins.hooks.fire('filter:parse.raw', String(message || ''));
let messageData = { let messageData = {
message: message, message: message,
parsed: parsed, parsed: parsed,