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

Merge branch 'access_token' of zelifcam-access_token

Browse Source 
# Conflicts:
#	configuration.default.ini
#	mumbleBot.py
This commit is contained in:
Azlux 2019-02-15 13:33:33 +01:00
commit 09ad7d5d04
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration.default.ini
View File

@ -3,6 +3,7 @@ host = 127.0.0.1
port = 64738 port = 64738
password = password =
channel = channel =
tokens = # example: token1,token2
certificate = certificate =
[bot] [bot]
@ -126,3 +127,4 @@ admin_help = Admin command:
[debug] [debug]
ffmpeg = False ffmpeg = False
mumbleConnection = False mumbleConnection = False

14
mumbleBot.py
View File

@ -86,11 +86,24 @@ class MumbleBot:
else: else:
certificate = var.config.get("server", "certificate") certificate = var.config.get("server", "certificate")
if args.tokens:
tokens = args.tokens
else:
tokens = var.config.get("server", "tokens")
access_tokens = []
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,
debug=var.config.getboolean('debug', 'mumbleConnection'), certfile=args.certificate)
self.mumble = pymumble.Mumble(host, user=self.username, port=port, password=password, self.mumble = pymumble.Mumble(host, user=self.username, port=port, password=password,
debug=var.config.getboolean('debug', 'mumbleConnection'), certfile=certificate) 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)
@ -606,6 +619,7 @@ if __name__ == '__main__':
parser.add_argument("-s", "--server", dest="host", type=str, help="Hostname of the Mumble server") parser.add_argument("-s", "--server", dest="host", type=str, help="Hostname of the Mumble server")
parser.add_argument("-u", "--user", dest="user", type=str, help="Username for the bot") parser.add_argument("-u", "--user", dest="user", type=str, help="Username for the bot")
parser.add_argument("-P", "--password", dest="password", type=str, help="Server password, if required") parser.add_argument("-P", "--password", dest="password", type=str, help="Server password, if required")
parser.add_argument("-T", "--tokens", dest="tokens", type=str, help="Server tokens, if required")
parser.add_argument("-p", "--port", dest="port", type=int, help="Port for the Mumble server") parser.add_argument("-p", "--port", dest="port", type=int, help="Port for the Mumble server")
parser.add_argument("-c", "--channel", dest="channel", type=str, help="Default channel for the bot") parser.add_argument("-c", "--channel", dest="channel", type=str, help="Default channel for the bot")
parser.add_argument("-C", "--cert", dest="certificate", type=str, default=None, help="Certificate file") parser.add_argument("-C", "--cert", dest="certificate", type=str, default=None, help="Certificate file")