diff --git a/configuration.default.ini b/configuration.default.ini
index 87bd2b7..b018616 100644
--- a/configuration.default.ini
+++ b/configuration.default.ini
@@ -124,7 +124,7 @@ admin_help = Admin command:
!urlban [url] (ban an url)
!urlunban [url] (unban an url)
!reload (reload the ban config)
-
+
[debug]
ffmpeg = False
mumbleConnection = False
diff --git a/mumbleBot.py b/mumbleBot.py
index 378687b..a82b386 100644
--- a/mumbleBot.py
+++ b/mumbleBot.py
@@ -310,25 +310,31 @@ class MumbleBot:
elif command == var.config.get('command', 'play_radio'):
if not parameter:
all_radio = var.config.items('radio')
- msg = var.config.get('strings', 'preconfigurated_radio') + " :
"
+ msg = var.config.get('strings', 'preconfigurated_radio') + " :"
for i in all_radio:
comment = ""
if len(i[1].split(maxsplit=1)) == 2:
comment = " - " + i[1].split(maxsplit=1)[1]
msg += "
" + i[0] + comment
- self.send_msg(msg)
+ self.send_msg(msg, text)
else:
if var.config.has_option('radio', parameter):
parameter = var.config.get('radio', parameter)
parameter = parameter.split()[0]
- music = {'type': 'radio',
- 'url': self.get_url_from_input(parameter),
- 'user': user}
- var.playlist.append(music)
- self.async_download_next()
+ url = self.get_url_from_input(parameter)
+ if url:
+ music = {'type': 'radio',
+ 'url': url,
+ 'user': user}
+ var.playlist.append(music)
+ self.async_download_next()
+ else:
+ self.send_msg(var.config.get('strings', 'bad_url'))
elif command == var.config.get('command', 'help'):
self.send_msg(var.config.get('strings', 'help'), text)
+ if self.is_admin(user):
+ self.send_msg(var.config.get('strings', 'admin_help'), text)
elif command == var.config.get('command', 'stop'):
self.stop()