Docker/planka
Docker/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-19 05:09:43 +02:00
Code Issues Releases Activity

ref: Little refactoring

Browse source
This commit is contained in:
Maksim Eltyshev 2025-06-06 12:34:09 +02:00
parent 585464eef3
commit 63de346b0e
8 changed files with 42 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

22
server/api/helpers/comments/create-one.js
View file

@ -6,13 +6,7 @@
const escapeMarkdown = require('escape-markdown');
const escapeHtml = require('escape-html');
const { formatTextWithMentions } = require('../../../utils/formatters');
const extractMentionedUserIds = (text) => {
const mentionRegex = /@\[.*?\]\((.*?)\)/g;
const matches = [...text.matchAll(mentionRegex)];
return matches.map((match) => match[1]);
};
const { extractMentionIds, formatTextWithMentions } = require('../../../utils/mentions');
const buildAndSendNotifications = async (services, board, card, comment, actorUser, t) => {
const markdownCardLink = `[${escapeMarkdown(card.name)}](${sails.config.custom.baseUrl}/cards/${card.id})`;
@ -99,18 +93,18 @@ module.exports = {
user: values.user,
});
let mentionedUserIds = extractMentionedUserIds(values.text);
let mentionUserIds = extractMentionIds(comment.text);
if (mentionedUserIds.length > 0) {
if (mentionUserIds.length > 0) {
const boardMemberUserIds = await sails.helpers.boards.getMemberUserIds(inputs.board.id);
mentionedUserIds = _.difference(
_.intersection(mentionedUserIds, boardMemberUserIds),
mentionUserIds = _.difference(
_.intersection(mentionUserIds, boardMemberUserIds),
comment.userId,
);
}
const mentionedUserIdsSet = new Set(mentionedUserIds);
const mentionUserIdsSet = new Set(mentionUserIds);
const cardSubscriptionUserIds = await sails.helpers.cards.getSubscriptionUserIds(
comment.cardId,
@ -123,7 +117,7 @@ module.exports = {
);
const notifiableUserIds = _.union(
mentionedUserIds,
mentionUserIds,
cardSubscriptionUserIds,
boardSubscriptionUserIds,
);
@ -134,7 +128,7 @@ module.exports = {
values: {
userId,
comment,
type: mentionedUserIdsSet.has(userId)
type: mentionUserIdsSet.has(userId)
? Notification.Types.MENTION_IN_COMMENT
: Notification.Types.COMMENT_CARD,
data: {