added option to define separate ranges for bits

tomaae · Oct 5, 2019 · f86f99c · f86f99c
1 parent 54d92ac
commit f86f99c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/lib/cli.py b/lib/cli.py
@@ -104,13 +104,11 @@ def Start(self):
 			# Bits
 			#
 			if cmd == "5":
-				self.woofer.woofer_addtoqueue({
-						"message"    : random.SystemRandom().choice(self.woofer.settings.Messages['bits']),
-						"sender"     : "testname",
-						"bits"       : "1000",
-						"customtag"  : "bits",
-						"id"         : "bits"
-					})
+				self.woofer.woofer_bits({
+						"display-name" : "testname",
+						"bits"         : "1000",
+						"custom-tag"   : "bits"
+				})
 
 			#
 			# New chatter

diff --git a/lib/woofer.py b/lib/woofer.py
@@ -312,13 +312,22 @@ def woofer_subgift(self,jsonData):
 	#   woofer_bits
 	#---------------------------
 	def woofer_bits(self,jsonData):
-		# "bits_total"
+		# "bits", "bits_total"
+
+		customBitsId = 'bits'
+		customBitsMessage = random.SystemRandom().choice(self.settings.Messages['bits'])
+		for customBits in self.settings.CustomBits:
+			if int(jsonData['bits']) >= int(customBits['From']) and int(jsonData['bits']) <= int(customBits['To']):
+				customBitsId = customBits['Name']
+				if customBitsId in self.settings.Messages:
+					customBitsMessage = random.SystemRandom().choice(self.settings.Messages[customBitsId])
+
 		self.woofer_addtoqueue({
-			"message"    : random.SystemRandom().choice(self.settings.Messages['bits']),
+			"message"    : customBitsMessage,
 			"sender"     : jsonData['display-name'],
 			"bits"       : jsonData['bits'],
 			"customtag"  : jsonData['custom-tag'],
-			"id"         : 'bits'
+			"id"         : customBitsId
 		})
 		return
 

diff --git a/settings.json.default b/settings.json.default
@@ -164,5 +164,7 @@
     ],
     "Commands": {
     },
-    "NanoleafEnabled": false
+    "NanoleafEnabled": false,
+    "CustomBits": [
+    ]
 }