diff --git a/botdiscord.py b/botdiscord.py
index 3d9cd318c15d7c738749746d70500a9c39d4f006..e6ffc9c7f079308ad2bfe5e27bdfe605bc0a5b50 100755
--- a/botdiscord.py
+++ b/botdiscord.py
@@ -696,93 +696,96 @@ async def on_reaction_add(reaction, user):
@bot.event
async def on_message(message):
- server = None
try:
- server = message.channel.guild
- print(f'In server : "{server}"')
- except:
- pass
- print(f'New message "{message.content}" from {message.author} ({message.author.id}) in channel {message.channel}')
-
- if message.author == bot.user:
- return 0
- # elif message.channel not in ["commandes", "annonces"] and server is not None and server.name == "MOONLiiGHTe":
- # if "MYR" in message.content.upper():
- # emoji = get(bot.get_all_emojis(), name='myr')
- # await bot.add_reaction(message, emoji)
- # await bot.send_message(message.channel, " <:myr:517650547277430784> ")
- # if "PIXIE" in message.content.upper():
- # emoji = get(bot.get_all_emojis(), name='Pixie')
- # await bot.add_reaction(message, emoji)
- # await bot.send_message(message.channel, " <:Pixie:515526974920458251> ")
- # if "ECLIPSE" in message.content.upper():
- # emoji = get(bot.get_all_emojis(), name='eclipseLogo')
- # await bot.add_reaction(message, emoji)
- # await bot.send_message(message.channel, " <:eclipseLogo:515487100259532815> ")
- # if "LUNE" in message.content.upper():
- # emoji = get(bot.get_all_emojis(), name='lune')
- # await bot.add_reaction(message, emoji)
- # await bot.send_message(message.channel, " <:lune:515483950559264768> ")
- # if "PLOU" in message.content.upper():
- # emoji = get(bot.get_all_emojis(), name=':plouette:')
- # await bot.add_reaction(message, emoji)
- # await bot.send_message(message.channel, emoji)
-
- with open(triggers_whitelist, 'r') as f: # read the trigger whitelist
- if str(message.channel.id) in [line.replace('\n', '') for line in f.readlines()]: # regarde si on peut trigger le channel
- with open(triggers, 'r') as f: # vas check la liste custom de triggers
- for sentence in f.readlines():
- if sentence.split(';')[0].strip().replace('\n', '').lower() in message.content.lower():
- try:
- await message.channel.send(sentence.split(';')[1].strip().replace('\n', ''))
- except:
- pass
-
- # triggers de base
- if any(word.lower() in message.content.lower() for word in ["let\'s go", "c'est parti", "go ", "allons "]):
- await message.channel.send('é zé bardi !')
- if any(word.lower() in message.content.lower().split(' ') for word in ['noice', 'nice']):
- await message.add_reaction(emoji='👌')
- if any(word.lower() in message.content.lower().split(' ') for word in ['cool', 'ok']):
- await message.add_reaction(emoji='👍')
+ server = None
+ try:
+ server = message.channel.guild
+ print(f'In server : "{server}"')
+ except:
+ pass
+ print(f'New message "{message.content}" from {message.author} ({message.author.id}) in channel {message.channel}')
+ if message.author == bot.user:
+ return 0
+ # elif message.channel not in ["commandes", "annonces"] and server is not None and server.name == "MOONLiiGHTe":
+ # if "MYR" in message.content.upper():
+ # emoji = get(bot.get_all_emojis(), name='myr')
+ # await bot.add_reaction(message, emoji)
+ # await bot.send_message(message.channel, " <:myr:517650547277430784> ")
+ # if "PIXIE" in message.content.upper():
+ # emoji = get(bot.get_all_emojis(), name='Pixie')
+ # await bot.add_reaction(message, emoji)
+ # await bot.send_message(message.channel, " <:Pixie:515526974920458251> ")
+ # if "ECLIPSE" in message.content.upper():
+ # emoji = get(bot.get_all_emojis(), name='eclipseLogo')
+ # await bot.add_reaction(message, emoji)
+ # await bot.send_message(message.channel, " <:eclipseLogo:515487100259532815> ")
+ # if "LUNE" in message.content.upper():
+ # emoji = get(bot.get_all_emojis(), name='lune')
+ # await bot.add_reaction(message, emoji)
+ # await bot.send_message(message.channel, " <:lune:515483950559264768> ")
+ # if "PLOU" in message.content.upper():
+ # emoji = get(bot.get_all_emojis(), name=':plouette:')
+ # await bot.add_reaction(message, emoji)
+ # await bot.send_message(message.channel, emoji)
+
+ with open(triggers_whitelist, 'r') as f: # read the trigger whitelist
+ if str(message.channel.id) in [line.replace('\n', '') for line in f.readlines()]: # regarde si on peut trigger le channel
+ with open(triggers, 'r') as f: # vas check la liste custom de triggers
+ for sentence in f.readlines():
+ if sentence.split(';')[0].strip().replace('\n', '').lower() in message.content.lower():
+ try:
+ await message.channel.send(sentence.split(';')[1].strip().replace('\n', ''))
+ except:
+ pass
+
+ # triggers de base
+ if any(word.lower() in message.content.lower() for word in ["let\'s go", "c'est parti", "go ", "allons "]):
+ await message.channel.send('é zé bardi !')
+ if any(word.lower() in message.content.lower().split(' ') for word in ['noice', 'nice']):
+ await message.add_reaction(emoji='👌')
+ if any(word.lower() in message.content.lower().split(' ') for word in ['cool', 'ok']):
+ await message.add_reaction(emoji='👍')
+
+ texte = message.content.split(' ')
+ for mot in texte: # multiple trigger in coming ma geule
+ if mot.lower().strip() == 'ah':
+ await message.channel.send(file=discord.File("images/ah.png"))
+ if 'humm' in mot.lower():
+ await message.channel.send(file=discord.File("images/memes_images/doubt.jpg"))
+ if any(word.lower() in mot.lower() for word in ['facebook', 'fb', 'messenger']):
+ await message.channel.send(random.choice(['aaaahhh ces connards', 'Face de bouc oui !', 'fb c d pd', 'ntm facebook de mon c**', useless.haddock()]))
+ if any(word.lower() in mot.lower() for word in ahah_liste):
+ await message.channel.send(random.choice(ahah_liste))
+ if any(word.lower() in mot.lower() for word in what_liste):
+ await message.channel.send(random.choice(what_liste) + ' ?!')
+
+ # les fameux hl
+ with open(hl_whitelist, 'r') as f: # read the trigger whitelist
texte = message.content.split(' ')
- for mot in texte: # multiple trigger in coming ma geule
- if mot.lower().strip() == 'ah':
- await message.channel.send(file=discord.File("images/ah.png"))
- if 'humm' in mot.lower():
- await message.channel.send(file=discord.File("images/memes_images/doubt.jpg"))
- if any(word.lower() in mot.lower() for word in ['facebook', 'fb', 'messenger']):
- await message.channel.send(random.choice(['aaaahhh ces connards', 'Face de bouc oui !', 'fb c d pd', 'ntm facebook de mon c**', useless.haddock()]))
- if any(word.lower() in mot.lower() for word in ahah_liste):
- await message.channel.send(random.choice(ahah_liste))
- if any(word.lower() in mot.lower() for word in what_liste):
- await message.channel.send(random.choice(what_liste) + ' ?!')
-
- # les fameux hl
- with open(hl_whitelist, 'r') as f: # read the trigger whitelist
- texte = message.content.split(' ')
- if str(message.channel.id) in [line.replace('\n', '') for line in f.readlines()]: # regarde si on peut trigger le channel
- for mot in texte: # multiple trigger in coming ma geule
- if '<@' and '>' in mot:
- try:
- hl = message.content.split('<@')[-1].split('>')[0].replace('!', '')
- print('to hl : ' + hl)
- if int(hl) == bot.user.id:
- await message.add_reaction(emoji='🤖')
- else:
- await message.channel.send(f"Eh tu fera gaffe <@{hl}>, <@{message.author.id}> t'a hl")
- except Exception as e:
- print('ya un probleme dans le trigger hl', e)
- if any(mot.lower() == word for word in ['hl', 'tag']):
- try:
- to_hl = random.choice([member.id for member in message.channel.guild.members if message.channel.permissions_for(member).read_messages])
- await message.channel.send(f"Tiens, <@{message.author.id}> m'a fait penser, faut que je hl <@{to_hl}> ")
- except Exception as e:
- print('erreur dans le random hl', e)
-
- if '/' in message.content.strip() and not any(word in message.content.split(' ') for word in gne_liste):
- await message.channel.send('Gné ?')
- await bot.process_commands(message)
+ if str(message.channel.id) in [line.replace('\n', '') for line in f.readlines()]: # regarde si on peut trigger le channel
+ for mot in texte: # multiple trigger in coming ma geule
+ if '<@' and '>' in mot:
+ try:
+ hl = message.content.split('<@')[-1].split('>')[0].replace('!', '')
+ print('to hl : ' + hl)
+ if int(hl) == bot.user.id:
+ await message.add_reaction(emoji='🤖')
+ else:
+ await message.channel.send(f"Eh tu fera gaffe <@{hl}>, <@{message.author.id}> t'a hl")
+ except Exception as e:
+ print('ya un probleme dans le trigger hl', e)
+ if any(mot.lower() == word for word in ['hl', 'tag']):
+ try:
+ to_hl = random.choice([member.id for member in message.channel.guild.members if message.channel.permissions_for(member).read_messages])
+ await message.channel.send(f"Tiens, <@{message.author.id}> m'a fait penser, faut que je hl <@{to_hl}> ")
+ except Exception as e:
+ print('erreur dans le random hl', e)
+
+ if '/' in message.content.strip() and not any(word in message.content.split(' ') for word in gne_liste):
+ await message.channel.send('Gné ?')
+ await bot.process_commands(message)
+ except Exception as e:
+ print("[ /!\\ ]A BIG ERROR OCCURED : ", e)
bot.run(TOKEN)