Fix mentions and notifications drawer.

Thanks to xet7 !

Fixes #6062,
fixes #6003,
fixes #5996,
fixes #5720,
fixes #5911,
fixes #5792,
fixes #5163,
fixes #4431,
fixes #4126,
fixes #3363,
fixes #3150
This commit is contained in:
Lauri Ojansivu 2026-01-14 21:02:10 +02:00
parent 0d5dd3082c
commit 20b5e2ab8f
14 changed files with 225 additions and 72 deletions

View file

@ -212,14 +212,13 @@ if (Meteor.isServer) {
});
const mentionRegex = /\B@(?:(?:"([\w.\s-]*)")|([\w.-]+))/gi; // including space in username
let currentMention;
while ((currentMention = mentionRegex.exec(comment)) !== null) {
/*eslint no-unused-vars: ["error", { "varsIgnorePattern": "[iI]gnored" }]*/
const [ignored, quoteduser, simple] = currentMention;
const username = quoteduser || simple;
if (username === params.user) {
// ignore commenter mention himself?
continue;
}
// Removed the check that prevented self-mentions from creating notifications
// Users can now mention themselves in comments to create notifications
if (activity.boardId && username === 'board_members') {
// mentions all board members
@ -335,8 +334,9 @@ if (Meteor.isServer) {
);
}
Notifications.getUsers(watchers).forEach((user) => {
// don't notify a user of their own behavior
if (user._id !== userId) {
// Don't notify a user of their own behavior, EXCEPT for self-mentions
const isSelfMention = (user._id === userId && title === 'act-atUserComment');
if (user._id !== userId || isSelfMention) {
Notifications.notify(user, title, description, params);
}
});

View file

@ -713,7 +713,7 @@ Users.attachSchema(
);
// Security helpers for user updates
export const USER_UPDATE_ALLOWED_EXACT = ['username', 'profile'];
export const USER_UPDATE_ALLOWED_EXACT = ['username', 'profile', 'modifiedAt'];
export const USER_UPDATE_ALLOWED_PREFIXES = ['profile.'];
export const USER_UPDATE_FORBIDDEN_PREFIXES = [
'services',
@ -729,24 +729,33 @@ export const USER_UPDATE_FORBIDDEN_PREFIXES = [
];
export function isUserUpdateAllowed(fields) {
return fields.every((f) =>
const result = fields.every((f) =>
USER_UPDATE_ALLOWED_EXACT.includes(f) || USER_UPDATE_ALLOWED_PREFIXES.some((p) => f.startsWith(p))
);
return result;
}
export function hasForbiddenUserUpdateField(fields) {
return fields.some((f) => USER_UPDATE_FORBIDDEN_PREFIXES.some((p) => f === p || f.startsWith(p + '.')));
const result = fields.some((f) => USER_UPDATE_FORBIDDEN_PREFIXES.some((p) => f === p || f.startsWith(p + '.')));
return result;
}
Users.allow({
update(userId, doc, fields /*, modifier */) {
// Only the owner can update, and only for allowed fields
if (!userId || doc._id !== userId) return false;
if (!Array.isArray(fields) || fields.length === 0) return false;
if (!userId || doc._id !== userId) {
return false;
}
if (!Array.isArray(fields) || fields.length === 0) {
return false;
}
// Disallow if any forbidden field present
if (hasForbiddenUserUpdateField(fields)) return false;
if (hasForbiddenUserUpdateField(fields)) {
return false;
}
// Allow only username and profile.*
return isUserUpdateAllowed(fields);
const allowed = isUserUpdateAllowed(fields);
return allowed;
},
remove(userId, doc) {
// Disable direct client-side user removal for security
@ -760,7 +769,8 @@ Users.allow({
// Deny any attempts to touch forbidden fields from client updates
Users.deny({
update(userId, doc, fields /*, modifier */) {
return hasForbiddenUserUpdateField(fields);
const denied = hasForbiddenUserUpdateField(fields);
return denied;
},
fetch: [],
});
@ -1770,6 +1780,7 @@ Users.mutations({
$addToSet: {
'profile.notifications': {
activity: activityId,
read: null,
},
},
};