spam time-border

+ add time-borders to all queries

The JabberSpam manifesto states that the critical period for a server to be approved again is 14 days. Thus I adjusted all queries required for the report function to only count within these borders.

Though if a domain is specified without the report argument the time border is increased to 1 month to increase visibility.

misc:
+ add Codefactor badge

1 files changed, 5 insertions, 3 deletions

diff --git a/main.py b/main.py
index d885b7a..2156d6e 100755
--- a/main.py
+++ b/main.py
@@ -55,7 +55,8 @@ class AbuseReport:
 			for domain in self.domain:
 
 				sql_query = self.conn.execute('''SELECT COUNT(*) AS messages,COUNT(DISTINCT user) AS bots,domain, MIN(ts)
-							AS first,MAX(ts) AS last FROM spam WHERE domain = :domain;''',{"domain": domain}).fetchall()
+							AS first,MAX(ts) AS last FROM spam WHERE ts BETWEEN DATE('now','-1 months') AND DATE('now')
+							and domain = :domain;''',{"domain": domain}).fetchall()
 
 				# if specified domain is not listed yet, the resulting table will not show the domain name
 				# this ugly tuple 2 list swap prevents this
@@ -76,8 +77,9 @@ class AbuseReport:
 			if self.config.get_at("top10_view"):
 				result = self.conn.execute('''SELECT * FROM "top10"''').fetchall()
 			else:
-				result = self.conn.execute('''SELECT COUNT(*) AS messages,COUNT(DISTINCT user) AS bots,domain AS domain
-										FROM spam GROUP BY domain ORDER BY 1 DESC LIMIT 10''').fetchall()
+				result = self.conn.execute('''SELECT COUNT(*) AS messages, COUNT(DISTINCT user) AS bots, domain AS
+					domain FROM spam WHERE ts BETWEEN DATE('now','-14 days') AND DATE('now') GROUP BY 	domain
+					ORDER BY 1 DESC LIMIT 10;''').fetchall()
 
 		# tabelize data
 		spam_table = tabulate.tabulate(result, headers=["messages", "bots", "domain", "first seen", "last seen"],