feat(notifications): Add goup names to notification responses

Author: ImMohammad20000

app/models/user.py

@@ -101,6 +101,7 @@ class UserNotificationResponse(User):
     online_at: dt | None = Field(default=None)
     subscription_url: str = Field(default="")
     admin: AdminContactInfo | None = Field(default=None)
+    group_names: list[str] | None = Field(default_factory=list)
     model_config = ConfigDict(from_attributes=True)
 
     @field_validator("used_traffic", "lifetime_used_traffic", "data_limit", mode="before")
@@ -110,7 +111,8 @@ def cast_to_int(cls, v):
 
 
 class UserResponse(UserNotificationResponse):
-    admin: AdminBase | None = None
+    admin: AdminBase | None = Field(default=None)
+    group_names: list[str] | None = Field(default=None, exclude=True)
 
 
 class SubscriptionUserResponse(UserResponse):

app/notification/discord/messages.py

@@ -52,6 +52,7 @@
     + "**Data Limit**: {data_limit}\n"
     + "**Expire Date:** {expire_date}\n"
     + "**Data Limit Reset Strategy:** {data_limit_reset_strategy}\n"
+    + "**Groups:** {groups}\n"
     + "**Has Next Plan**: {has_next_plan}",
     "footer": {"text": "Belongs To:{admin_username}\nBy: {by}"},
 }
@@ -62,6 +63,7 @@
     + "**Data Limit**: {data_limit}\n"
     + "**Expire Date:** {expire_date}\n"
     + "**Data Limit Reset Strategy:** {data_limit_reset_strategy}\n"
+    + "**Groups:** {groups}\n"
     + "**Has Next Plan**: {has_next_plan}",
     "footer": {"text": "Belongs To:{admin_username}\nBy: {by}"},
 }

app/notification/discord/user.py

@@ -1,10 +1,10 @@
 import copy
 
-from app.notification.client import send_discord_webhook
-from app.models.user import UserNotificationResponse
-from app.utils.system import readable_size
 from app.models.settings import NotificationSettings
+from app.models.user import UserNotificationResponse
+from app.notification.client import send_discord_webhook
 from app.settings import notification_settings
+from app.utils.system import readable_size
 
 from . import colors, messages
 from .utils import escape_md_user
@@ -51,6 +51,7 @@ async def create_user(user: UserNotificationResponse, by: str):
         data_limit=readable_size(user.data_limit) if user.data_limit else "Unlimited",
         expire_date=user.expire if user.expire else "Never",
         data_limit_reset_strategy=user.data_limit_reset_strategy.value,
+        groups=", ".join(user.group_names),
         has_next_plan=bool(user.next_plan),
     )
     message["footer"]["text"] = message["footer"]["text"].format(admin_username=admin_username, by=by)
@@ -74,6 +75,7 @@ async def modify_user(user: UserNotificationResponse, by: str):
         data_limit=readable_size(user.data_limit) if user.data_limit else "Unlimited",
         expire_date=user.expire if user.expire else "Never",
         data_limit_reset_strategy=user.data_limit_reset_strategy.value,
+        groups=", ".join(user.group_names),
         has_next_plan=bool(user.next_plan),
     )
     message["footer"]["text"] = message["footer"]["text"].format(admin_username=admin_username, by=by)

app/notification/telegram/user.py

@@ -1,11 +1,11 @@
-from app.notification.client import send_telegram_message
-from app.models.user import UserNotificationResponse
-from app.utils.system import readable_size
 from app.models.settings import NotificationSettings
+from app.models.user import UserNotificationResponse
+from app.notification.client import send_telegram_message
 from app.settings import notification_settings
+from app.utils.system import readable_size
 
-from .utils import escape_html_user
 from . import messages
+from .utils import escape_html_user
 
 _status = {
     "active": "<b>✅ #Activated</b>",
@@ -40,6 +40,7 @@ async def create_user(user: UserNotificationResponse, by: str):
         data_limit=readable_size(user.data_limit) if user.data_limit else "Unlimited",
         expire_date=user.expire if user.expire else "Never",
         data_limit_reset_strategy=user.data_limit_reset_strategy.value,
+        groups=", ".join(user.group_names),
         has_next_plan=bool(user.next_plan),
         admin_username=admin_username,
         by=by,
@@ -60,6 +61,7 @@ async def modify_user(user: UserNotificationResponse, by: str):
         data_limit=readable_size(user.data_limit) if user.data_limit else "Unlimited",
         expire_date=user.expire if user.expire else "Never",
         data_limit_reset_strategy=user.data_limit_reset_strategy.value,
+        groups=", ".join(user.group_names),
         has_next_plan=bool(user.next_plan),
         admin_username=admin_username,
         by=by,

app/operation/user.py

@@ -48,12 +48,11 @@
 )
 from app.node import node_manager
 from app.operation import BaseOperation, OperatorType
-from app.utils.logger import get_logger
-from app.utils.jwt import create_subscription_token
 from app.settings import subscription_settings
+from app.utils.jwt import create_subscription_token
+from app.utils.logger import get_logger
 from config import SUBSCRIPTION_PATH
 
-
 logger = get_logger("user-operation")