From 93faa045376a088c1dea51790c1c6dc89c669e6e Mon Sep 17 00:00:00 2001
From: Alastair Holland <hollan84@coventry.ac.uk>
Date: Sun, 3 May 2020 14:54:47 +0100
Subject: [PATCH] Added more functionality to the settings

---
 README.md                            |   2 +-
 configure.py                         |   4 +++
 lib/__pycache__/setup.cpython-36.pyc | Bin 1105 -> 3699 bytes
 lib/bot.py                           |  34 +++++++++----------
 lib/configure.py                     |   5 ---
 lib/online.py                        |   1 +
 lib/setup.py                         |  49 ++++++++++++++++++++++++---
 run.py                               |   5 ++-
 8 files changed, 68 insertions(+), 32 deletions(-)
 create mode 100755 configure.py
 delete mode 100755 lib/configure.py

diff --git a/README.md b/README.md
index 5fc7b91..68b2b39 100755
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ More functions listed below.
 
 ## Running the bot
 To run this bot, just start __run.py__ in Python3 <br/>
-To change settings in this bot, run __setup.py__ in Python3 
+To change settings in this bot, run __configure.py__ in Python3 
 
 ### Prerequisites
 You need __*Python 3.5.9*__+ and a stable internet connection in order to run this bot. 
diff --git a/configure.py b/configure.py
new file mode 100755
index 0000000..e5593db
--- /dev/null
+++ b/configure.py
@@ -0,0 +1,4 @@
+def configure():
+    from lib import setup
+    setup.environment()
+configure()
\ No newline at end of file
diff --git a/lib/__pycache__/setup.cpython-36.pyc b/lib/__pycache__/setup.cpython-36.pyc
index 45c9e7efa2bae10ea98690416d58c893c14b9e28..0833d591b7d281e6f606b70e7bb27876f6cd473a 100755
GIT binary patch
literal 3699
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
D$tE<c

delta 685
zcmYk2&ubGw6vt<FXE&QkQrknJN|D7=10{krB4{gGawtMt(xQ-q5He%UX1fz+Ck-2C
z$zlHj-T$M1fM@>!Z!!n*ro9RN1HM^*Aj6x_n>SzHeBb=s{uI!?R*MFkSFf(UcXV$>
z5kdsw5F-5n8^a96C`TGaIC7X%VEIhB%q?(^HI7JuEE$<P>3yI#b>xBam|tLw62j0a
z0(A}44ln?^z&em<!YHU;vqnx>GxD{g-IXSVn|rFp9M&qF+}C~-XwNo-tX?3Dp!u3T
zTMe|S=~_g=L;$SrwWkAU`w?_Etj=0s>v>(*E3?4L>{p;Q`&~6`*WXsz3dHS={xuAa
zmZZaz%jKh&Vji<F6Z0^hOnIn8C@#5N$cf^%D#P(yN}i~2EI9*CMsfNi+{x}HZG$u8
zW;|WqK9qc<Cdql2@I@t@{84r~oscfKkCNG3g<1LD-z=~EJLPBp>5f4|?_Rh2pu4<v
zcKp28-+!Ca)861kZ(y^N<G~rw;6?d`4r$ZWMB15+)SGg@vD+tN#uMXJE{!*iMam5U
z56m=RsEHKG1sG^k<A~JM{|#h3C8j(X1}T>?<k5*CGa*&^p}C8<%5Tjy+kl_J5a~nv
zM>uesIDoZ|sY6_w*+twnmtqRHe=AkhA(b+4r0vpg<BD<%4*zX8;b?-#7lO@Weo(yy
G74!=YhOuD)

diff --git a/lib/bot.py b/lib/bot.py
index d3ec1c6..cf96281 100755
--- a/lib/bot.py
+++ b/lib/bot.py
@@ -33,26 +33,26 @@ messagetime = datetime.now().time()
 async def on_message(message):
 	server = MinecraftServer(os.environ['SERVER'], int(os.environ['PORT']))
 	print(message.content)
+
 	'''Anti Spam Variables'''
 	global oldauthor
 	global oldcommand
 	global oldmsg
 	global messagetime
 	msg = ""
+
 	'''Checking which command has been issued'''
 	if message.author == client.user: #Make sure that the bot doesn't reply to itself
 		return
-	#elif message.content.startswith('?status'):
-	#	query = server.query()
-	#	msg = ("The server has the following players online: {0}".format(", ".join(query.players.names)))
+
 	elif message.content.startswith('?map'):
-		msg = "http://map.alastairserver.co.uk"
+		msg = os.environ['MAP']
 	elif message.content.startswith('?servername'):
 		msg = os.environ['SERVER']
 	elif message.content.startswith('?help'):
 		msg = "Commands: \n - ?help \n - ?servername \n - ?map\n - ?status\n - ?minecraftNickname [USERNAME] [NICKNAME]\n - ?download"
 	elif message.content.startswith('?download'):
-		msg = "http://server.alastairserver.co.uk/Public/Minecraft%20World%20Downloads/"
+		msg = os.environ['DOWNLOAD']
 	elif message.content.startswith('?status'):
 		try:
 			status = server.status()
@@ -62,12 +62,9 @@ async def on_message(message):
 			else:
 				msg = str("The server has {0} players and replied in {1} ms".format(status.players.online, status.latency))
 		except:
-			msg = "Server doesn't seem to be repsonding; please message Alastair for help"
+			msg = "Server doesn't seem to be repsonding; please message {} for help".format(os.environ["ADMINNAME"])
 		checkNicknames = msg.split("\n - ")
-		#print("TESTING")
-		#print(checkNicknames)
 		for i in checkNicknames:
-			#print(i)
 			path = "nicknames/" + i
 			try:
 				n = open(path, "r")
@@ -89,15 +86,16 @@ async def on_message(message):
 	else:
 		return
 	if (message.content == oldcommand) and (message.author == oldauthor):
-		s1 = str(messagetime)
-		s2 =str(datetime.now().time())
-		FMT = '%H:%M:%S.%f'
-		tdelta = datetime.strptime(s2, FMT) - datetime.strptime(s1, FMT)
-		if tdelta.seconds < 60:
-			if "Please don't spam commands" in oldmsg:
-				return
-			else:
-				msg = "Please don't spam commands\nWait " + str(round(60-tdelta.seconds, 0)) + " seconds to use this command"
+		if os.environ['ANTISPAM'] == "TRUE":
+			s1 = str(messagetime)
+			s2 =str(datetime.now().time())
+			FMT = '%H:%M:%S.%f'
+			tdelta = datetime.strptime(s2, FMT) - datetime.strptime(s1, FMT)
+			if tdelta.seconds < 60:
+				if "Please don't spam commands" in oldmsg:
+					return
+				else:
+					msg = "Please don't spam commands\nWait " + str(round(60-tdelta.seconds, 0)) + " seconds to use this command"
 	messagetime = datetime.now().time()
 	oldauthor = message.author
 	oldcommand = message.content
diff --git a/lib/configure.py b/lib/configure.py
deleted file mode 100755
index 2e3b8e0..0000000
--- a/lib/configure.py
+++ /dev/null
@@ -1,5 +0,0 @@
-def configure():
-    
-
-
-configure()
\ No newline at end of file
diff --git a/lib/online.py b/lib/online.py
index 3d9bdd3..ac5ebd4 100755
--- a/lib/online.py
+++ b/lib/online.py
@@ -5,6 +5,7 @@ import difflib
 from mcstatus import MinecraftServer
 from datetime import datetime
 from datetime import timedelta
+import os
 
 
 server = MinecraftServer(os.environ['SERVER'], int(os.environ['PORT']))
diff --git a/lib/setup.py b/lib/setup.py
index 555b53b..598c041 100755
--- a/lib/setup.py
+++ b/lib/setup.py
@@ -2,7 +2,7 @@ def environment():
     import os
     
     '''Prevents overwriting of the environment file'''
-    settingList = ["Token", "Server IP", "Port", "Command Prefix", "Custom File"]
+    settingList = ["Token", "Server IP", "Port", "Command Prefix", "Custom File", "Server Map", "World Downloads", "Anti Spam", "Owner Name"]
     if os.path.isfile('.env'): #Checks to see if there is an environment file
         overwrite = input("Would you like to change your current settings? (y/n) > ")
         overwrite = overwrite.lower() #Makes the input string lowercase
@@ -14,7 +14,9 @@ def environment():
         else:
             return #Exit function
     else:
-        settingsChoice = "12345"
+        settingsChoice = ""
+        for s in range(1, len(settingList)+1):
+            settingsChoice = settingsChoice + str(s)
 
     '''Gets information'''
     if str(settingList.index("Token")+1) in settingsChoice:
@@ -73,9 +75,47 @@ def environment():
             custom = "TRUE"
     else:
         custom = os.environ['CUSTOM']
+    if str(settingList.index("Server Map")+1) in settingsChoice:
+        mapCheck = input("Do you have an online map on your server? (y/n) > ")
+        mapCheck = mapCheck.lower()
+        if mapCheck == "y" or mapCheck == "yes":
+            mapURL = input("What's the URL of the map? (Leave blank if you can't remember, you can set it later) > ")
+            if mapURL == "":
+                mapURL = "There is no URL set for the map"
+        else:
+            mapURL = input("There is no online map on this server")
+    else:
+        mapURL = os.environ['MAP']
+    
+    if str(settingList.index("World Downloads")+1) in settingsChoice:
+        worldCheck = input("Do you have an online world download on your server? (y/n) > ")
+        worldCheck = worldCheck.lower()
+        if worldCheck == "y" or mapCheck == "yes":
+            worldURL = input("What's the URL of the download? (Leave blank if you can't remember, you can set it later) > ")
+            if worldURL == "":
+                worldURL = "There is no URL set for the download"
+        else:
+            worldURL = input("There is no online map on this server")
+    else:
+        worldURL = os.environ['DOWNLOAD']
+    
+    if str(settingList.index("Anti Spam")+1) in settingsChoice:
+        spam = input("Stop users from spamming commands? (y/n) > ")
+        spam = spam.lower()
+        if spam == "y" or spam == "yes":
+            antiSpam = "TRUE"
+        else:
+            antiSpam = "FALSE"
+    else:
+        antiSpam = os.environ['ANTISPAM']
+
+    if str(settingList.index("Owner Name")+1) in settingsChoice:
+        owner = input("What's the name of the server owner? > ")
+    else:
+        owner = os.environ['ADMINNAME']
 
     '''Concantinate into a string'''
-    data = "TOKEN={}\nSERVER={}\nPORT={}\nPREFIX={}\nCUSTOM={}".format(token,serverIP,port,commandPrefix,custom) #Sets the format of the data
+    data = "TOKEN={}\nSERVER={}\nPORT={}\nPREFIX={}\nCUSTOM={}\nMAP={}\nDOWNLOAD={}\nANTISPAM={}\nADMINNAME={}".format(token,serverIP,port,commandPrefix,custom,mapURL,worldURL,antiSpam,owner) #Sets the format of the data
 
     '''Write data to the .env file'''
     creds = open(".env", "w")
@@ -96,5 +136,4 @@ def environment():
         if tryAgain == "y" or tryAgain == "yes":
             environment()
         else:
-            return
-environment()
\ No newline at end of file
+            return
\ No newline at end of file
diff --git a/run.py b/run.py
index 77f76ea..b69587a 100755
--- a/run.py
+++ b/run.py
@@ -4,13 +4,12 @@ def run():
     librarySetup.checkLibraries()
 
     from lib import setup
-    from lib import bot
-    from lib import online
+    #from lib import online
     import os
     
 
     if not os.path.isfile('.env'):
         setup.environment()
     
-    os.system("python3 bot.py")
+    os.system("python3 lib/bot.py")
 run()
\ No newline at end of file