Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

[WEB-2776] fix: restrict notifications (#6081)

Bavisetti Narayan42d6078f6076
diff --git a/apiserver/plane/bgtasks/notification_task.py b/apiserver/plane/bgtasks/notification_task.py
index 49dc46cb6c..e4a5417299 100644
--- a/apiserver/plane/bgtasks/notification_task.py
+++ b/apiserver/plane/bgtasks/notification_task.py
@@ -16,6 +16,7 @@ from plane.db.models import (
IssueComment,
IssueActivity,
UserNotificationPreference,
+ ProjectMember
)
# Third Party imports
@@ -94,6 +95,8 @@ def extract_mentions_as_subscribers(project_id, issue_id, mentions):
).exists()
and not Issue.objects.filter(
project_id=project_id, pk=issue_id, created_by_id=mention_id
+ ).exists() and ProjectMember.objects.filter(
+ project_id=project_id, member_id=mention_id, is_active=True
).exists()
):
project = Project.objects.get(pk=project_id)
@@ -243,6 +246,10 @@ def notifications(
new_mentions = get_new_mentions(
requested_instance=requested_data, current_instance=current_instance
)
+ new_mentions = list(ProjectMember.objects.filter(
+ project_id=project_id, member_id__in=new_mentions, is_active=True
+ ).values_list("member_id", flat=True))
+ new_mentions = [str(member_id) for member_id in new_mentions]
removed_mention = get_removed_mentions(
requested_instance=requested_data, current_instance=current_instance
)
@@ -286,7 +293,7 @@ def notifications(
# ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- #
issue_subscribers = list(
- IssueSubscriber.objects.filter(project_id=project_id, issue_id=issue_id)
+ IssueSubscriber.objects.filter(project_id=project_id, issue_id=issue_id, project__project_projectmember__is_active=True,)
.exclude(
subscriber_id__in=list(new_mentions + comment_mentions + [actor_id])
)
diff --git a/apiserver/plane/utils/issue_filters.py b/apiserver/plane/utils/issue_filters.py
index 01b2024e4a..1c9619890c 100644
--- a/apiserver/plane/utils/issue_filters.py
+++ b/apiserver/plane/utils/issue_filters.py
@@ -185,6 +185,7 @@ def filter_labels(params, issue_filter, method, prefix=""):
and params.get("labels") != "null"
):
issue_filter[f"{prefix}labels__in"] = params.get("labels")
+ issue_filter[f"{prefix}label_issue__deleted_at__isnull"] = True
return issue_filter