austnv/remnawave-minishop
1
0
Fork 0
Code Issues 1 Pull Requests Activity

Merge pull request #43 from machka-pasla/7ql8c7-codex/fix-webhook-without-telegramid-warning

Browse Source 
Fix webhook user extraction and notification logic
This commit is contained in:
Machka Pasla
2025-07-12 00:24:48 +07:00
committed by GitHub
parent fa321426b8 24c4bbc27e
commit d7fdcc25cd
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bot/services/panel_webhook_service.py
+4 -7
View File
@@ -47,7 +47,7 @@ class PanelWebhookService:
if event_name in EVENT_MAP: if event_name in EVENT_MAP:
days_left, msg_key = EVENT_MAP[event_name] days_left, msg_key = EVENT_MAP[event_name]
if days_left == self.settings.SUBSCRIPTION_NOTIFY_DAYS_BEFORE: if days_left <= self.settings.SUBSCRIPTION_NOTIFY_DAYS_BEFORE:
await self._send_message( await self._send_message(
user_id, user_id,
lang, lang,
@@ -78,12 +78,9 @@ class PanelWebhookService:
return web.Response(status=400, text="bad_request") return web.Response(status=400, text="bad_request")
event_name = payload.get("name") or payload.get("event") event_name = payload.get("name") or payload.get("event")
user_data = ( user_data = payload.get("payload") or payload.get("data", {})
payload.get("payload", {}).get("user") if isinstance(user_data, dict) and "user" in user_data:
or payload.get("payload", {}) user_data = user_data.get("user") or user_data
or payload.get("data", {}).get("user")
or payload.get("data", {})
)
if not event_name: if not event_name:
return web.Response(status=200, text="ok_no_event") return web.Response(status=200, text="ok_no_event")