ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 19:44:20 +00:00
Code Activity

Merge branch 'master' of github.com:Steffo99/royalnet

Browse source
This commit is contained in:
Steffo 2018-12-04 10:40:56 +00:00
commit d26f943f74
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
discordbot.py
View file

@ -54,6 +54,7 @@ loop = asyncio.get_event_loop()
# Init the config reader # Init the config reader
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read("config.ini") config.read("config.ini")
config = dict(config)
# Radio messages # Radio messages
radio_messages = ["https://www.youtube.com/watch?v=3-yeK1Ck4yk", radio_messages = ["https://www.youtube.com/watch?v=3-yeK1Ck4yk",
@ -100,7 +101,8 @@ song_special_messages = {
"police academy": ":arrow_forward: {song} - freedom.png", "police academy": ":arrow_forward: {song} - freedom.png",
"super smash bros. ultimate": ":arrow_forward: Re-awaken the undying light with {song}!", "super smash bros. ultimate": ":arrow_forward: Re-awaken the undying light with {song}!",
"powerwolf": ":arrow_forward: Spaggia, ma non ti sei un po' stancato di {song}?", "powerwolf": ":arrow_forward: Spaggia, ma non ti sei un po' stancato di {song}?",
"eurobeat": ":arrow_forward: Nemesis approva la scelta di {song}. Ben fatto, amico." "eurobeat": ":arrow_forward: Nemesis approva la scelta di {song}. Ben fatto, amico.",
"k/da": ":arrow_forward: You won a free deportation to Korea! Now playing: {song}."
} }
# FFmpeg settings # FFmpeg settings
@ -560,7 +562,7 @@ class RoyalDiscordBot(discord.Client):
now_playing = self.video_queue[0] now_playing = self.video_queue[0]
try: try:
audio_source = now_playing.create_audio_source() audio_source = now_playing.create_audio_source()
except FileNotDownloadedError: except errors.FileNotDownloadedError:
continue continue
logger.info(f"Started playing {repr(now_playing)}.") logger.info(f"Started playing {repr(now_playing)}.")
voice_client.play(audio_source) voice_client.play(audio_source)

4
template_config.ini
View file

@ -16,6 +16,7 @@ server_id =
main_channel = main_channel =
afk_timer = 10 afk_timer = 10
radio_messages_every = 5 radio_messages_every = 5
activityreport_sample_time = 600
[Telegram] [Telegram]
bot_token = bot_token =
@ -37,6 +38,3 @@ client_id =
client_secret = client_secret =
username = username =
password = password =
[Events]
halloween = 0