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

neaten up incident reporting output

Browse Source
This commit is contained in:
PC-Admin 2023-08-03 18:30:53 +08:00
parent 82586a45bf
commit f2f529942b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
report_commands.py
View File

@ -237,7 +237,7 @@ def lookup_homeserver_admin(preset_baseurl):
# If baseurl is matrix.org, return 'abuse@matrix.org' as a hardcoded response # If baseurl is matrix.org, return 'abuse@matrix.org' as a hardcoded response
if baseurl == "matrix.org": if baseurl == "matrix.org":
print("\nAdmin contact email(s) for " + baseurl + " are: abuse@matrix.org") #print("\nAdmin contact email(s) for " + baseurl + " are: abuse@matrix.org")
return {"admins": [{"email_address": "abuse@matrix.org"}]}, False return {"admins": [{"email_address": "abuse@matrix.org"}]}, False
# Check target homserver for MSC1929 support email # Check target homserver for MSC1929 support email
@ -257,7 +257,7 @@ def lookup_homeserver_admin(preset_baseurl):
return data, False return data, False
else: else:
print(f"Error: Unable to collect admin contact details from server {baseurl}") print(f"\nError: Unable to collect admin contact details from server {baseurl}")
print("Attempting to collect admin email from WHOIS data...") print("Attempting to collect admin email from WHOIS data...")
# Get WHOIS data # Get WHOIS data
@ -273,10 +273,10 @@ def lookup_homeserver_admin(preset_baseurl):
else: else:
return {"admins": [{"email_address": w.emails}]}, True return {"admins": [{"email_address": w.emails}]}, True
else: else:
print(f"\t\tError: Unable to collect admin email from WHOIS data for {baseurl}") print(f"Error: Unable to collect admin email from WHOIS data for {baseurl}")
return None, False return None, False
except: except:
print(f"\t\tError: Unable to collect WHOIS data for {baseurl}") print(f"Error: Unable to collect WHOIS data for {baseurl}")
return None, False return None, False
def send_email(email_address, email_subject, email_content, email_attachments): def send_email(email_address, email_subject, email_content, email_attachments):