diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93171ee..0634399 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,34 +58,34 @@ container_scanning: stage: test allow_failure: false -deploy_dev: - stage: deploy - image: debian - before_script: - - apt-get update -qq - - 'which ssh-agent || ( apt-get install -qq openssh-client )' - - eval $(ssh-agent -s) - - ssh-add <(echo "$SSH_PRIVATE_KEY") - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - script: - - ssh $SSH_SERVER "cd /root && docker-compose -f shbot-dev.yaml pull shbot-dev && docker-compose -f shbot-dev.yaml up -d shbot-dev && exit" - only: - - dev - - merge_requests - -deploy_staging: - stage: deploy - image: debian - before_script: - - apt-get update -qq - - 'which ssh-agent || ( apt-get install -qq openssh-client )' - - eval $(ssh-agent -s) - - ssh-add <(echo "$SSH_PRIVATE_KEY") - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - script: - - ssh $SSH_SERVER "cd /root && docker-compose pull shbot && docker-compose up -d shbot && exit" - only: - - master +#deploy_dev: +# stage: deploy +# image: debian +# before_script: +# - apt-get update -qq +# - 'which ssh-agent || ( apt-get install -qq openssh-client )' +# - eval $(ssh-agent -s) +# - ssh-add <(echo "$SSH_PRIVATE_KEY") +# - mkdir -p ~/.ssh +# - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' +# script: +# - ssh $SSH_SERVER "cd /root && docker-compose -f shbot-dev.yaml pull shbot-dev && docker-compose -f shbot-dev.yaml up -d shbot-dev && exit" +# only: +# - dev +# - merge_requests +# +#deploy_staging: +# stage: deploy +# image: debian +# before_script: +# - apt-get update -qq +# - 'which ssh-agent || ( apt-get install -qq openssh-client )' +# - eval $(ssh-agent -s) +# - ssh-add <(echo "$SSH_PRIVATE_KEY") +# - mkdir -p ~/.ssh +# - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' +# script: +# - ssh $SSH_SERVER "cd /root && docker-compose pull shbot && docker-compose up -d shbot && exit" +# only: +# - master \ No newline at end of file diff --git a/bot.py b/bot.py index b7d3939..29c7387 100644 --- a/bot.py +++ b/bot.py @@ -254,7 +254,7 @@ async def vote(ctx, *, arg): await ctx.message.delete() em = discord.Embed(description=arg, colour=0x00E0FF) em.set_author(name=ctx.author.display_name, url=discord.Embed.Empty, icon_url=ctx.author.avatar.url) - ask_msg = await ctx.send(content="||@here||",embed=em) + ask_msg = await ctx.send(content="||@everyone||",embed=em) for x in ["✅", "❔", "❌"]: await ask_msg.add_reaction(x) await ask_msg.create_thread(name="Diskussion")