From 3a315b594ae68494cde16bfe2a93bdd693af68cd Mon Sep 17 00:00:00 2001
From: Matthias Bilger <matthias@bilger.info>
Date: Fri, 17 Jan 2020 14:38:15 +0100
Subject: [PATCH] build message, send at one point

---
 bibcheck.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/bibcheck.py b/bibcheck.py
index 0c99cab..4707a85 100644
--- a/bibcheck.py
+++ b/bibcheck.py
@@ -55,16 +55,17 @@ def check(username, password, notify_ids):
             date = datetime.datetime.strptime(info[1], '%d.%m.%Y')
             delta = date - datetime.datetime.now()
             allinfo.append(str(info))
-            if (delta.days > 7 and delta.days <= 10) or delta.days == 20 or delta.days == 15:
+            if delta.days <= 10 or delta.days == 20 or delta.days == 15:
+                message = f'Bitte an {info[3]} denken\n' 
+                if delta.days <= 7:
+                    message += '<font color="#ff0000">'
+                message += 'Abgabe <b>{info[1]}</b>'
+                if delta.days <= 7:
+                    message += '</font>'
+                message += ' - {username}'
                 for client in itertools.chain(notify_ids, os.environ.get('PUSHOVER_CLIENTS', '').split(',')):
                     try:
-                    	pushover.Client(client).send_message(f'Bitte an {info[3]} denken, Abgabe <b>{info[1]}</b> - {username}', title="Erinnerung", html=1)
-                    except:
-                        print("No client")
-            if delta.days <= 7:
-                for client in itertools.chain(notify_ids, os.environ.get('PUSHOVER_CLIENTS', '').split(',')):
-                    try:
-                    	pushover.Client(client).send_message(f'Bitte an {info[3]} denken, <font color="#ff0000">Abgabe <b>{info[1]}</b></font> - {username}', title="Erinnerung", html=1)
+                        pushover.Client(client).send_message(message, title="Erinnerung", html=1)
                     except:
                         print("No client")
     except (StopIteration, mechanize._mechanize.LinkNotFoundError) as e: