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

fix: limited visibility remote posts with greater scope than asserted roomId should add those users to the chat room, #12834

Browse Source
This commit is contained in:
Julian Lam
2024-10-08 16:28:42 -04:00
parent 8abfd951b2
commit 22931be1cc
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/activitypub/notes.js
View File

@@ -225,9 +225,11 @@ Notes.assertPrivate = async (object) => {
} }
// Compare room members with object recipients; if someone in-room is omitted, start new chat // Compare room members with object recipients; if someone in-room is omitted, start new chat
const participants = await messaging.getUsersInRoom(roomId, 0, -1);
const participantUids = participants.map(user => user.uid);
if (roomId) { if (roomId) {
const participants = await messaging.getUsersInRoom(roomId, 0, -1);
const omitted = participants.filter((user) => { const omitted = participants.filter((user) => {
// todo: this could use recipientsResolved
let { uid } = user; let { uid } = user;
uid = utils.isNumber(uid) ? `${nconf.get('url')}/uid/${uid}` : uid; uid = utils.isNumber(uid) ? `${nconf.get('url')}/uid/${uid}` : uid;
return !recipients.has(uid) && uid !== object.attributedTo; return !recipients.has(uid) && uid !== object.attributedTo;
@@ -250,6 +252,13 @@ Notes.assertPrivate = async (object) => {
timestamp = Date.now(); // otherwise message can't be seen in room as it pre-dates participants joining timestamp = Date.now(); // otherwise message can't be seen in room as it pre-dates participants joining
} }
// Add any new members to the chat
const added = Array.from(recipientsResolved).filter(uid => !participantUids.includes(uid));
const assertion = await activitypub.actors.assert(added);
if (assertion) {
await messaging.addUsersToRoom(object.attributedTo, added, roomId);
}
// Add message to room // Add message to room
await messaging.sendMessage({ await messaging.sendMessage({
mid: object.id, mid: object.id,