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

feat: if an incoming remote message is too long, don't create the room, but notify the local recipients instead

Browse Source 
closes #13174
This commit is contained in:
Julian Lam
2025-03-07 15:26:00 -05:00
parent 2f9576556e
commit 885b83e509
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/language/en-GB/error.json
View File

@@ -194,6 +194,7 @@
"cant-add-users-to-chat-room": "Can't add users to chat room.", "cant-add-users-to-chat-room": "Can't add users to chat room.",
"cant-remove-users-from-chat-room": "Can't remove users from chat room.", "cant-remove-users-from-chat-room": "Can't remove users from chat room.",
"chat-room-name-too-long": "Chat room name too long. Names can't be longer than %1 characters.", "chat-room-name-too-long": "Chat room name too long. Names can't be longer than %1 characters.",
"remote-chat-received-too-long": "You received a chat message from %1, but it was too long and was rejected.",
"already-voting-for-this-post": "You have already voted for this post.", "already-voting-for-this-post": "You have already voted for this post.",
"reputation-system-disabled": "Reputation system is disabled.", "reputation-system-disabled": "Reputation system is disabled.",

15
src/activitypub/notes.js
View File

@@ -9,6 +9,7 @@ const meta = require('../meta');
const privileges = require('../privileges'); const privileges = require('../privileges');
const categories = require('../categories'); const categories = require('../categories');
const messaging = require('../messaging'); const messaging = require('../messaging');
const notifications = require('../notifications');
const user = require('../user'); const user = require('../user');
const topics = require('../topics'); const topics = require('../topics');
const posts = require('../posts'); const posts = require('../posts');
@@ -288,6 +289,20 @@ Notes.assertPrivate = async (object) => {
const payload = await activitypub.mocks.message(object); const payload = await activitypub.mocks.message(object);
try {
await messaging.checkContent(payload.content, false);
} catch (e) {
const { displayname, userslug } = await user.getUserFields(payload.uid, ['displayname', 'userslug']);
const notification = await notifications.create({
bodyShort: `[[error:remote-chat-received-too-long, ${displayname}]]`,
path: `/user/${userslug}`,
nid: `error:chat:uid:${payload.uid}`,
from: payload.uid,
});
notifications.push(notification, Array.from(recipients).filter(uid => utils.isNumber(uid)));
return null;
}
if (!roomId) { if (!roomId) {
roomId = await messaging.newRoom(payload.uid, { uids: [...recipients] }); roomId = await messaging.newRoom(payload.uid, { uids: [...recipients] });
} }