From 5a15eab4a0f930525cb0f7e97daefdd23113c929 Mon Sep 17 00:00:00 2001
From: Cody Hiar <cody@hiar.ca>
Date: Wed, 3 Feb 2021 15:23:15 -0700
Subject: fix the logging

---
 main.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'main.py')

diff --git a/main.py b/main.py
index e0ebcb9..f5fd103 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,6 @@
 """Slack stuff."""
-from datetime import datetime
 import os
+from datetime import datetime
 
 from mappings import Message, get_session
 from slack_sdk import WebClient
@@ -21,7 +21,7 @@ def fetch_results():
 
     # Write the results if
     if r.data["ok"]:
-        messages = r.data['messages']['matches']
+        messages = r.data["messages"]["matches"]
         write_to_database(messages)
         print("Archival Complete.")
     else:
@@ -32,16 +32,20 @@ def write_to_database(messages):
     """Write messages to database."""
     session = get_session()
     for msg in messages:
-        iid = msg["iid"]
-        if session.query(Message).filter(Message.iid == iid).count() != 0:
+        username = msg["username"]
+        timestamp = datetime.fromtimestamp(int(msg["ts"].split(".")[0]))
+        if session.query(Message).filter(Message.username == username).filter(Message.timestamp == timestamp).count() != 0:
             continue
-        session.add(Message(
-            iid=iid,
-            type=msg["type"],
-            username=msg["username"],
-            text=msg["text"],
-            timestamp=datetime.fromtimestamp(int(msg["ts"].split('.')[0]))
-        ))
+        print("New notification")
+        session.add(
+            Message(
+                iid=msg["iid"],
+                type=msg["type"],
+                username=username,
+                text=msg["text"],
+                timestamp=timestamp,
+            )
+        )
     session.commit()
 
 
-- 
cgit v1.2.3