storm/bragi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merging

Browse Source
This commit is contained in:
Azlux 2019-02-15 17:40:14 +01:00
parent 09ad7d5d04
commit ddb246381b
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mumbleBot.py
View File

@ -90,22 +90,15 @@ class MumbleBot:
tokens = args.tokens tokens = args.tokens
else: else:
tokens = var.config.get("server", "tokens") tokens = var.config.get("server", "tokens")
access_tokens = [] tokens = tokens.split(',')
if "," in tokens:
tokenslist = tokens.split(",")
for i in tokenslist:
access_tokens.append(str(i))
else:
access_tokens.append(tokens)
if args.user: if args.user:
self.username = args.user self.username = args.user
else: else:
self.username = var.config.get("bot", "username") self.username = var.config.get("bot", "username")
self.mumble = pymumble.Mumble(host, user=self.username, port=port, password=password, tokens=access_tokens, self.mumble = pymumble.Mumble(host, user=self.username, port=port, password=password, tokens=tokens,
debug=var.config.getboolean('debug', 'mumbleConnection'), certfile=args.certificate) debug=var.config.getboolean('debug', 'mumbleConnection'), certfile=args.certificate)
self.mumble = pymumble.Mumble(host, user=self.username, port=port, password=password,
debug=var.config.getboolean('debug', 'mumbleConnection'), certfile=certificate)
self.mumble.callbacks.set_callback("text_received", self.message_received) self.mumble.callbacks.set_callback("text_received", self.message_received)
self.mumble.set_codec_profile("audio") self.mumble.set_codec_profile("audio")