From b889beaa39fb60adb81c422fc9ccc30b3ebd8293 Mon Sep 17 00:00:00 2001 From: AnInternetTroll Date: Thu, 11 Jun 2020 21:22:49 +0200 Subject: minor fixes and !serverinfo --- main.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 main.py (limited to 'main.py') diff --git a/main.py b/main.py old mode 100755 new mode 100644 -- cgit v1.2.3 From 452cc8c997a47e95415a54b7130e70b37ee23266 Mon Sep 17 00:00:00 2001 From: AnInternetTroll Date: Sun, 21 Jun 2020 13:05:46 +0100 Subject: modified: cogs/logs.py --- .gitignore | 0 .vscode/settings.json | 0 bot.py | 0 cogs/admin.py | 0 cogs/general.py | 0 cogs/help.py | 0 cogs/logs.py | 0 cogs/player.py | 0 cogs/src.py | 0 cogs/trans.py | 0 cogs/utils.py | 0 custom_commands.json | 0 main.py | 0 palette.png | Bin 14 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .vscode/settings.json mode change 100644 => 100755 bot.py mode change 100644 => 100755 cogs/admin.py mode change 100644 => 100755 cogs/general.py mode change 100644 => 100755 cogs/help.py mode change 100644 => 100755 cogs/logs.py mode change 100644 => 100755 cogs/player.py mode change 100644 => 100755 cogs/src.py mode change 100644 => 100755 cogs/trans.py mode change 100644 => 100755 cogs/utils.py mode change 100644 => 100755 custom_commands.json mode change 100644 => 100755 main.py mode change 100644 => 100755 palette.png (limited to 'main.py') diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.vscode/settings.json b/.vscode/settings.json old mode 100644 new mode 100755 diff --git a/bot.py b/bot.py old mode 100644 new mode 100755 diff --git a/cogs/admin.py b/cogs/admin.py old mode 100644 new mode 100755 diff --git a/cogs/general.py b/cogs/general.py old mode 100644 new mode 100755 diff --git a/cogs/help.py b/cogs/help.py old mode 100644 new mode 100755 diff --git a/cogs/logs.py b/cogs/logs.py old mode 100644 new mode 100755 diff --git a/cogs/player.py b/cogs/player.py old mode 100644 new mode 100755 diff --git a/cogs/src.py b/cogs/src.py old mode 100644 new mode 100755 diff --git a/cogs/trans.py b/cogs/trans.py old mode 100644 new mode 100755 diff --git a/cogs/utils.py b/cogs/utils.py old mode 100644 new mode 100755 diff --git a/custom_commands.json b/custom_commands.json old mode 100644 new mode 100755 diff --git a/main.py b/main.py old mode 100644 new mode 100755 diff --git a/palette.png b/palette.png old mode 100644 new mode 100755 -- cgit v1.2.3 From 3c7c0f5aaaebcc207611de3b638bdbfe189decb3 Mon Sep 17 00:00:00 2001 From: Mango0x45 Date: Thu, 25 Jun 2020 09:37:34 +0200 Subject: removed some useless spaces --- main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main.py') diff --git a/main.py b/main.py index 9f713bf..13bc0f0 100755 --- a/main.py +++ b/main.py @@ -29,9 +29,9 @@ def run_bot(): bot.run() if __name__ == "__main__": - + init_colorama(autoreset=True) setup_logging() - + run_bot() -- cgit v1.2.3 From dcfc891b717abd0cbb0e8b1348ec7459c7ff150b Mon Sep 17 00:00:00 2001 From: AnInternetTroll Date: Fri, 26 Jun 2020 20:54:42 +0200 Subject: Added basic compiler --- .gitignore | 0 .vscode/settings.json | 0 bot.py | 3 +- cogs/compiler.py | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ cogs/general.py | 0 cogs/help.py | 0 cogs/logs.py | 0 cogs/player.py | 0 cogs/src.py | 0 cogs/trans.py | 0 cogs/utils.py | 0 custom_commands.json | 0 main.py | 0 palette.png | Bin 14 files changed, 80 insertions(+), 1 deletion(-) mode change 100755 => 100644 .gitignore mode change 100755 => 100644 .vscode/settings.json mode change 100755 => 100644 bot.py create mode 100644 cogs/compiler.py mode change 100755 => 100644 cogs/general.py mode change 100755 => 100644 cogs/help.py mode change 100755 => 100644 cogs/logs.py mode change 100755 => 100644 cogs/player.py mode change 100755 => 100644 cogs/src.py mode change 100755 => 100644 cogs/trans.py mode change 100755 => 100644 cogs/utils.py mode change 100755 => 100644 custom_commands.json mode change 100755 => 100644 main.py mode change 100755 => 100644 palette.png (limited to 'main.py') diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/.vscode/settings.json b/.vscode/settings.json old mode 100755 new mode 100644 diff --git a/bot.py b/bot.py old mode 100755 new mode 100644 index d67dc3c..6c0720d --- a/bot.py +++ b/bot.py @@ -13,7 +13,8 @@ extensions = [ "cogs.trans", "cogs.player", "cogs.general", - "cogs.logs" + "cogs.logs", + "cogs.compiler" ] diff --git a/cogs/compiler.py b/cogs/compiler.py new file mode 100644 index 0000000..3046349 --- /dev/null +++ b/cogs/compiler.py @@ -0,0 +1,78 @@ +from discord.ext import commands +import discord +import requests +import json + +class Compiler(commands.Cog): + def __init__(self, bot): + self.bot = bot + + @commands.command() + async def compile(self, ctx, language=None, *, code=None): + """ + listRequest = requests.get("https://wandbox.org/api/list.json") + compilerList = json.loads(listRequest.text) + + for i in compilerList: + if i["language"] == language: + compiler = i["name"] + print(compiler) + """ + compilers = { + "python":"cpython-3.8.0", + "c":"gcc-head-c", + "javascript":"nodejs-head", + "typescript":"typescript-3.5.1", + "c#":"dotnetcore-head", + "bash": "bash", + "vim-script": "vim-head", + "cpp": "gcc-head", + "swift": "swift-5.0.1", + "php": "php-head", + "coffeescript": "coffeescript-head", + "go": "go-head", + "java": "openjdk-head", + "ruby": "ruby-head", + "rust": "rust-head", + "sql": "sqlite-head", + "perl": "perl-head", + "lua": "lua-5.3.4" + } + if not language: + await ctx.send(f"```json\n{json.dumps(compilers, indent=4)}```") + if not code: + await ctx.send("No code found") + return + try: + compiler = compilers[language] + except KeyError: + await ctx.send("Language not found") + return + body = { + "compiler": compiler, + "code": code, + "save": True + } + head = { + "Content-Type":"application/json" + } + async with ctx.typing(): + r = requests.post("https://wandbox.org/api/compile.json", headers=head, data=json.dumps(body)) + try: + response = json.loads(r.text) + #await ctx.send(f"```json\n{json.dumps(response, indent=4)}```") + print(f"```json\n{json.dumps(response, indent=4)}```") + except json.decoder.JSONDecodeError: + await ctx.send(f"```json\n{r.text}```") + + try: + embed=discord.Embed(title="Compiled code") + embed.add_field(name="Output", value=f'```{response["program_message"]}```', inline=False) + embed.add_field(name="Exit code", value=response["status"], inline=True) + embed.add_field(name="Link", value=f"[Permalink]({response['url']})", inline=True) + await ctx.send(embed=embed) + except KeyError: + await ctx.send(f"```json\n{json.dumps(response, indent=4)}```") + +def setup(bot): + bot.add_cog(Compiler(bot)) \ No newline at end of file diff --git a/cogs/general.py b/cogs/general.py old mode 100755 new mode 100644 diff --git a/cogs/help.py b/cogs/help.py old mode 100755 new mode 100644 diff --git a/cogs/logs.py b/cogs/logs.py old mode 100755 new mode 100644 diff --git a/cogs/player.py b/cogs/player.py old mode 100755 new mode 100644 diff --git a/cogs/src.py b/cogs/src.py old mode 100755 new mode 100644 diff --git a/cogs/trans.py b/cogs/trans.py old mode 100755 new mode 100644 diff --git a/cogs/utils.py b/cogs/utils.py old mode 100755 new mode 100644 diff --git a/custom_commands.json b/custom_commands.json old mode 100755 new mode 100644 diff --git a/main.py b/main.py old mode 100755 new mode 100644 diff --git a/palette.png b/palette.png old mode 100755 new mode 100644 -- cgit v1.2.3 From 5eb37689ae2aac9d0a6aa10d72f14609d12dc985 Mon Sep 17 00:00:00 2001 From: AnInternetTroll Date: Sat, 27 Jun 2020 14:16:19 +0100 Subject: modified: cogs/admin.py modified: cogs/compiler.py --- .gitignore | 0 .vscode/settings.json | 0 bot.py | 0 cogs/admin.py | 5 ++++- cogs/compiler.py | 0 cogs/general.py | 0 cogs/help.py | 0 cogs/logs.py | 0 cogs/player.py | 0 cogs/src.py | 0 cogs/trans.py | 0 cogs/utils.py | 0 custom_commands.json | 0 main.py | 0 palette.png | Bin 15 files changed, 4 insertions(+), 1 deletion(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .vscode/settings.json mode change 100644 => 100755 bot.py mode change 100644 => 100755 cogs/compiler.py mode change 100644 => 100755 cogs/general.py mode change 100644 => 100755 cogs/help.py mode change 100644 => 100755 cogs/logs.py mode change 100644 => 100755 cogs/player.py mode change 100644 => 100755 cogs/src.py mode change 100644 => 100755 cogs/trans.py mode change 100644 => 100755 cogs/utils.py mode change 100644 => 100755 custom_commands.json mode change 100644 => 100755 main.py mode change 100644 => 100755 palette.png (limited to 'main.py') diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.vscode/settings.json b/.vscode/settings.json old mode 100644 new mode 100755 diff --git a/bot.py b/bot.py old mode 100644 new mode 100755 diff --git a/cogs/admin.py b/cogs/admin.py index 67ffa4c..6c15e5e 100644 --- a/cogs/admin.py +++ b/cogs/admin.py @@ -32,7 +32,10 @@ class Admin(commands.Cog): @commands.check(is_mod) async def pull(self, ctx): g = git.cmd.Git(os.getcwd()) - await ctx.send(f"Probably pulled.\n```bash\n{g.pull()}```") + try: + await ctx.send(f"Probably pulled.\n```bash\n{g.pull()}```") + except git.exc.GitCommandError as e: + await ctx.send(f"An error has occured when pulling```bash\n{e}```") @commands.command(aliases=['addcommand', 'newcommand']) @commands.check(is_mod) diff --git a/cogs/compiler.py b/cogs/compiler.py old mode 100644 new mode 100755 diff --git a/cogs/general.py b/cogs/general.py old mode 100644 new mode 100755 diff --git a/cogs/help.py b/cogs/help.py old mode 100644 new mode 100755 diff --git a/cogs/logs.py b/cogs/logs.py old mode 100644 new mode 100755 diff --git a/cogs/player.py b/cogs/player.py old mode 100644 new mode 100755 diff --git a/cogs/src.py b/cogs/src.py old mode 100644 new mode 100755 diff --git a/cogs/trans.py b/cogs/trans.py old mode 100644 new mode 100755 diff --git a/cogs/utils.py b/cogs/utils.py old mode 100644 new mode 100755 diff --git a/custom_commands.json b/custom_commands.json old mode 100644 new mode 100755 diff --git a/main.py b/main.py old mode 100644 new mode 100755 diff --git a/palette.png b/palette.png old mode 100644 new mode 100755 -- cgit v1.2.3