Update 1.7
This commit is contained in:
parent
078eac1446
commit
462f4c7a09
@ -10,6 +10,7 @@
|
|||||||
"color_ok": "#226699",
|
"color_ok": "#226699",
|
||||||
"color_warn": "#FFCC4D",
|
"color_warn": "#FFCC4D",
|
||||||
"color_error": "#DD2E44",
|
"color_error": "#DD2E44",
|
||||||
|
"enable_nomic": false,
|
||||||
"bot_site": "https://www.end-play.xyz/yusarin",
|
"bot_site": "https://www.end-play.xyz/yusarin",
|
||||||
"bot_icon": "https://www.end-play.xyz/yusarin/logo",
|
"bot_icon": "https://www.end-play.xyz/yusarin/logo",
|
||||||
"check_for_updates": true,
|
"check_for_updates": true,
|
||||||
|
43
functions.py
43
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}'
|
message_formatted = f'[{datetime.now().strftime("%d.%m.%Y")}] [{datetime.now().strftime("%H:%M:%S")}] [{guild}] {message}'
|
||||||
|
|
||||||
if announce:
|
if announce:
|
||||||
print(message_formatted)
|
print(message_formatted, flush=True)
|
||||||
|
|
||||||
checkSize()
|
checkSize()
|
||||||
|
|
||||||
@ -216,7 +216,8 @@ async def removeUserVoice(vc):
|
|||||||
vc_conf = loadJson(vc_file)
|
vc_conf = loadJson(vc_file)
|
||||||
|
|
||||||
needed_channel = discord.utils.get(vc.guild.channels, id=vc.id)
|
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)
|
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)
|
appendLog(f"Removed voice channel '{needed_channel}' ({str(needed_channel.id)}) of user with id {str(vc_conf['ownerid'])}", guild=vc.guild)
|
||||||
else:
|
else:
|
||||||
appendLog(f"Removed voice channel '{needed_channel}' of user with id {str(vc_conf['ownerid'])}", guild=vc.guild)
|
appendLog(f"Removed voice channel '{needed_channel}' of user with id {str(vc_conf['ownerid'])}", guild=vc.guild)
|
||||||
await nomic_channel.delete()
|
|
||||||
if debug:
|
if loadJson("config.json")["enable_nomic"]:
|
||||||
appendLog(f"Removed nomic channel {nomic_channel} ({str(nomic_channel.id)}) of channel with id {str(needed_channel.id)}", guild=vc.guild)
|
await nomic_channel.delete()
|
||||||
else:
|
if debug:
|
||||||
appendLog(f"Removed nomic channel '{nomic_channel}' of channel with id {str(needed_channel.id)}", guild=vc.guild)
|
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:
|
else:
|
||||||
return
|
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"
|
vc_file = f"{path}/guilds/{str(created_channel.guild.id)}/channels/{str(created_channel.id)}.json"
|
||||||
chan["ownerid"] = member.id
|
chan["ownerid"] = member.id
|
||||||
saveJson(chan, vc_file)
|
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 loadJson("config.json")["enable_nomic"]:
|
||||||
if debug:
|
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)))
|
||||||
appendLog(f"Created nomic channel '{nomic_channel}' ({str(nomic_channel.id)}) for channel '{created_channel}' ({str(created_channel.id)})", guild=vc.guild)
|
if debug:
|
||||||
else:
|
appendLog(f"Created nomic channel '{nomic_channel}' ({str(nomic_channel.id)}) for channel '{created_channel}' ({str(created_channel.id)})", guild=vc.guild)
|
||||||
appendLog(f"Created nomic channel '{nomic_channel}' for channel '{created_channel}'", guild=vc.guild)
|
else:
|
||||||
chan["nomic"] = nomic_channel.id
|
appendLog(f"Created nomic channel '{nomic_channel}' for channel '{created_channel}'", guild=vc.guild)
|
||||||
saveJson(chan, vc_file)
|
chan["nomic"] = nomic_channel.id
|
||||||
|
saveJson(chan, vc_file)
|
||||||
return created_channel
|
return created_channel
|
||||||
|
|
||||||
def isVoiceOfUser(vc, member):
|
def isVoiceOfUser(vc, member):
|
||||||
@ -279,11 +283,12 @@ async def changeNomicPerms(mode, vc, member):
|
|||||||
global path
|
global path
|
||||||
vc_file = f"{path}/guilds/{str(vc.guild.id)}/channels/{str(vc.id)}.json"
|
vc_file = f"{path}/guilds/{str(vc.guild.id)}/channels/{str(vc.id)}.json"
|
||||||
vc_conf = loadJson(vc_file)
|
vc_conf = loadJson(vc_file)
|
||||||
nomic_channel = discord.utils.get(vc.guild.channels, id=vc_conf["nomic"])
|
if loadJson("config.json")["enable_nomic"]:
|
||||||
if mode == "deny":
|
nomic_channel = discord.utils.get(vc.guild.channels, id=vc_conf["nomic"])
|
||||||
await nomic_channel.set_permissions(member, view_channel=False)
|
if mode == "deny":
|
||||||
else:
|
await nomic_channel.set_permissions(member, view_channel=False)
|
||||||
await nomic_channel.set_permissions(member, view_channel=True)
|
else:
|
||||||
|
await nomic_channel.set_permissions(member, view_channel=True)
|
||||||
|
|
||||||
async def clearTrash(client):
|
async def clearTrash(client):
|
||||||
global path
|
global path
|
||||||
|
@ -83,7 +83,8 @@ async def on_voice_state_update(member, before, after):
|
|||||||
await removeUserVoice(vc_from)
|
await removeUserVoice(vc_from)
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
await changeNomicPerms("deny", vc_from, member)
|
if loadJson("config.json")["enable_nomic"]:
|
||||||
|
await changeNomicPerms("deny", vc_from, member)
|
||||||
|
|
||||||
# If user joined vc
|
# If user joined vc
|
||||||
else:
|
else:
|
||||||
@ -91,9 +92,11 @@ async def on_voice_state_update(member, before, after):
|
|||||||
if isVoiceOfUser(vc_from, member):
|
if isVoiceOfUser(vc_from, member):
|
||||||
await removeUserVoice(vc_from)
|
await removeUserVoice(vc_from)
|
||||||
else:
|
else:
|
||||||
await changeNomicPerms("deny", vc_from, member)
|
if loadJson("config.json")["enable_nomic"]:
|
||||||
|
await changeNomicPerms("deny", vc_from, member)
|
||||||
if isUserVoice(vc_to):
|
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 vc_to.id == guildConfGet(vc_to.guild, "channel"):
|
||||||
if guildConfGet(vc_to.guild, "category") is not None:
|
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)
|
voice_chan = await createUserVoice(vc_to, discord.utils.get(vc_to.guild.categories, id=guildConfGet(vc_to.guild, "category")), member)
|
||||||
|
Loading…
Reference in New Issue
Block a user