From dd6d0abd152d87e6f008e2388150aaa64e423c94 Mon Sep 17 00:00:00 2001
From: PC-Admin <perthchat@protonmail.com>
Date: Sun, 30 Jul 2023 01:11:40 +0800
Subject: [PATCH] default to not erasing user data on deactivation

---
 moderation_tool.py |  8 +++++++-
 user_commands.py   | 26 +++++++++++++++++++-------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/moderation_tool.py b/moderation_tool.py
index 5390f35..7f26975 100755
--- a/moderation_tool.py
+++ b/moderation_tool.py
@@ -71,7 +71,13 @@ while pass_token == False:
 	print("\nPlease enter a number from the above menu, or enter 'q' or 'e' to exit.\n")
 	menu_input = input()
 	if menu_input == "1":
-		user_commands.deactivate_account('')
+		erase_data = input("Deactivating account. Do you want to also erase the user's data? (y/n) ")
+		if erase_data in ["y", "Y", "yes", "Yes", "YES"]:
+			user_commands.deactivate_account('',True)
+		elif erase_data in ["n", "N", "no", "No", "NO"]:
+			user_commands.deactivate_account('')
+		else:
+			print("\nIncorrect input detected, please select 'y' or 'n'!\n")
 	elif menu_input == "2":
 		user_commands.deactivate_multiple_accounts()
 	elif menu_input == "3":
diff --git a/user_commands.py b/user_commands.py
index 0dc39a3..fcca2d4 100644
--- a/user_commands.py
+++ b/user_commands.py
@@ -13,8 +13,8 @@ def parse_username(username):
 	username = username.replace(tail_end,'')
 	return username
 
-def deactivate_account(preset_username):
-	if len(preset_username) == 0:
+def deactivate_account(preset_username, erase=False):
+	if preset_username == '':
 		username = input("\nPlease enter the username to deactivate: ")
 		username = parse_username(username)
 	else:
@@ -28,7 +28,7 @@ def deactivate_account(preset_username):
 	}
 
 	data = {
-		"erase": True
+		"erase": erase
 	}
 
 	print("\n" + url + "\n")
@@ -50,19 +50,31 @@ def deactivate_multiple_accounts():
 	with open(user_list_location, newline='') as f:
 			reader = csv.reader(f)
 			data = list(reader)
+	print(data)
 	delete_confirmation = input("\n" + str(data) + "\n\nAre you sure you want to deactivate these users? y/n?\n")
+	erase_confirmation = input("\nDo you want to also erase all these users' data? y/n?\n")
+	if erase_confirmation in ["y", "Y", "yes", "Yes", "YES"]:
+		erase = True
+	elif erase_confirmation in ["n", "N", "no", "No", "NO"]:
+		erase = False
+	else:
+		print("\nIncorrect input detected, please select 'y' or 'n'!\n")
+		return
 	#print(len(data[0]))
 	#print(data[0][0])
-	if delete_confirmation == "y" or delete_confirmation == "Y" or  delete_confirmation == "yes" or  delete_confirmation == "Yes":  
+	if delete_confirmation ["y", "Y", "yes", "Yes", "YES"]:  
 		x = 0
 		while x <= (len(data) - 1):
 			#print(data[0][x])
-			deactivate_account(data[x][0])
+			status = deactivate_account(data[x][0], erase)
+			#print(status)
 			x += 1
 			#print(x)
-			time.sleep(10)
-	if delete_confirmation == "n" or delete_confirmation == "N" or  delete_confirmation == "no" or  delete_confirmation == "No":
+			time.sleep(5)
+	elif delete_confirmation in ["n", "N", "no", "No", "NO"]:
 		print("\nExiting...\n")
+	else:
+		print("\nIncorrect input detected, please select 'y' or 'n'!\n")
 
 def create_account(preset_username, preset_password):
 	if len(preset_username) == 0 and len(preset_password) == 0: