@@ -37,7 +37,7 @@ async def consumer_handler(cphrsuit, websocket, username, chatroom, servaddr):
37
37
elif recvdata .split (sepr )[0 ] == "SNCTRYZERO" and recvdata .split (sepr )[1 ] == "USEREXITED" and recvdata .split (sepr )[3 ] == chatroom :
38
38
print ("[" + obtntime () + "] USEREXITED > " + recvdata .split (sepr )[2 ] + " left - " + recvdata .split (sepr )[4 ] + " are connected - Indexes updated" )
39
39
elif recvdata .split (sepr )[0 ] == "SNCTRYZERO" and recvdata .split (sepr )[1 ] == "USERSLIST" and recvdata .split (sepr )[3 ] == chatroom :
40
- print ("[" + obtntime () + "] USERSLIST > " + recvdata .split (sepr )[2 ] + " are connected" )
40
+ print ("[" + obtntime () + "] SNCTRYZERO > " + recvdata .split (sepr )[2 ] + " are connected" )
41
41
else :
42
42
recvjson = json .loads (cphrsuit .decrjson (recvdata ))
43
43
if recvjson ["chatroom" ] == chatroom and recvjson ["username" ] != username :
@@ -89,7 +89,7 @@ async def hello(servaddr, username, chatroom, password):
89
89
print_formatted_text (HTML ("[" + obtntime () + "] " + "SNCTRYZERO > <red>A connection to the server was lost</red>" .format (EXPT )))
90
90
raise KeyboardInterrupt
91
91
92
-
92
+
93
93
def obtntime ():
94
94
timestmp = time .localtime ()
95
95
timehour = str (timestmp .tm_hour )
@@ -127,13 +127,17 @@ def chekpass(pswd):
127
127
128
128
129
129
def formusnm (username ):
130
- if len (username ) < 10 : return username + " " * (10 - len (username ))
131
- elif len (username ) > 10 : return username [0 :10 ]
132
- else : return username
130
+ if len (username ) < 10 :
131
+ return username + " " * (10 - len (username ))
132
+ elif len (username ) > 10 :
133
+ return username [0 :10 ]
134
+ else :
135
+ return username
136
+
133
137
134
138
def check_socket (servaddr ):
135
- addr = [x .strip ().strip ("/" ) for x in servaddr .split (":" )] #['ws',ip, port_no]
136
- if addr [0 ]== 'ws' :
139
+ addr = [x .strip ().strip ("/" ) for x in servaddr .split (":" )] #['ws',ip, port_no]
140
+ if addr [0 ] == "ws" :
137
141
try :
138
142
addr [2 ]= int (addr [2 ])
139
143
with socket .socket (socket .AF_INET , socket .SOCK_STREAM ) as sock :
@@ -151,6 +155,7 @@ def check_socket(servaddr):
151
155
print_formatted_text (HTML ("[" + obtntime () + "] " + "SNCTRYZERO > <red>Invalid protocol used, example use, 'ws://127.0.0.1:9696' </red>" ))
152
156
return False
153
157
158
+
154
159
@click .command ()
155
160
@click .option ("-u" , "--username" , "username" , help = "Enter the username that you would identify yourself with" , required = True )
156
161
@click .option ("-p" , "--password" , "password" , help = "Enter the chatroom password for decrypting the messages" )
0 commit comments