From e7caca9b84f7580e0a0e86f86a45f7339a7fa582 Mon Sep 17 00:00:00 2001
From: Alastair Holland <hollan84@coventry.ac.uk>
Date: Sun, 3 May 2020 16:35:31 +0100
Subject: [PATCH] Added prefix into code

---
 lib/__pycache__/setup.cpython-36.pyc | Bin 3699 -> 3904 bytes
 lib/bot.py                           |  29 ++++++++++++++++++---------
 lib/setup.py                         |  14 +++++++++----
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/lib/__pycache__/setup.cpython-36.pyc b/lib/__pycache__/setup.cpython-36.pyc
index 0833d591b7d281e6f606b70e7bb27876f6cd473a..a0f63a4faca478f02be274f3a164ab5519a6c035 100755
GIT binary patch
delta 1458
zcmaJ>&u<$=7~R=j|H!PJ*ol+PCXTZSNgJ2a(4>?CZ8)GvSVSRmLO~X)RG3X`Cta7>
zO_hdO?ZIbIDoY$WaN@+Fxp6@7CvYiM4^@Sb5Em{;NL&zaW|u071hQtnZ)V?n->;GX
zsD59g%f%u+_scgoo;eTb^3bfNX%^O7SV1=PVC}E?QfRQT9*J_WHf&zxJ7!OlmKAsO
zLlVrv8<ZZu0L(Zr1HLJ8*s0Ju7IPd8Y$`}6$IKpKWn1eJVeVwX@WGe>g9^$<l*T@r
zjA+WNI$9jjl$tq3{TkFMP%UAl)Q7AVSt)fIL9LXTJ;5}12}~Evf+(m`VAE25hbK!h
z_ykfX9i7E9J#wh?$DquDQWQl+fmIYeaN#8s8Wz|Ld!eUCgJQ5#M307G2YVXPl-LlP
zlUhL&r;_xE#z<6R^HF*KZBb_P2(0t3*qKgNln`rJvf_>|h869LupoxnS;&uwkxp3*
zDS?HkEK0JaQRz_s<iqzhBvDsMR8%?=FY7FeicCpza7vP@B-UU0A5Q!qBz7(uO<VmU
zT0NS!I(Mqo`{>(w)G{W<RNr7#-;CfoyrggP4ZH-5Eo?PNgWqEpBHPd7eo;2UP6NG+
zKz9F2!;YWf(?xt47voA6HkJMEx$GlgmVj}Dlgd72%aN1F%KKFH5>%Zu{ectdn|uix
zuK+tCCR7|)87Dq8gEMet{w6<<UQGHXyNo?~@vlO1GL@vKByT|S3M8v3_BCLu>~+jM
zD{^8$P+^HtVGBo0ifWHWQy7k=#$FROj1f<s#2Q>R!!X0%kTaDah)#=X_3&KSWX4m%
zRY^Vq@~V0<+NQ>?MKfYXRRpU#X9j=5OA7is9F~t3B}pt+eP#VO{3B>jGF#mp&p#-Y
zH$8sO<L*tyxEBPAM^`dk61Os2@4mCTelXYY@9u@}{q7!jgOk9<hI`xNp1a~6EHwf*
zyxk65*52O6ogcc}yn6?Co_lxiquut$?t9I(#m2^)?!x^=zb-jv6Xj!&WBLVT@~?X9
z=*R3s!@i{wy7p;AH&>h2SDVsX{b1|pGkTd+W_bZMwXDDk!?u5GtsR7|{!i9LyJbC3
zsj<<b-hSwD|K@H#Tlki=`acxr$wL3vLO^Sv6RhCpJ}cI(JdwW&p?bFed9mND8kA6y
qH<J6j^ogmP3X|8lWUtqWvU~xDV_O}^C;6*)x@>RPTTwA^qx}O>k9)@e

delta 1205
zcmah|J8#oa7`-=ko5V?+rfKRXO;ZEq(Gs5JO;ri;5QwTE3PJ*j=|(^bF4!&t^qGKy
zm>3HF2M94B#6TAY2E<4g#8hQqh6M&#VB*|s3#l+LTz~g*&iTIko$I%??^R<wmox4x
zy}a;X;E^$&w;5vw#z744qyA{>XDi`rqQA|9q+<|kW`tE{LDDyfH<Lndb5XEZo0C4<
zy};cGU<ZIrQA!kN6WBQ-%0Vh-R=`Zf%&xzfH^3YOGfnB3c~?|}v|~g`hd@m~PLx^+
z_Y;scAPq8_dYj28ax$0q1~U`0g!>tl@@7H|w>ehNz_7u{P)0EjW5!p^BF3_x6~kgx
zI}v0l+sr{XhiJALXG$wCR!gmxXJgqT7n}(mm|{(kzj>7MVvS0CO^h_V$wacAs08Yf
zG*9?h>Je)pU!X#>Ksm)<7v#y54GheM#PzYW3`MM0Mf9q2Bwk*#K)tdga9Rw@sH)y5
zI@|wC`iCPn1jX2sQ8cy~dy-t?iRK<b-^Os2KI&6_L!4BN)4UPtQ;pM<<r@JiQAru6
zxranOC^;#RH_81t(Pktng&#Dl^%5sraMDlxN)|CzefUT9DKJ}svB-*5Ux;mi^+(l;
zRkuUcipx*0C|`FOG{&JZKm#fdqRi7;(7Yd*O5Zj27kW{4bg={9=&9|5WI2{J{*tUi
zau*~kF?Khw6|o1FcT<v5l%^t;$f7b;+UZ~r&SaG7RjR^7yl=dwRy8ut?-G0Eh6F)!
zh=$a&t06`P4^j;!>h2RD_o?^7W|-I?4AZc>52EUu?!CiIUPpJ|`@QnX;zAOOF*-5*
z1^+VZbe*1?Z8*2nGu;jMM#Hri{jNDahV2u_4^Q8=k2%-oef!qjylZ<A;LNG1EyqsU
zml|%vp0qoQPV$w;&xNZp#l-`eI`6Yx6T0UzUc>h<I~S)edwwUpm)#aFWnc47ct5w6
z*Td&I&#(dG7~XQY-W=sdc-{<oCH!XA#^urUD0gLa>nlH-u<WEJuFi@1D~(AdfF1T5
D35hpx

diff --git a/lib/bot.py b/lib/bot.py
index cf96281..d878b44 100755
--- a/lib/bot.py
+++ b/lib/bot.py
@@ -41,19 +41,28 @@ async def on_message(message):
 	global messagetime
 	msg = ""
 
+	prefix = os.environ['PREFIX']
+
+	commandList = ["map", "server", "help", "download", "status", "minecraftNickname"]
+	commandList2 = []
+	for command in commandList:
+		commandList2.append(prefix + command)
+	commandList = commandList2
+
 	'''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('?map'):
+	elif message.content.startswith(prefix + 'map'):
 		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'):
+	elif message.content.startswith(prefix + 'server'):
+		msg = os.environ['EXTSERVER']
+	elif message.content.startswith(prefix + 'help'):
+		msg = "Commands:\n"
+		for command in commandList:
+			msg = "{} - {}\n".format(msg, command)
+	elif message.content.startswith(prefix + 'download'):
 		msg = os.environ['DOWNLOAD']
-	elif message.content.startswith('?status'):
+	elif message.content.startswith(prefix + 'status'):
 		try:
 			status = server.status()
 			query = server.query()
@@ -73,7 +82,7 @@ async def on_message(message):
 				n.close()
 			except:
 				msg = msg
-	elif message.content.startswith('?minecraftNickname'):
+	elif message.content.startswith(prefix + 'minecraftNickname'):
 		splitMessage = message.content
 		splitMessage = splitMessage.split()
 		path = "nicknames/" + splitMessage[1]
@@ -81,7 +90,7 @@ async def on_message(message):
 		f.write(splitMessage[2])
 		f.close()
 		msg = "Set " + splitMessage[1] + "'s nickname to " + splitMessage[2]
-	elif message.content.startswith('?'):
+	elif message.content.startswith(prefix):
 		msg = "That is not a valid command, use ?help for help"
 	else:
 		return
diff --git a/lib/setup.py b/lib/setup.py
index 598c041..c37ceec 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", "Server Map", "World Downloads", "Anti Spam", "Owner Name"]
+    settingList = ["Token", "Server address/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
@@ -23,8 +23,14 @@ def environment():
         token = input("Input your bot token here > ")
     else:
         token = os.environ['TOKEN']
-    if str(settingList.index("Server IP")+1) in settingsChoice:
-        serverIP = input("Input your server URL/IP here > ")
+    if str(settingList.index("Server address/IP")+1) in settingsChoice:
+        serverIP = input("Input your server address/IP here > ")
+        differentIP = input("Is this different from the public URL/IP? (y/n) > ")
+        differentIP = differentIP.lower()
+        if differentIP == "y" or differentIP == "yes":
+            externalIP = input("Input the public server address here > ")
+        else:
+            externalIP = serverIP
     else:
         serverIP = os.environ['SERVER']
     if str(settingList.index("Port")+1) in settingsChoice:
@@ -115,7 +121,7 @@ def environment():
         owner = os.environ['ADMINNAME']
 
     '''Concantinate into a string'''
-    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
+    data = "TOKEN={}\nSERVER={}\nEXTSERVER={}\nPORT={}\nPREFIX={}\nCUSTOM={}\nMAP={}\nDOWNLOAD={}\nANTISPAM={}\nADMINNAME={}".format(token,serverIP,externalIP,port,commandPrefix,custom,mapURL,worldURL,antiSpam,owner) #Sets the format of the data
 
     '''Write data to the .env file'''
     creds = open(".env", "w")