DinoPLayZ commited on
Commit
3d42032
·
verified ·
1 Parent(s): c05829b

Update main.py

Browse files
Files changed (1) hide show
  1. main.py +3 -21
main.py CHANGED
@@ -48,7 +48,6 @@ logger = logging.getLogger(__name__)
48
  # Email settings
49
  EMAIL_ADDRESS = os.getenv("EMAIL_ADDRESS", "")
50
  EVENT_EMAIL_RECIPIENT = os.getenv("EVENT_EMAIL_RECIPIENT", os.getenv("EMAIL_RECIPIENT", EMAIL_ADDRESS))
51
- FILTERED_EVENT_EMAIL_RECIPIENT = os.getenv("FILTERED_EVENT_EMAIL_RECIPIENT", EVENT_EMAIL_RECIPIENT)
52
  WARNING_EMAIL_RECIPIENT = os.getenv("WARNING_EMAIL_RECIPIENT", os.getenv("EMAIL_RECIPIENT", EMAIL_ADDRESS))
53
  EMAIL_PASSWORD = os.getenv("EMAIL_PASSWORD", "")
54
  BREVO_API_KEY = os.getenv("BREVO_API_KEY", "")
@@ -187,7 +186,7 @@ def send_email_message(subject: str, body: str, is_html=False, recipient=None):
187
  logger.error(f"Network/SMTP EXCEPTION: {e}")
188
  return False
189
 
190
- def send_event_alerts(events, recipient=None):
191
  if not events:
192
  return
193
 
@@ -336,10 +335,7 @@ def send_event_alerts(events, recipient=None):
336
  if event_name:
337
  subject = f"New Event: {event_name}"
338
 
339
- if recipient is None:
340
- recipient = EVENT_EMAIL_RECIPIENT
341
-
342
- send_email_message(subject, msg, is_html=True, recipient=recipient)
343
 
344
 
345
  # ==============================================================================
@@ -513,21 +509,7 @@ def process_tick():
513
  fast_duration = int(os.getenv("FAST_DURATION", "120"))
514
  FAST_MODE_UNTIL = time.time() + fast_duration
515
 
516
- # Send to general recipient
517
- send_event_alerts(new_events, recipient=EVENT_EMAIL_RECIPIENT)
518
- logger.info("General alert sent")
519
-
520
- # Filter events based on location
521
- filtered_events = []
522
- for ev in new_events:
523
- loc = (ev.get("location") or "").lower()
524
- if "dual mode" in loc or "hybrid mode" in loc or "online" in loc:
525
- filtered_events.append(ev)
526
-
527
- if filtered_events:
528
- send_event_alerts(filtered_events, recipient=FILTERED_EVENT_EMAIL_RECIPIENT)
529
- logger.info("Filtered mode alert sent")
530
-
531
  LAST_EVENT_ID = new_events[0]["id"]
532
  LAST_EVENT_CODE = new_events[0].get('event_code', LAST_EVENT_ID)
533
  save_state(LAST_EVENT_ID, LAST_EVENT_CODE)
 
48
  # Email settings
49
  EMAIL_ADDRESS = os.getenv("EMAIL_ADDRESS", "")
50
  EVENT_EMAIL_RECIPIENT = os.getenv("EVENT_EMAIL_RECIPIENT", os.getenv("EMAIL_RECIPIENT", EMAIL_ADDRESS))
 
51
  WARNING_EMAIL_RECIPIENT = os.getenv("WARNING_EMAIL_RECIPIENT", os.getenv("EMAIL_RECIPIENT", EMAIL_ADDRESS))
52
  EMAIL_PASSWORD = os.getenv("EMAIL_PASSWORD", "")
53
  BREVO_API_KEY = os.getenv("BREVO_API_KEY", "")
 
186
  logger.error(f"Network/SMTP EXCEPTION: {e}")
187
  return False
188
 
189
+ def send_event_alerts(events):
190
  if not events:
191
  return
192
 
 
335
  if event_name:
336
  subject = f"New Event: {event_name}"
337
 
338
+ send_email_message(subject, msg, is_html=True, recipient=EVENT_EMAIL_RECIPIENT)
 
 
 
339
 
340
 
341
  # ==============================================================================
 
509
  fast_duration = int(os.getenv("FAST_DURATION", "120"))
510
  FAST_MODE_UNTIL = time.time() + fast_duration
511
 
512
+ send_event_alerts(new_events)
 
 
 
 
 
 
 
 
 
 
 
 
 
 
513
  LAST_EVENT_ID = new_events[0]["id"]
514
  LAST_EVENT_CODE = new_events[0].get('event_code', LAST_EVENT_ID)
515
  save_state(LAST_EVENT_ID, LAST_EVENT_CODE)