PC-Admin/matrix-moderation-tool
1
0
Fork 0
mirror of https://github.com/PC-Admin/matrix-moderation-tool.git synced 2024-12-19 07:00:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix bug where a single whois email is returned as an array of letters.

Browse Source
This commit is contained in:
PC-Admin 2023-08-02 17:09:31 +08:00
parent df4d2ca3ab
commit f5fd56860d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
report_commands.py
View File

@ -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):