Convert all - in variable names to _
This commit is contained in:
parent
4eacd8c13b
commit
45ed3cbd03
|
@ -33,7 +33,7 @@ def clientLoopIn(self):
|
|||
args[argSplit[0]] = argSplit[1]
|
||||
|
||||
if not "channel" in args: args["channel"] = "default"
|
||||
if not "channel-password" in args: args["channel-password"] = ""
|
||||
if not "channel_password" in args: args["channel_password"] = ""
|
||||
|
||||
with clientDataLock:
|
||||
setClientData(self.cID,"type",cmd[0])
|
||||
|
@ -55,7 +55,7 @@ def clientLoopIn(self):
|
|||
setClientData(self.cID,"token",token)
|
||||
|
||||
if cmd[0] == "token":
|
||||
if not authenticate(args["user"],args["user-password"]): return
|
||||
if not authenticate(args["user"],args["user_password"]): return
|
||||
with clientDataLock:
|
||||
with clientsLock:
|
||||
for client in clients:
|
||||
|
@ -79,7 +79,7 @@ def clientLoopIn(self):
|
|||
|
||||
if cmd[0] == "broadcast":
|
||||
if not "token" in args:
|
||||
if not authenticate(args["user"],args["user-password"]): return
|
||||
if not authenticate(args["user"],args["user_password"]): return
|
||||
else:
|
||||
tokenAuthed = False
|
||||
with clientDataLock:
|
||||
|
@ -124,7 +124,7 @@ def clientLoopIn(self):
|
|||
setClientData(self.cID,"bufferPacket",packet)
|
||||
with clientsLock:
|
||||
for cID in clients:
|
||||
if getClientData(cID,"type") == "watch" and getClientData(cID,"args")["user"] == args["user"] and getClientData(cID,"args")["channel"] == args["channel"] and getClientData(cID,"args")["channel-password"] == args["channel-password"]:
|
||||
if getClientData(cID,"type") == "watch" and getClientData(cID,"args")["user"] == args["user"] and getClientData(cID,"args")["channel"] == args["channel"] and getClientData(cID,"args")["channel_password"] == args["channel_password"]:
|
||||
getClientData(cID,"queue").put("")
|
||||
|
||||
if cmd[0] == "watch":
|
||||
|
|
Loading…
Reference in New Issue