Merge branch 'dev' of https://github.com/SuperAnt220/antbot into dev

FuncFusion · Sep 24, 2024 · 2e86174 · 2e86174
2 parents 103b3b2 + 283a677
commit 2e86174
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/assets/links.json b/assets/links.json
@@ -35,10 +35,10 @@
 	"https://modrinth.com/mod/datamancer": ["Datamancer","dtmncr","dm","датамансер","датамансер","дм","вфефьфтсук"],
 	"https://modrinth.com/mod/datapack-debugger": ["Datapack Debugger mod","dp debugger","breakpoint mod","датапак дебаггер мод","дебаггер датапаков","брейкпоинт мод","дпдбг","вфефзфсл вуигппук"],
 	"https://www.blockbench.net/": ["Blockbench website", "bb site","сайт блокбенча","сайт бб"],
-	"https://discord.gg/QAFXFtZ": ["Minecraft Commands discord server","minecraft commands server","minecraft commands discord","mcc discord","mcc server","майнкрафт коммандс дискорд сервер","майнкрафт коммандс дискорд","майнкрафт коммандс сервер","мкк сервер","мкк дискорд","mcc сервер","mcc дискорд","сервер mcc","дискорд mcc"],
+	"https://discord.gg/QAFXFtZ": ["Minecraft Commands discord server","minecraft commands server","minecraft commands discord","mcc discord","mcc server","майнкрафт коммандс дискорд сервер","майнкрафт коммандс дискорд","майнкрафт коммандс сервер","мкк сервер","мкк дискорд"],
 	"https://discord.gg/blockbench": ["Blockbench discord server","Blockbench server","bb server","bb discord","блокбенч дискорд","бб дискорд сервер","бб дс"],
 	"https://animated-java.dev/": ["Animated Java Website","animated java site","aj site","сайт анимейтейд джава","адж сайт","фтшьфеув офмф цуиышеу"],
-	"https://discord.gg/SQ6tTXbmUJ": ["Animated Java discord server","Animated Java server","aj server","animated java discord","aj discord","адж дискорд сервер","адж дс","адж сервер","сервер адж","сервер aj","aj сервер"],
+	"https://discord.gg/SQ6tTXbmUJ": ["Animated Java discord server","Animated Java server","aj server","animated java discord","aj discord","адж дискорд сервер","адж дс"],
 	"https://discord.gg/RpzWN9S": ["ShaderLABS discord server","shaderlabs","шейдерлабс дискорд сервер","шейдерлабс","ырфвукдфиы"],
 	"https://github.com/kemo14331/Particle-Converter/blob/main/README_EN.md": ["Particle Converter","particle-convert","image to particles","партикл конвертер","партикл конверт","картинку в партиклы","конвертер частиц","зфкешсду сщтмукеук"],
 	"https://weld.smithed.dev/": ["Weld","pack merger","weld.smithed.dev","велд","слиятель паков","цудв"],

diff --git a/cogs/general/join_leave_messages.py b/cogs/general/join_leave_messages.py
@@ -43,7 +43,7 @@ def __init__(self, bot):
 
 	@commands.Cog.listener("on_member_join")
 	async def on_member_join(self, member):
-		if member.guild_id != GUILD:
+		if member.guild.id != GUILD:
 			return
 		greeting_msg = choice([
 			"Добро пожаловать, {0}. Мы надеемся, что ты принёс пиццу",
@@ -63,7 +63,7 @@ async def on_member_join(self, member):
 
 	@commands.Cog.listener("on_raw_member_remove")
 	async def on_raw_member_remove(self, payload):
-		if payload.guild_id != GUILD:
+		if payload.guild.id != GUILD:
 			return
 		user = payload.user
 		leaving_msg = choice([

diff --git a/utils/tree_gen.py b/utils/tree_gen.py
@@ -6,7 +6,7 @@ def generate_tree(folders: str):
 	for idx, item in enumerate(folders):
 		name = item.lstrip()
 		if idx == len(folders)-1:
-			indent_difference == 0
+			indent_difference = 0
 			if item == "":break
 		else:
 			indent_difference = (len(next_item:=folders[idx+1]) - len(next_item.lstrip())) - (len(item.replace(name, "")))