avoid incident report prompt if no remote users found.

rdlist_commands.py

@@ -152,7 +152,7 @@ def send_incident_reports_on_rdlist_accounts(all_remote_users=None, skip_input=F
 		all_room_ids, all_local_users, all_remote_users = get_key_rdlist_info(hardcoded_variables.rdlist_recommended_tags)
 
 	# If there's at least 1 remote user detected, ask the admin if they want to generate a user report for every user found in rdlist rooms
-	if len(all_remote_users) > 0 or skip_input == False:
+	if len(all_remote_users) > 0:
 		print(f"\nWARNING! The following remote users are current members of rooms tagged in rdlist: {list(all_remote_users.keys())}")
 		if skip_input == False:
 			send_incident_report_confirmation = input("\nDo you want to send out incident reports for these users to every homeserver admin involved? y/n? ")
@@ -161,6 +161,8 @@ def send_incident_reports_on_rdlist_accounts(all_remote_users=None, skip_input=F
 			loop.run_until_complete(report_commands.send_incident_reports(all_remote_users))
 		elif send_incident_report_confirmation.lower() in ['n', 'no', 'N', 'No']:
 			print("\nSkipping incident report generation...\n")
+	elif len(all_remote_users) == 0:
+		print(f"\nNo remote users were found in rdlist rooms.")
 
 def block_all_rooms_with_rdlist_tags(rdlist_use_recommended,preset_user_ID,preset_new_room_name,preset_message):
 	# Git clone the rdlist repo to ./rdlist/
@@ -262,7 +264,7 @@ def block_all_rooms_with_rdlist_tags(rdlist_use_recommended,preset_user_ID,prese
 
 	# Deduplicate the list of all kicked users
 	total_list_kicked_users = list(set(total_list_kicked_users))
-	
+
 	# Return the list of all kicked users
 	return num_rooms_blocked, num_rooms_purged, total_list_kicked_users
 

report_commands.py

@@ -264,13 +264,17 @@ def lookup_homeserver_admin(preset_baseurl):
 		try:
 			w = whois.whois(baseurl)
 			if w.emails:
-				#print("\nAdmin contact email(s) for " + baseurl + " are: " + str(w.emails))
-				return {baseurl: list(w.emails)}, True
+				# Check if the emails field is a list
+				if isinstance(w.emails, list):
+					return {baseurl: list(w.emails)}, True
+				# If it's not a list, it must be a single string. So, we wrap it in a list
+				else:
+					return {baseurl: [w.emails]}, True
 			else:
-				print(f"Error: Unable to collect admin email from WHOIS data for {baseurl}")
+				print(f"\t\tError: Unable to collect admin email from WHOIS data for {baseurl}")
 				return None, False
 		except:
-			print(f"Error: Unable to collect WHOIS data for {baseurl}")
+			print(f"\t\tError: Unable to collect WHOIS data for {baseurl}")
 			return None, False
 
 def send_email(email_address, email_subject, email_content, email_attachments):