mirror of
https://github.com/wekan/wekan.git
synced 2026-02-09 01:34:21 +01:00
Fix Notifications from not allowed Boards.
Thanks to FK-PATZ3 and xet7 ! Fixes #6103
This commit is contained in:
parent
d6f9626a10
commit
0a92e896f8
2 changed files with 19 additions and 15 deletions
|
|
@ -387,13 +387,15 @@ Blaze.Template.registerHelper(
|
|||
const currentBoard = Utils.getCurrentBoard();
|
||||
if (!currentBoard)
|
||||
return HTML.Raw(sanitizeHTML(content));
|
||||
const knowedUsers = _.union(currentBoard.members.map(member => {
|
||||
const u = ReactiveCache.getUser(member.userId);
|
||||
if (u) {
|
||||
member.username = u.username;
|
||||
}
|
||||
return member;
|
||||
}), [...specialHandles]);
|
||||
const knowedUsers = _.union(currentBoard.members
|
||||
.filter(member => member.isActive)
|
||||
.map(member => {
|
||||
const u = ReactiveCache.getUser(member.userId);
|
||||
if (u) {
|
||||
member.username = u.username;
|
||||
}
|
||||
return member;
|
||||
}), [...specialHandles]);
|
||||
const mentionRegex = /\B@([\w.-]*)/gi;
|
||||
|
||||
let currentMention;
|
||||
|
|
|
|||
|
|
@ -203,14 +203,16 @@ if (Meteor.isServer) {
|
|||
let hasMentions = false; // Track if comment has @mentions
|
||||
if (board) {
|
||||
const comment = params.comment;
|
||||
const knownUsers = board.members.map((member) => {
|
||||
const u = ReactiveCache.getUser(member.userId);
|
||||
if (u) {
|
||||
member.username = u.username;
|
||||
member.emails = u.emails;
|
||||
}
|
||||
return member;
|
||||
});
|
||||
const knownUsers = board.members
|
||||
.filter((member) => member.isActive)
|
||||
.map((member) => {
|
||||
const u = ReactiveCache.getUser(member.userId);
|
||||
if (u) {
|
||||
member.username = u.username;
|
||||
member.emails = u.emails;
|
||||
}
|
||||
return member;
|
||||
});
|
||||
// Match @mentions including usernames with @ symbols (like email addresses)
|
||||
// Pattern matches: @username, @user@example.com, @"quoted username"
|
||||
const mentionRegex = /\B@(?:(?:"([\w.\s-]*)")|([\w.@-]+))/gi;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue