From 2770d37f163b40aa66a2e175c5cba38212acee35 Mon Sep 17 00:00:00 2001 From: AnthorNet Date: Thu, 28 Dec 2017 10:24:38 +0100 Subject: [PATCH] Update DuplicateMessages.py --- src/eddn/core/DuplicateMessages.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/eddn/core/DuplicateMessages.py b/src/eddn/core/DuplicateMessages.py index 7e067c1..252cbe8 100644 --- a/src/eddn/core/DuplicateMessages.py +++ b/src/eddn/core/DuplicateMessages.py @@ -48,9 +48,20 @@ class DuplicateMessages(Thread): del message['header']['softwareName'] # Prevent dupe with different software if message['header']['softwareVersion']: del message['header']['softwareVersion'] # Prevent dupe with different software version + if message['header']['uploaderID']: + del message['header']['uploaderID'] # Prevent dupe with different uploaderID + + # Convert starPos to avoid software modification in dupe messages + if message['message']['StarPos']: + if message['message']['StarPos'][0]: + message['message']['StarPos'][0] = round(message['message']['StarPos'][0] *32) /32 + if message['message']['StarPos'][1]: + message['message']['StarPos'][1] = round(message['message']['StarPos'][1] *32) /32 + if message['message']['StarPos'][2]: + message['message']['StarPos'][2] = round(message['message']['StarPos'][2] *32) /32 message = simplejson.dumps(message, sort_keys=True) # Ensure most duplicate messages will get the same key - key = hashlib.sha256(message).hexdigest() + key = hashlib.sha256(message).hexdigest() if key not in self.caches: self.caches[key] = datetime.utcnow()