all events after 18 are now pub events

crawler.py

@@ -76,40 +76,63 @@ def send_to_discord_webhook(data, webhook_url):
         except requests.exceptions.HTTPError as e:
             print(f"Discord webhook error: {e}\nPayload: {payload}")
             return None
-    # Send data in batches of up to 40 events per message
+    # Group events
-    batch_size = 40
+    pub_keywords = ['pub', "wermlandskällar’n", 'orvars krog']
-    total_batches = (len(data) + batch_size - 1) // batch_size
+    def is_pub_event(e):
-    for i in range(0, len(data), batch_size):
+        # Keyword match
-        batch = data[i:i+batch_size]
+        if any(k in e['event'].lower() for k in pub_keywords):
-        content = f"Nationer Öppna Idag (batch {i//batch_size+1}/{total_batches}):\n"
+            return True
-        for item in batch:
+        # Time match: look for start time after 18:00
+        import re
+        time_match = re.search(r'(\d{2}):(\d{2})', e.get('open_time', ''))
+        if time_match:
+            hour = int(time_match.group(1))
+            if hour >= 18:
+                return True
+        return False
+    pub_events = [e for e in data if is_pub_event(e)]
+    other_events = [e for e in data if not is_pub_event(e)]
+    # Format as plain grouped messages
+    def format_batch(events, title):
+        content = f"**{title}**\n"
+        for item in events:
             content += f"**{item['nation']}**\nEvent: {item['event']}\nTid: {item['open_time']}\n---\n"
         # Discord message limit is 2000 characters
         if len(content) > 1900:
             content = content[:1900] + "... (truncated)"
-        payload = {"content": content}
+        return content
+    # Do not send non-pub events to Discord
+    # Send pub events second, as normal message
+    if pub_events:
+        payload = {"content": format_batch(pub_events, "Pub-aktiviteter")}
         try:
             response = requests.post(webhook_url, json=payload)
             response.raise_for_status()
-            print(f"Sent batch {i//batch_size+1} to Discord.")
+            print("Sent pub batch to Discord.")
         except requests.exceptions.HTTPError as e:
             print(f"Discord webhook error: {e}\nPayload: {payload}")
 
 
 def main():
     nationer_data = fetch_nationer_open_times(NATIONER_URL)
-    if nationer_data:
+    send_to_discord_webhook(nationer_data, DISCORD_WEBHOOK_URL)
-        send_to_discord_webhook(nationer_data, DISCORD_WEBHOOK_URL)
-    else:
-        send_to_discord_webhook([
-            {"nation": "Inga aktiviteter hittades.", "event": "", "open_time": ""}
-        ], DISCORD_WEBHOOK_URL)
 
 
 if __name__ == "__main__":
     import time
-    while True:
+    import datetime
-        main()
+
-        print("Sleeping for 24 hours...")
+    # Run once immediately
-        time.sleep(86400)
+    main()
+    print("First run complete. Scheduling next runs at 00:05 daily.")
+    while True:
+        now = datetime.datetime.now()
+        # Calculate next 00:05
+        next_run = now.replace(hour=0, minute=5, second=0, microsecond=0)
+        if now >= next_run:
+            next_run += datetime.timedelta(days=1)
+        sleep_seconds = (next_run - now).total_seconds()
+        print(f"Sleeping until next run at {next_run.strftime('%Y-%m-%d %H:%M:%S')} ({int(sleep_seconds)} seconds)")
+        time.sleep(sleep_seconds)
+        main()
 

events_debug.json

@@ -11,18 +11,18 @@
     "open_time": "Idag 08:00-10:00",
     "permalink": "https://www.nationsguiden.se/events/event/frukost-i-majs-cafe/"
   },
-  {
-    "event": "Studieplatser – Södermanlands-Nerikes Nationsbibliotek",
-    "nation": "Södermanlands-Nerikes nation",
-    "open_time": "Idag 08:00-19:00",
-    "permalink": "https://www.nationsguiden.se/events/event/studieplatser-sodermanlands-nerikes-nationsbibliotek/"
-  },
   {
     "event": "Studieplatser och bibliotek på Norrlands nation",
     "nation": "Norrlands nation",
     "open_time": "Idag 08:00-20:00",
     "permalink": "https://www.nationsguiden.se/events/event/studieplatser-och-bibliotek-pa-norrlands-nation-2/"
   },
+  {
+    "event": "Studieplatser – Södermanlands-Nerikes Nationsbibliotek",
+    "nation": "Södermanlands-Nerikes nation",
+    "open_time": "Idag 08:00-19:00",
+    "permalink": "https://www.nationsguiden.se/events/event/studieplatser-sodermanlands-nerikes-nationsbibliotek/"
+  },
   {
     "event": "Studieplatser",
     "nation": "Smålands nation",
@@ -36,10 +36,10 @@
     "permalink": "https://www.nationsguiden.se/events/event/pluggfika/"
   },
   {
-    "event": "Studieplatser på Göteborgs Nation",
+    "event": "Studieplatser på Västmanlands-Dala nation",
-    "nation": "Göteborgs nation",
+    "nation": "Västmanlands-Dala nation",
-    "open_time": "Idag 10:00-17:00",
+    "open_time": "Idag 10:00-18:00",
-    "permalink": "https://www.nationsguiden.se/events/event/studieplatser-pa-goteborgs-nation/"
+    "permalink": "https://www.nationsguiden.se/events/event/studieplatser-pa-vastmanlands-dala-nation/"
   },
   {
     "event": "Studieplatser",
@@ -47,18 +47,18 @@
     "open_time": "Idag 10:00-17:00",
     "permalink": "https://www.nationsguiden.se/events/event/studieplatser-4/"
   },
+  {
+    "event": "Studieplatser på Göteborgs Nation",
+    "nation": "Göteborgs nation",
+    "open_time": "Idag 10:00-17:00",
+    "permalink": "https://www.nationsguiden.se/events/event/studieplatser-pa-goteborgs-nation/"
+  },
   {
     "event": "Studieplatser",
     "nation": "Gästrike-Hälsinge nation",
     "open_time": "Idag 10:00-18:00",
     "permalink": "https://www.nationsguiden.se/events/event/studieplatser-2/"
   },
-  {
-    "event": "Studieplatser på Västmanlands-Dala nation",
-    "nation": "Västmanlands-Dala nation",
-    "open_time": "Idag 10:00-18:00",
-    "permalink": "https://www.nationsguiden.se/events/event/studieplatser-pa-vastmanlands-dala-nation/"
-  },
   {
     "event": "Library",
     "nation": "Uplands nation",
@@ -83,24 +83,12 @@
     "open_time": "Idag 17:00-18:00",
     "permalink": "https://www.nationsguiden.se/events/event/bibliotekets-lanetider/"
   },
-  {
-    "event": "Uplands nation – Office hours 1Q",
-    "nation": "Uplands nation",
-    "open_time": "Idag 10:00-12:00",
-    "permalink": "https://www.nationsguiden.se/events/event/uplands-nation-office-hours-1q-3/"
-  },
   {
     "event": "Mottagningstid 1Q & 3Q",
     "nation": "Gästrike-Hälsinge nation",
     "open_time": "Idag 11:00-13:00",
     "permalink": "https://www.nationsguiden.se/events/event/mottagningstid-1q-3q/"
   },
-  {
-    "event": "Mottagningstider på Göteborgs Nation",
-    "nation": "Göteborgs nation",
-    "open_time": "Idag 11:00-15:00",
-    "permalink": "https://www.nationsguiden.se/events/event/mottagningstider-pa-goteborgs-nation/"
-  },
   {
     "event": "Kanslitider på Norrlands nation",
     "nation": "Norrlands nation",
@@ -143,12 +131,6 @@
     "open_time": "Idag 11:00-14:00",
     "permalink": "https://www.nationsguiden.se/events/event/hattstugan/"
   },
-  {
-    "event": "Lunch på Stockholms nation",
-    "nation": "Stockholms nation",
-    "open_time": "Idag 11:30-13:15",
-    "permalink": "https://www.nationsguiden.se/events/event/lunch-pa-stockholms-nation/"
-  },
   {
     "event": "Lunch å Södermanlands-Nerikes nation",
     "nation": "Södermanlands-Nerikes nation",
@@ -156,10 +138,10 @@
     "permalink": "https://www.nationsguiden.se/events/event/lunch-a-sodermanlands-nerikes-nation/"
   },
   {
-    "event": "Lunch i Majs Café",
+    "event": "Lunch på Stockholms nation",
-    "nation": "Norrlands nation",
+    "nation": "Stockholms nation",
-    "open_time": "Idag 12:00-14:00",
+    "open_time": "Idag 11:30-13:15",
-    "permalink": "https://www.nationsguiden.se/events/event/lunch-i-majs-cafe/"
+    "permalink": "https://www.nationsguiden.se/events/event/lunch-pa-stockholms-nation/"
   },
   {
     "event": "Sopplunch",
@@ -167,6 +149,12 @@
     "open_time": "Idag 12:00-14:00",
     "permalink": "https://www.nationsguiden.se/events/event/sopplunch/"
   },
+  {
+    "event": "Lunch i Majs Café",
+    "nation": "Norrlands nation",
+    "open_time": "Idag 12:00-14:00",
+    "permalink": "https://www.nationsguiden.se/events/event/lunch-i-majs-cafe/"
+  },
   {
     "event": "Gotlands Pluggfika",
     "nation": "Gotlands nation",
@@ -209,18 +197,18 @@
     "open_time": "2025-11-11 18:00-01:00",
     "permalink": "https://www.nationsguiden.se/events/event/v-dala-puben/"
   },
-  {
-    "event": "Pub Bakfickan",
-    "nation": "Stockholms nation",
-    "open_time": "Idag 17:00-23:59",
-    "permalink": "https://www.nationsguiden.se/events/event/pub-bakfickan/"
-  },
   {
     "event": "Orvars Krog",
     "nation": "Norrlands nation",
     "open_time": "Idag 17:00-01:00",
     "permalink": "https://www.nationsguiden.se/events/event/orvars-krog/"
   },
+  {
+    "event": "Pub Bakfickan",
+    "nation": "Stockholms nation",
+    "open_time": "Idag 17:00-23:59",
+    "permalink": "https://www.nationsguiden.se/events/event/pub-bakfickan/"
+  },
   {
     "event": "Wermlandskällar’n | Värmlands nation",
     "nation": "Värmlands nation",
@@ -228,16 +216,10 @@
     "permalink": "https://www.nationsguiden.se/events/event/wermlandskallarn-varmlands-nation/"
   },
   {
-    "event": "Svantes Källare",
+    "event": "V-Dala Puben",
-    "nation": "Uplands nation",
+    "nation": "Västmanlands-Dala nation",
-    "open_time": "Idag 18:00-23:55",
+    "open_time": "Idag 18:00-01:00",
-    "permalink": "https://www.nationsguiden.se/events/event/svantes-kallare/"
+    "permalink": "https://www.nationsguiden.se/events/event/v-dala-puben/"
-  },
-  {
-    "event": "Pub Kronan",
-    "nation": "Kalmar nation",
-    "open_time": "Idag 18:00-23:59",
-    "permalink": "https://www.nationsguiden.se/events/event/pub-kronan-7/"
   },
   {
     "event": "Pub Djäknen",
@@ -246,10 +228,10 @@
     "permalink": "https://www.nationsguiden.se/events/event/pub-djaknen-2/"
   },
   {
-    "event": "V-Dala Puben",
+    "event": "Pub Kronan",
-    "nation": "Västmanlands-Dala nation",
+    "nation": "Kalmar nation",
-    "open_time": "Idag 18:00-01:00",
+    "open_time": "Idag 18:00-23:59",
-    "permalink": "https://www.nationsguiden.se/events/event/v-dala-puben/"
+    "permalink": "https://www.nationsguiden.se/events/event/pub-kronan-7/"
   },
   {
     "event": "Ghuben",
@@ -264,10 +246,10 @@
     "permalink": "https://www.nationsguiden.se/events/event/tages-kallare/"
   },
   {
-    "event": "PUB HYTTAN – Smålands nation",
+    "event": "Svantes Källare",
-    "nation": "Smålands nation",
+    "nation": "Uplands nation",
-    "open_time": "Idag 18:00-23:30",
+    "open_time": "Idag 18:00-23:55",
-    "permalink": "https://www.nationsguiden.se/events/event/pub-hyttan/"
+    "permalink": "https://www.nationsguiden.se/events/event/svantes-kallare/"
   },
   {
     "event": "Glenns Pub",
@@ -275,6 +257,12 @@
     "open_time": "Idag 18:00-00:00",
     "permalink": "https://www.nationsguiden.se/events/event/glenns-pub/"
   },
+  {
+    "event": "PUB HYTTAN – Smålands nation",
+    "nation": "Smålands nation",
+    "open_time": "Idag 18:00-23:30",
+    "permalink": "https://www.nationsguiden.se/events/event/pub-hyttan/"
+  },
   {
     "event": "Pub Bakfickan",
     "nation": "Stockholms nation",
@@ -311,18 +299,18 @@
     "open_time": "Idag 18:00-20:00",
     "permalink": "https://www.nationsguiden.se/events/event/pubquiz-a-sodermanlands-nerikes-nation-2/"
   },
-  {
-    "event": "Yoga",
-    "nation": "Östgöta nation",
-    "open_time": "Idag 18:00-19:00",
-    "permalink": "https://www.nationsguiden.se/events/event/yoga/"
-  },
   {
     "event": "Löpning med VGIF",
     "nation": "",
     "open_time": "Idag 18:00-19:00",
     "permalink": "https://www.nationsguiden.se/events/event/lopning-med-vgif/"
   },
+  {
+    "event": "Yoga",
+    "nation": "Östgöta nation",
+    "open_time": "Idag 18:00-19:00",
+    "permalink": "https://www.nationsguiden.se/events/event/yoga/"
+  },
   {
     "event": "Y2K HEXAGON på Norrlands nation",
     "nation": "Norrlands nation",