greylist

4shadoww · Jul 9, 2017 · 8714aad · 8714aad
1 parent a5047df
commit 8714aad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/conf/rules.json b/conf/rules.json
@@ -54,6 +54,7 @@
 	},
 	"greylist": {
 			"list_path": "Käyttäjä:VakauttajaBot/greylist.json",
+			"score": 1,
 			"expiry": 24
 	}
 }
diff --git a/core/rules/greylist.py b/core/rules/greylist.py
@@ -11,6 +11,7 @@ class YunoModule:
 	api = yapi.MWAPI
 	config = {
 		"expiry": 24,
+		"score": 1,
 		"list_path": "Käyttäjä:VakauttajaBot/greylist.json"
 	}
 	greylist = None
@@ -29,9 +30,10 @@ def run(self, rev):
 			self.greylist = json.loads(self.api.getText(self.config["list_path"]))
 			self.list_ver = lastrev
 
-		for user in self.greylist:
-			if user == rev["user"] and self.greylist[user] > score:
-				score = self.greylist[user]
+		for user in self.greylist["values"]:
+			if user == rev["user"]:
+				score = self.config["score"]
 				expiry = self.config["expiry"]
+				break
 
 		return score, expiry