From f0939b99d71088c95e2b69616e1fee96b44ce167 Mon Sep 17 00:00:00 2001 From: NoirPi <34034616+NoirPi@users.noreply.github.com> Date: Sat, 27 Apr 2019 13:49:23 +0200 Subject: Updated Bot to latest github.com Version of discord.py Version Number: 1.1.0a1886+ga7f3300 Added guild variable Added print if reload throws Exceptions Signed-off-by: NoirPi <34034616+NoirPi@users.noreply.github.com> --- modules/execute.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'modules/execute.py') diff --git a/modules/execute.py b/modules/execute.py index 21e8fa3..024c1ec 100644 --- a/modules/execute.py +++ b/modules/execute.py @@ -3,13 +3,15 @@ from collections import defaultdict from datetime import datetime, timedelta from typing import Pattern -from discord import Embed, Message, Guild, TextChannel, Member +from discord import Embed, Guild, Member, Message, TextChannel +from discord.ext import commands from discord.ext.commands import Bot from compile_api import execute CODE_BLOCK_REGEX: Pattern = re.compile("```(?P.*)\n(?P[\\s\\S]*?)```") -INPUT_BLOCK_REGEX: Pattern = re.compile("input[: \t\n]*```(?P.*)?\n(?P[\\s\\S]*?)```", re.IGNORECASE) +INPUT_BLOCK_REGEX: Pattern = \ + re.compile("input[: \t\n]*```(?P.*)?\n(?P[\\s\\S]*?)```", re.IGNORECASE) PYTHON_3 = 24 NODEJS = 17 @@ -56,12 +58,13 @@ languages = { } -class ExecuteCog(object): +class ExecuteCog(commands.Cog, object): def __init__(self, bot: Bot): self.bot: Bot = bot self.last_messaged = defaultdict(lambda: datetime.fromtimestamp(0)) # noinspection PyMethodMayBeStatic + @commands.Cog.listener() async def on_message(self, message: Message): if message.guild is None: return @@ -89,7 +92,7 @@ class ExecuteCog(object): embed=Embed( description=f"You are not allowed to eval code again. Check again in " f"{(timedelta(seconds=30)-delta).seconds}secs")) - if not author.guild_permissions.manage_messages and not author.id == 310702108997320705: + if not author.guild_permissions.manage_messages and not author.id == 280766063472541697: self.last_messaged[author.id] = datetime.now() language = languages[lang] print(language) -- cgit From df26076b99388dabd36ee32a0182a1078a567661 Mon Sep 17 00:00:00 2001 From: Roman Gräf Date: Sun, 28 Apr 2019 14:20:16 +0200 Subject: Update execute.py No need to inherit from object, reverted back to myself as global admin --- modules/execute.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/execute.py') diff --git a/modules/execute.py b/modules/execute.py index 024c1ec..bdc4d3f 100644 --- a/modules/execute.py +++ b/modules/execute.py @@ -58,7 +58,7 @@ languages = { } -class ExecuteCog(commands.Cog, object): +class ExecuteCog(commands.Cog): def __init__(self, bot: Bot): self.bot: Bot = bot self.last_messaged = defaultdict(lambda: datetime.fromtimestamp(0)) @@ -92,7 +92,7 @@ class ExecuteCog(commands.Cog, object): embed=Embed( description=f"You are not allowed to eval code again. Check again in " f"{(timedelta(seconds=30)-delta).seconds}secs")) - if not author.guild_permissions.manage_messages and not author.id == 280766063472541697: + if not author.guild_permissions.manage_messages and not author.id == 310702108997320705: self.last_messaged[author.id] = datetime.now() language = languages[lang] print(language) -- cgit