From 6bd18035cea4e3c9894ca51ea730b8604d1341f3 Mon Sep 17 00:00:00 2001 From: luke Date: Fri, 24 Jul 2020 14:21:45 -0700 Subject: [PATCH] updates to the updated bot and changing storage driver --- .gitlab-ci.yml | 2 +- Dockerfile-test-env.bak | 14 -------------- app/dragon-bot-updated.py | 19 +++++++++++++++++++ 3 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 Dockerfile-test-env.bak diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eee6d0a2..8ce1cf64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ services: command: ["dockerd-entrypoint.sh"] variables: DOCKER_TLS_CERTDIR: "" - DOCKER_DRIVER: overlay + DOCKER_DRIVER: overlay2 stages: - linting diff --git a/Dockerfile-test-env.bak b/Dockerfile-test-env.bak deleted file mode 100644 index a036b858..00000000 --- a/Dockerfile-test-env.bak +++ /dev/null @@ -1,14 +0,0 @@ -FROM python:3.6.2-alpine3.6 -ADD app/requirements.txt /requirements.txt -RUN apk update && \ - apk add --no-cache vim docker build-base && \ - pip install -U pip && \ - pip install pylint && \ - pip install -r requirements.txt - -ADD app /app -RUN printf "\n\nTesting your python code for errors\n\n" && \ - pylint -E /app/*.py - -WORKDIR /app -RUN printf "\n#########################\n Run dragon bot by typing \n python dragon-bot.py\n#########################\n\n" diff --git a/app/dragon-bot-updated.py b/app/dragon-bot-updated.py index 4a4fc6d2..f1ddb50f 100644 --- a/app/dragon-bot-updated.py +++ b/app/dragon-bot-updated.py @@ -60,4 +60,23 @@ async def purge(ctx): return await ctx.message.channel.purge(limit=num, check=is_me) +@bot.command(name='cleanup') +async def cleanup(ctx): + def is_discord_bot(m): + return m.author == bot.user + + num = 20 + if len(ctx.message.content.split()) > 1: + try: + num = int(ctx.message.content.split()[1]) + 1 + except ValueError: + await ctx.send( + ctx.message.channel, + "You need to give me a number, you entered {}".format( + ctx.message.content.split()[1] + ) + ) + return + await ctx.message.channel.purge(limit=num, check=is_discord_bot) + bot.run(TOKEN)