From 462f4c7a09b1037861212f951643d36d78e47755 Mon Sep 17 00:00:00 2001 From: profitroll Date: Wed, 3 Aug 2022 10:11:04 +0200 Subject: [PATCH] Update 1.7 --- config.json | 1 + functions.py | 43 ++++++++++++++++++++++++------------------- yusarin.py | 9 ++++++--- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/config.json b/config.json index 93b827e..f5e5111 100644 --- a/config.json +++ b/config.json @@ -10,6 +10,7 @@ "color_ok": "#226699", "color_warn": "#FFCC4D", "color_error": "#DD2E44", + "enable_nomic": false, "bot_site": "https://www.end-play.xyz/yusarin", "bot_icon": "https://www.end-play.xyz/yusarin/logo", "check_for_updates": true, diff --git a/functions.py b/functions.py index 74cad9a..3ec5635 100644 --- a/functions.py +++ b/functions.py @@ -61,7 +61,7 @@ def appendLog(message, guild=None, announce=True): message_formatted = f'[{datetime.now().strftime("%d.%m.%Y")}] [{datetime.now().strftime("%H:%M:%S")}] [{guild}] {message}' if announce: - print(message_formatted) + print(message_formatted, flush=True) checkSize() @@ -216,7 +216,8 @@ async def removeUserVoice(vc): vc_conf = loadJson(vc_file) needed_channel = discord.utils.get(vc.guild.channels, id=vc.id) - nomic_channel = discord.utils.get(vc.guild.channels, id=vc_conf["nomic"]) + if loadJson("config.json")["enable_nomic"]: + nomic_channel = discord.utils.get(vc.guild.channels, id=vc_conf["nomic"]) os.remove(vc_file) @@ -225,11 +226,13 @@ async def removeUserVoice(vc): appendLog(f"Removed voice channel '{needed_channel}' ({str(needed_channel.id)}) of user with id {str(vc_conf['ownerid'])}", guild=vc.guild) else: appendLog(f"Removed voice channel '{needed_channel}' of user with id {str(vc_conf['ownerid'])}", guild=vc.guild) - await nomic_channel.delete() - if debug: - appendLog(f"Removed nomic channel {nomic_channel} ({str(nomic_channel.id)}) of channel with id {str(needed_channel.id)}", guild=vc.guild) - else: - appendLog(f"Removed nomic channel '{nomic_channel}' of channel with id {str(needed_channel.id)}", guild=vc.guild) + + if loadJson("config.json")["enable_nomic"]: + await nomic_channel.delete() + if debug: + appendLog(f"Removed nomic channel {nomic_channel} ({str(nomic_channel.id)}) of channel with id {str(needed_channel.id)}", guild=vc.guild) + else: + appendLog(f"Removed nomic channel '{nomic_channel}' of channel with id {str(needed_channel.id)}", guild=vc.guild) else: return @@ -257,13 +260,14 @@ async def createUserVoice(vc, category, member): vc_file = f"{path}/guilds/{str(created_channel.guild.id)}/channels/{str(created_channel.id)}.json" chan["ownerid"] = member.id saveJson(chan, vc_file) - nomic_channel = await vc.guild.create_text_channel(getMsg("name_nomic", vc.guild).format(created_channel.id), category=category, overwrites=overwrites_nomic, topic=getMsg("description_nomic", vc.guild).format(str(created_channel.id))) - if debug: - appendLog(f"Created nomic channel '{nomic_channel}' ({str(nomic_channel.id)}) for channel '{created_channel}' ({str(created_channel.id)})", guild=vc.guild) - else: - appendLog(f"Created nomic channel '{nomic_channel}' for channel '{created_channel}'", guild=vc.guild) - chan["nomic"] = nomic_channel.id - saveJson(chan, vc_file) + if loadJson("config.json")["enable_nomic"]: + nomic_channel = await vc.guild.create_text_channel(getMsg("name_nomic", vc.guild).format(created_channel.id), category=category, overwrites=overwrites_nomic, topic=getMsg("description_nomic", vc.guild).format(str(created_channel.id))) + if debug: + appendLog(f"Created nomic channel '{nomic_channel}' ({str(nomic_channel.id)}) for channel '{created_channel}' ({str(created_channel.id)})", guild=vc.guild) + else: + appendLog(f"Created nomic channel '{nomic_channel}' for channel '{created_channel}'", guild=vc.guild) + chan["nomic"] = nomic_channel.id + saveJson(chan, vc_file) return created_channel def isVoiceOfUser(vc, member): @@ -279,11 +283,12 @@ async def changeNomicPerms(mode, vc, member): global path vc_file = f"{path}/guilds/{str(vc.guild.id)}/channels/{str(vc.id)}.json" vc_conf = loadJson(vc_file) - nomic_channel = discord.utils.get(vc.guild.channels, id=vc_conf["nomic"]) - if mode == "deny": - await nomic_channel.set_permissions(member, view_channel=False) - else: - await nomic_channel.set_permissions(member, view_channel=True) + if loadJson("config.json")["enable_nomic"]: + nomic_channel = discord.utils.get(vc.guild.channels, id=vc_conf["nomic"]) + if mode == "deny": + await nomic_channel.set_permissions(member, view_channel=False) + else: + await nomic_channel.set_permissions(member, view_channel=True) async def clearTrash(client): global path diff --git a/yusarin.py b/yusarin.py index 6fa1c2f..f1e1670 100644 --- a/yusarin.py +++ b/yusarin.py @@ -83,7 +83,8 @@ async def on_voice_state_update(member, before, after): await removeUserVoice(vc_from) return else: - await changeNomicPerms("deny", vc_from, member) + if loadJson("config.json")["enable_nomic"]: + await changeNomicPerms("deny", vc_from, member) # If user joined vc else: @@ -91,9 +92,11 @@ async def on_voice_state_update(member, before, after): if isVoiceOfUser(vc_from, member): await removeUserVoice(vc_from) else: - await changeNomicPerms("deny", vc_from, member) + if loadJson("config.json")["enable_nomic"]: + await changeNomicPerms("deny", vc_from, member) if isUserVoice(vc_to): - await changeNomicPerms("allow", vc_to, member) + if loadJson("config.json")["enable_nomic"]: + await changeNomicPerms("allow", vc_to, member) if vc_to.id == guildConfGet(vc_to.guild, "channel"): if guildConfGet(vc_to.guild, "category") is not None: voice_chan = await createUserVoice(vc_to, discord.utils.get(vc_to.guild.categories, id=guildConfGet(vc_to.guild, "category")), member)