From 7f52b2c5afb716049a7daf95e766292ffc7d8c28 Mon Sep 17 00:00:00 2001 From: Sosthene Date: Sun, 3 Aug 2025 21:10:22 +0200 Subject: [PATCH] [fix] Don't overwrite existing rules if admin is not subscribed --- src/app/api/idnot/UserController.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/api/idnot/UserController.ts b/src/app/api/idnot/UserController.ts index 0eb744c5..6792fd41 100644 --- a/src/app/api/idnot/UserController.ts +++ b/src/app/api/idnot/UserController.ts @@ -112,7 +112,9 @@ export default class UserController extends ApiController { }); if (!manageSubscriptionRules[0]) return; - payload.rules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || []; + // Merge subscription rules with existing rules instead of replacing them + const subscriptionRules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || []; + payload.rules = [...new Set([...payload.rules, ...subscriptionRules])]; isSubscribed = true; } @@ -173,7 +175,9 @@ export default class UserController extends ApiController { }); if (!manageSubscriptionRules[0]) return; - newUserPayload.rules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || []; + // Merge subscription rules with existing rules instead of replacing them + const subscriptionRules = manageSubscriptionRules[0].rules!.map((rule) => rule.name) || []; + newUserPayload.rules = [...new Set([...newUserPayload.rules, ...subscriptionRules])]; isSubscribed = true; }