From 8590c6995503c62703a4e427c5916c9cf933fad3 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 31 May 2021 21:30:43 +0200 Subject: [PATCH] =?UTF-8?q?deplacement=20fonctionnalit=C3=A9=20perso=20dan?= =?UTF-8?q?s=20le=20bon=20cog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/cogs/confreriedukassoulait.py | 20 ++++++++++++++++++++ src/cogs/internet.py | 17 ----------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/cogs/confreriedukassoulait.py b/src/cogs/confreriedukassoulait.py index b2126c8..14815d9 100644 --- a/src/cogs/confreriedukassoulait.py +++ b/src/cogs/confreriedukassoulait.py @@ -7,6 +7,7 @@ from datetime import datetime from pytz import timezone customTimezone = os.environ['TIMEZONE'] from utils.core import goodTimezone, userOrNick +from cogs.internet import Internet def setup(client): client.add_cog(ConfrerieDuKassoulait(client)) @@ -102,3 +103,22 @@ class ConfrerieDuKassoulait(commands.Cog): await channel.send(embed = embed) # ne fonctionne pas quand un message a été supprimé avant que le bot ai démarré # info sur la personne qui a supprimé ne fonctionne pas si il a supprimé un message auparavant (les logs se rajoute a un log deja existant) + + + # autre serveur + @commands.Cog.listener() + async def on_message(self, message): + if message.channel.id == 770805818487865404 or message.channel.id == 772239638240165928: # Le groupe de l'amour ❤❤ -- channel chien/chat + chiens = ["dog", "chien", "potichien"] + chats = ["kat", "mace", "kater", "katze", "sinta", "minoos", "cat", "qitt", "besseh", "katu", "caun", "kazh", + "bisig", "moggy", "kotka", "maow", "gat", "we'sa", "guigna", "kodkod", "mao", "koyangi", "ghjattu", "míw", "pussi", + "gato", "gata", "kato", "kass", "domadh", "demmat", "kissa", "chat", "minou", "piscín", "cath", "k'at'a", "muca", "gali", + "gatos", "popoki", "kike", "chatul", "chatula", "billa", "kat poes", "macska", "cica", "kutjing", "kucing", "köttur", + "gatto", "gattina", "neko", "chma", "pising", "feles", "felix", "kakis", "katé", "qattus", "qattusa", "ngeru", "miz", "felino", + "felina", "muur", "katt", "shimii", "billi", "gorbe", "pusa", "kot", "giat", "pisica", "koshka", "pusi", "macka", "mizhu", + "kotsur", "bisad", "büsi", "chatz", "paka", "muc", "poonai", "puunay", "kocour", "kocka", "maa-oh", "kedi", "kit", "con mêo", + "tchèt", "mouss", "ologbo", "kats", "猫", "кот", "고양이", "poticha", "😼", "ʇɐɥɔ"] + if message.content.lower() in chiens: + await Internet()._dog(await self.client.get_context(message)) + if message.content.lower() in chats: + await Internet()._cat(await self.client.get_context(message)) diff --git a/src/cogs/internet.py b/src/cogs/internet.py index 9e4e40f..1a20475 100644 --- a/src/cogs/internet.py +++ b/src/cogs/internet.py @@ -16,23 +16,6 @@ class Internet(commands.Cog): def __init__(self, client): self.client = client - @commands.Cog.listener() - async def on_message(self, message): - if message.channel.id == 770805818487865404 or message.channel.id == 772239638240165928: # Le groupe de l'amour ❤❤ -- channel chien/chat - chiens = ["dog", "chien", "potichien"] - chats = ["kat", "mace", "kater", "katze", "sinta", "minoos", "cat", "qitt", "besseh", "katu", "caun", "kazh", - "bisig", "moggy", "kotka", "maow", "gat", "we'sa", "guigna", "kodkod", "mao", "koyangi", "ghjattu", "míw", "pussi", - "gato", "gata", "kato", "kass", "domadh", "demmat", "kissa", "chat", "minou", "piscín", "cath", "k'at'a", "muca", "gali", - "gatos", "popoki", "kike", "chatul", "chatula", "billa", "kat poes", "macska", "cica", "kutjing", "kucing", "köttur", - "gatto", "gattina", "neko", "chma", "pising", "feles", "felix", "kakis", "katé", "qattus", "qattusa", "ngeru", "miz", "felino", - "felina", "muur", "katt", "shimii", "billi", "gorbe", "pusa", "kot", "giat", "pisica", "koshka", "pusi", "macka", "mizhu", - "kotsur", "bisad", "büsi", "chatz", "paka", "muc", "poonai", "puunay", "kocour", "kocka", "maa-oh", "kedi", "kit", "con mêo", - "tchèt", "mouss", "ologbo", "kats", "猫", "кот", "고양이", "poticha", "😼", "ʇɐɥɔ"] - if message.content.lower() in chiens: - await self._dog(await self.client.get_context(message)) - if message.content.lower() in chats: - await self._cat(await self.client.get_context(message)) - @commands.command(name='memes', aliases = ['meme']) async def _memes(self, ctx, *args): """Envois un meme de reddit.\n ➡ Syntaxe: {PREFIX}memes/meme [subreddit]⁢⁢⁢⁢⁢⁢⁢⁢⁢⁢"""