Upgrade to version 1.2

consumerwordpress.py

@@ -12,9 +12,7 @@ class Config(BaseProxyConfig):
 	def do_update(self, helper: ConfigUpdateHelper) -> None:
 		helper.copy("command_prefix")
 		helper.copy("allowed_regions")
-		helper.copy("api_url")
-		helper.copy("api_user")
-		helper.copy("api_token")
+		helper.copy("region_configs")
 		helper.copy("send_reaction")
 
 class ConsumerWordpress(Plugin):
@@ -30,59 +28,76 @@ class ConsumerWordpress(Plugin):
 	# Get !command_name setting from config to register it
 	def get_command_name(self) -> str:
 		return self.config["command_prefix"]
-	
+		
 	# Checks if a sender if allowed to send for a particular region
-	def validateSender(self, region: str, sender: str):
-		# Check that config value exists
-		if not self.config["allowed_regions"]: return False
-		# Check that region is allowed
-		if not region in self.config["allowed_regions"]: return False
-		# All senders allowed for this region
-		if len(self.config["allowed_regions"][region]) == 0: return True
-		# Check that sender is allowed for region
-		if not sender in self.config["allowed_regions"][region]: return False
-		return True
+	def validate_sender(self, region: str, sender: str):
+		# Mautrix isn't documented, like at all, so I'm just gonna catch the
+		# error because IDK how to see if a map is inside a map.
+		try: allowed_list = self.config["allowed_regions"][region]
+		except: return False
+		
+		if allowed_list is None: return True # Empty list
+		if sender in allowed_list: return True
+		
+		# Sender not allowed in region config
+		return False
 	
-	# Does the necesary config checks for the given event
-	# Returns list of regions to process (strings)
-	# Currently just the specified region and "__global__"
-	def validateReport(self, evt: MessageEvent, message: str):
+	# Does the necessary config checks for the given event
+	# Returns list of recursive configs to process
+	def validate_report(self, evt: MessageEvent, message: str):
 		# Split command (minus !command_name) into tokens
 		tokens = message.split()
 		region = tokens[0].lower()
 		
 		# Each command must have a state/territory designation and a message
-		if len(tokens) < 2: return None
+		if len(tokens) < 2: return []
+		# And we must have self.config["region_configs"]
+		try: trashvariable = self.config["region_configs"]
+		except: return []
 		
-		if (self.validateSender("__global__", evt.sender)) or (self.validateSender(region, evt.sender)):
-			return [region]
+		configs = [] # To be returned
+		
+		allowed_globally = self.validate_sender("__global__", evt.sender)
+		allowed_region = self.validate_sender(region, evt.sender)
+		
+		# If user is allowed globally and/or for a region,
+		# the plugin should process both the region and __global__ configs
+		if allowed_globally or allowed_region:
+			for i in ["__global__", region]:
+				try: configs.append(self.config["region_configs"][i])
+				except: trashvariable = None
+		
+		return configs
 	
 	# What gets called when !command_name message is sent
 	@command.new(name=get_command_name, help="Report Something")
 	@command.argument("message", pass_raw=True)
 	async def report(self, evt: MessageEvent, message: str) -> None:
 		# If all have passed
-		ntfy_posts_passed = None
+		wp_posts_passed = None
 		
 		# Iterate through each endpoint that the message should be pushed to
 		# (if any)
-		region = self.validateReport(evt, message)
-		if region is None: return
-		
-		# Create post with only a title
-		split_message = message.split()
-		title = "[" + split_message[0] + "] " + ' '.join(message.split()[1:])
-		body = {"title": title, "status": "publish"}
-		
-		auth = aiohttp.BasicAuth(self.config["api_user"], self.config["api_token"])
+		for region_config in self.validate_report(evt, message):
+			# Detect no regions in reaction
+			if wp_posts_passed is None: wp_posts_passed = True
+			
+			# Create post with only a title
+			split_message = message.split()
+			title = "[" + split_message[0] + "] " + ' '.join(message.split()[1:])
+			body = {"title": title, "status": "publish"}
+			
+			auth = aiohttp.BasicAuth(region_config["api_user"], region_config["api_token"])
+			
+			async with self.http.post(region_config["api_url"], json=body, auth=auth) as response:
+				if response.status < 200 or response.status > 299:
+					wp_posts_passed = False
 		
 		# Send notification
-		async with self.http.post(self.config["api_url"], json=body, auth=auth) as response:
-			if self.config["send_reaction"]:
-				if response.status == 201:
-					await evt.react("👍")
-				else :
-					await evt.react("👎")
-					self.log.debug(response.text)
+		if self.config["send_reaction"]:
+			if wp_posts_passed is True:
+				await evt.react("👍")
+			elif wp_posts_passed is False:
+				await evt.react("👎")
 
 # That's all, folks