aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornico <nico@magicbroccoli.de>2019-05-15 10:06:33 +0200
committernico <nico@magicbroccoli.de>2019-05-15 10:06:33 +0200
commit3dc1256dade898711a35c2191e4a9c242fa9922b (patch)
tree22f59ef9894c8ce69c0095b90e0393f6199230de
parent2b0a8051df94d998ff40a678823dd21a6991c4c4 (diff)
ingest correct delay tag
+ add filter for the delay tag search to prevent timestamp mixups
-rwxr-xr-xmain.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/main.py b/main.py
index 9df8739..cf59191 100755
--- a/main.py
+++ b/main.py
@@ -80,7 +80,12 @@ class AbuseReport:
(node, domain, resource) = match.groups()
# stamp
- spam_time = message_parsed.find('.//{urn:xmpp:delay}delay').get('stamp')
+ all_delay_tags = message_parsed.findall('.//{urn:xmpp:delay}delay')
+ for tag in all_delay_tags:
+ if "@" in tag.get("from"):
+ continue
+
+ spam_time = message_parsed.find('.//{urn:xmpp:delay}delay').get('stamp')
# body
spam_body = message_parsed.find('{jabber:client}body')