From 7952c67aef0091529704c5fec9c03ba6d64ef5c5 Mon Sep 17 00:00:00 2001 From: drone Date: Tue, 25 Oct 2022 01:27:27 +0000 Subject: [PATCH 01/29] Update python Docker tag to v3.11.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7374efc..42884d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM amd64/python:3.10.8-alpine3.16 +FROM amd64/python:3.11.0-alpine3.16 WORKDIR ./ ARG PUID=1000 From 65a7e9048eec6d0a01d7080bef3c812c098accec Mon Sep 17 00:00:00 2001 From: drone Date: Wed, 23 Nov 2022 22:05:20 +0000 Subject: [PATCH 02/29] Update dependency py-cord to v2.3.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1300958..5d6933b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -py-cord==2.2.2 +py-cord==2.3.0 From b4116bf6a08d7c3bcb00f98efd6cc2b81fb3e220 Mon Sep 17 00:00:00 2001 From: drone Date: Thu, 8 Dec 2022 05:05:20 +0000 Subject: [PATCH 03/29] Update python Docker tag to v3.11.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7374efc..9a2e7e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM amd64/python:3.10.8-alpine3.16 +FROM amd64/python:3.11.1-alpine3.16 WORKDIR ./ ARG PUID=1000 From 81f84dddf431ea2ea3981719f5636f838d863281 Mon Sep 17 00:00:00 2001 From: drone Date: Tue, 13 Dec 2022 23:58:02 +0000 Subject: [PATCH 04/29] Update dependency py-cord to v2.3.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5d6933b..59e995e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -py-cord==2.3.0 +py-cord==2.3.2 From a34af09bebb07b9ae118a257c92f949f10e580b0 Mon Sep 17 00:00:00 2001 From: drone Date: Thu, 9 Feb 2023 02:26:51 +0000 Subject: [PATCH 05/29] Update python Docker tag to v3.11.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9a2e7e9..2bed68e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM amd64/python:3.11.1-alpine3.16 +FROM amd64/python:3.11.2-alpine3.16 WORKDIR ./ ARG PUID=1000 From b4fbdc762897123e984093471f66d565da085546 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Sat, 11 Feb 2023 03:15:50 +0000 Subject: [PATCH 06/29] Update dependency py-cord to v2.3.3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 59e995e..1be895a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -py-cord==2.3.2 +py-cord==2.3.3 From 5fdf2b666c005d2daecb5778332c960057cf1d8a Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Sat, 11 Feb 2023 13:16:49 +0000 Subject: [PATCH 07/29] Update dependency py-cord to v2.4.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1be895a..bd223b0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -py-cord==2.3.3 +py-cord==2.4.0 From a0aa24bb41c87b6908324bb50ed0f0ab1c3e58c8 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Mon, 13 Feb 2023 22:19:42 +0100 Subject: [PATCH 08/29] update README for gitea environment --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index baebe92..af469a1 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,22 @@ # SECOND BOT -[![pipeline status](https://git.cxservers.com/aaron-riedel/shbot/badges/master/pipeline.svg)](https://git.cxservers.com/aaron-riedel/shbot/-/commits/master) +[![Build Status](https://drone.ar21.de/api/badges/secondhemd/shbot/status.svg)](https://drone.ar21.de/secondhemd/shbot) der Bot für den SecondHemd Discord # Latest ## Build ``` -docker build -t docker-registry.cxservers.com/aaron-riedel/shbot:latest . +docker build -t secondhemd/shbot:latest . ``` ## Run ``` -sudo docker run -e 'TOKEN=' -e 'PREFIX=$' -t docker-registry.cxservers.com/aaron-riedel/shbot:latest +sudo docker run -e 'TOKEN=' -e 'PREFIX=$' -t secondhemd/shbot:latest ``` ## Docker compose ``` services: bot: - image: docker-registry.cxservers.com/aaron-riedel/shbot:latest + image: secondhemd/shbot:latest container_name: shbot restart: unless-stopped environment: @@ -27,17 +27,17 @@ services: # Development ## Build ``` -docker build -t docker-registry.cxservers.com/aaron-riedel/shbot:dev . +docker build -t secondhemd/shbot:dev . ``` ## Run ``` -sudo docker run -e 'TOKEN=' -e 'PREFIX=$' -t docker-registry.cxservers.com/aaron-riedel/shbot:dev +sudo docker run -e 'TOKEN=' -e 'PREFIX=$' -t secondhemd/shbot:dev ``` ## Docker compose ``` services: bot: - image: docker-registry.cxservers.com/aaron-riedel/shbot:dev + image: secondhemd/shbot:dev container_name: shbot restart: unless-stopped environment: From b5ec9bac9202747841926af54a84acc23483c0c6 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Mon, 20 Mar 2023 23:06:42 +0000 Subject: [PATCH 09/29] Update dependency py-cord to v2.4.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bd223b0..5f27b6b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -py-cord==2.4.0 +py-cord==2.4.1 From 4a029f3bcd7722ea7e2ba0d24ffd5ba9360afd4a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 6 Apr 2023 01:07:49 +0000 Subject: [PATCH 10/29] Update python Docker tag to v3.11.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2bed68e..f663dcc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM amd64/python:3.11.2-alpine3.16 +FROM amd64/python:3.11.3-alpine3.16 WORKDIR ./ ARG PUID=1000 From ee561c5356cf7b61b8ac4d53557c801dc9494f67 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Mon, 29 May 2023 23:04:45 +0200 Subject: [PATCH 11/29] reduce prune days to 7 --- bot.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bot.py b/bot.py index 29c7387..7d58e3b 100644 --- a/bot.py +++ b/bot.py @@ -414,7 +414,7 @@ async def hiebe(ctx, *, arg): await user.create_dm() await user.dm_channel.send("HIEBE :punch: von {}".format(ctx.author.display_name)) -@bot.command(help="kickt Member ohne Rolle, die 30 Tage nicht online waren", usage="") +@bot.command(help="kickt Member ohne Rolle, die 7 Tage nicht online waren", usage="") @is_admin() async def prune(ctx): await ctx.message.delete() @@ -427,8 +427,8 @@ async def prune(ctx): await ctx.send(content="Zeit ausgelaufen", delete_after=5.0) elif view.value: await question.delete() - deleted = await ctx.guild.prune_members(days=30) - await ctx.send(content='Ich habe {} Leichen beseitigt.'.format(deleted), delete_after=5.0) + deleted = await ctx.guild.prune_members(days=7) + await ctx.send(content='Ich habe {} Leiche(n) beseitigt.'.format(deleted), delete_after=5.0) else: await question.delete() From e753423957fd8390199a60ed9993efa29a1bba84 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Mon, 29 May 2023 23:04:57 +0200 Subject: [PATCH 12/29] remove whitespace --- bot.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bot.py b/bot.py index 7d58e3b..2a4c642 100644 --- a/bot.py +++ b/bot.py @@ -101,7 +101,7 @@ class Confirm(discord.ui.View): @bot.slash_command(guild_ids=[261575556708040705]) @commands.has_role(member_role) -async def roll(ctx, +async def roll(ctx, dice: Option(str, "Würfel den/die du werfen willst. z.B. W20, 3d6", default="W20"), ): """Rolle einen oder mehrere Würfel""" @@ -134,7 +134,7 @@ async def roll(ctx, @bot.slash_command(guild_ids=[261575556708040705]) @commands.has_role(gm_role) -async def gmroll(ctx, +async def gmroll(ctx, dice: Option(str, "Würfel den/die du werfen willst. z.B. W20, 3d6", default="W20"), ): """Rolle einen oder mehrere Würfel verdeckt""" @@ -178,7 +178,7 @@ class MyModal(Modal): original_message = await interaction.channel.fetch_message(self.message_id) for x in list(emojitext): await original_message.add_reaction(alphabet[x]) - + @bot.message_command(name="Emoji Text", guild_ids=[261575556708040705]) @commands.has_role(member_role) From f9c496d1589a9dee3b84fd6d10ab6272b75fc378 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Sun, 24 Sep 2023 04:35:05 +0200 Subject: [PATCH 13/29] update pipeline --- .drone.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0f42d89..2fd10a7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,7 +1,7 @@ kind: pipeline name: deploy steps: -- name: docker +- name: docker image: plugins/docker settings: username: @@ -13,8 +13,6 @@ steps: when: branch: - master - event: - - push - name: docker-build image: plugins/docker settings: @@ -26,11 +24,9 @@ steps: tags: latest dry_run: true when: - exclude: - branch: + branch: + exclude: - master - event: - - push - name: dev docker image: plugins/docker settings: @@ -43,8 +39,6 @@ steps: when: branch: - dev - event: - - push - name: deploy image: appleboy/drone-ssh settings: @@ -60,8 +54,6 @@ steps: when: branch: - master - event: - - push - name: deploy dev image: appleboy/drone-ssh settings: @@ -77,5 +69,6 @@ steps: when: branch: - dev - event: - - push \ No newline at end of file +when: + event: + - push \ No newline at end of file From 74fe90b2423c3a395367d1796d0113ed4fc77ba9 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Sat, 25 Nov 2023 21:21:35 +0100 Subject: [PATCH 14/29] update pipeline because of new docker compose --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2fd10a7..c585747 100644 --- a/.drone.yml +++ b/.drone.yml @@ -50,7 +50,7 @@ steps: port: 22 command_timeout: 2m script: - - cd /root && docker-compose pull shbot && docker-compose up -d shbot + - cd /root && docker compose pull shbot && docker compose up -d shbot when: branch: - master @@ -65,7 +65,7 @@ steps: port: 22 command_timeout: 2m script: - - cd /root && docker-compose -f shbot-dev.yaml pull shbot-dev && docker-compose -f shbot-dev.yaml up -d shbot-dev + - cd /root && docker compose -f shbot-dev.yaml pull shbot-dev && docker compose -f shbot-dev.yaml up -d shbot-dev when: branch: - dev From 2a46a5463705800fe6418e4ceac059cfb5e1f1e1 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Sun, 24 Dec 2023 20:27:54 +0100 Subject: [PATCH 15/29] change container registry --- .drone.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.drone.yml b/.drone.yml index c585747..62e6d3e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,25 +2,23 @@ kind: pipeline name: deploy steps: - name: docker - image: plugins/docker - settings: + registry: git.ar21.de username: - from_secret: DOCKER_USERNAME + from_secret: REGISTRY_USER password: - from_secret: DOCKER_PASSWORD - repo: secondhemd/shbot + from_secret: REGISTRY_PASS + repo: git.ar21.de/secondhemd/shbot tags: latest when: branch: - master - name: docker-build - image: plugins/docker - settings: + registry: git.ar21.de username: - from_secret: DOCKER_USERNAME + from_secret: REGISTRY_USER password: - from_secret: DOCKER_PASSWORD - repo: secondhemd/shbot + from_secret: REGISTRY_PASS + repo: git.ar21.de/secondhemd/shbot tags: latest dry_run: true when: @@ -30,11 +28,12 @@ steps: - name: dev docker image: plugins/docker settings: + registry: git.ar21.de username: - from_secret: DOCKER_USERNAME + from_secret: REGISTRY_USER password: - from_secret: DOCKER_PASSWORD - repo: secondhemd/shbot + from_secret: REGISTRY_PASS + repo: git.ar21.de/secondhemd/shbot tags: dev when: branch: From 43a01a753ba9e2938f616ead079a92549bac6f17 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Sun, 24 Dec 2023 20:29:10 +0100 Subject: [PATCH 16/29] fix container registry --- .drone.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 62e6d3e..4aa32d9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,9 @@ kind: pipeline name: deploy steps: - name: docker - registry: git.ar21.de + image: plugins/docker + settings: + registry: git.ar21.de username: from_secret: REGISTRY_USER password: @@ -13,7 +15,9 @@ steps: branch: - master - name: docker-build - registry: git.ar21.de + image: plugins/docker + settings: + registry: git.ar21.de username: from_secret: REGISTRY_USER password: From 5948da8056edfa68868cef3ca2770fe2089df62a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 2 Mar 2024 09:19:30 +0000 Subject: [PATCH 17/29] Update dependency py-cord to v2.5.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5f27b6b..d519adb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -py-cord==2.4.1 +py-cord==2.5.0 From b0a3e48890b120058fb049646bf113fa902f8abe Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Wed, 26 Jun 2024 00:17:25 +0200 Subject: [PATCH 18/29] change compose directory --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4aa32d9..0621ecc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -53,7 +53,7 @@ steps: port: 22 command_timeout: 2m script: - - cd /root && docker compose pull shbot && docker compose up -d shbot + - cd ~/compose/shbot && docker compose pull shbot && docker compose up -d shbot when: branch: - master From a526ec91f51b19de708ab59f2684812f44f862ea Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 9 Jul 2024 19:10:23 +0000 Subject: [PATCH 19/29] Update dependency py-cord to v2.6.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d519adb..22c11d2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -py-cord==2.5.0 +py-cord==2.6.0 From be7db764ecbf2a67da337c40299d1d35b39a8587 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Thu, 11 Jul 2024 21:37:12 +0200 Subject: [PATCH 20/29] roll back to 2.4.1 because of breaking changes --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 22c11d2..5f27b6b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -py-cord==2.6.0 +py-cord==2.4.1 From f16042d81a212a384c842557b261375f0ca8dd51 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Fri, 12 Jul 2024 12:59:26 +0200 Subject: [PATCH 21/29] Update to pycord 2.6.0 and fix the embed --- bot.py | 6 +++--- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bot.py b/bot.py index 2a4c642..b61ec1b 100644 --- a/bot.py +++ b/bot.py @@ -219,7 +219,7 @@ async def survey(ctx, *, arg): desc = desc + emojinumbers[z] + " - " + y + "\n" z = z + 1 em = discord.Embed(title=question, description=desc, colour=0x00E0FF) - em.set_author(name=ctx.author.display_name, url=discord.Embed.Empty, icon_url=ctx.author.avatar.url) + em.set_author(name=ctx.author.display_name, url=None, icon_url=ctx.author.avatar.url) ask_msg = await ctx.send(content="||@everyone||",embed=em) a = 0 for x in emojinumbers: @@ -244,7 +244,7 @@ async def surveyedit(ctx, *, arg): desc = desc + emojinumbers[z] + " - " + y + "\n" z = z + 1 em = discord.Embed(title=question, description=desc, colour=0x00E0FF) - em.set_author(name=ctx.author.display_name, url=discord.Embed.Empty, icon_url=ctx.author.avatar.url) + em.set_author(name=ctx.author.display_name, url=None, icon_url=ctx.author.avatar.url) survey_msg = await ctx.channel.fetch_message((int(survey_id))) await survey_msg.edit(embed=em) @@ -253,7 +253,7 @@ async def surveyedit(ctx, *, arg): 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) + em.set_author(name=ctx.author.display_name, url=None, icon_url=ctx.author.avatar.url) ask_msg = await ctx.send(content="||@everyone||",embed=em) for x in ["✅", "❔", "❌"]: await ask_msg.add_reaction(x) diff --git a/requirements.txt b/requirements.txt index 5f27b6b..22c11d2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -py-cord==2.4.1 +py-cord==2.6.0 From 91a75741bf1734f04ffe368053ecdd05f511ecf8 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Fri, 12 Jul 2024 13:02:21 +0200 Subject: [PATCH 22/29] remove old help and old yesno --- bot.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/bot.py b/bot.py index b61ec1b..ebe8d56 100644 --- a/bot.py +++ b/bot.py @@ -188,24 +188,6 @@ async def emoji_text(ctx, message: discord.Message): modal.set_message_id(message.id) await ctx.interaction.response.send_modal(modal) -@bot.command(help="veraltet", usage="", hidden=True) -@is_member() -async def yesno(ctx): - await ctx.message.delete() - await ctx.send(content="Sorry das geht so nicht. Der Befehl hat sich geändert in !vote... für mehr Informationen schreib bitte !help oder frage deinen Admin oder Apotheker. Liebste Grüße, SecondBot <3", delete_after=20.0) - -@bot.command(help="Zeigt alte Hilfe", usage="") -@is_member() -async def helpme(ctx): - if admin(ctx): - admin_text = "\n\n!add = Hinzufügen einer Rolle mit Textchannel und hinzufügen von Usern zur Rolle\nNutzung: !add \"\" \n\n!labor = bringt dich ins Labor :)\nNutzung: !labor\n\n!start = Starte ne Runde PnP\nNutzung: !start @Rolle\n\n!stop = Beende die gestartete Runde PnP\nNutzung: !stop\n\n!purge = Löschen von Nachrichten\nNutzung: !purge all||x minutes/hours/days/weeks\n\n!prune - kickt Member ohne Rolle, die 30 Tage nicht online waren\nNutzung: !prune" - else: - admin_text = "" - em = discord.Embed(title="Hilfe",description="!survey = Umfrage mit mehreren Antwortmöglichkeiten\nNutzung: !survey | | ...\n\n!vote = Ja/Nein Umfrage\nNutzung: !vote \n\n!love = zeige einem User Liebe\nNutzung: !love <@User1> <@User2> ...\n\n!roll = Rolle einen oder mehrere Würfel\nNutzung: !roll W (z.B. !roll W20 oder !roll 10W6)%s" % admin_text, colour=0x00FF00) - if ctx.author.dm_channel == None: - await ctx.author.create_dm() - await ctx.author.dm_channel.send(embed=em) - @bot.command(help="Umfrage mit mehreren Antwortmöglichkeiten", usage=" | | ...") @is_member() async def survey(ctx, *, arg): From 559d8c216928956458a7c58454a2cd08f7148471 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Fri, 12 Jul 2024 13:07:08 +0200 Subject: [PATCH 23/29] make hiebe and liebe visible in help --- bot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot.py b/bot.py index ebe8d56..3938732 100644 --- a/bot.py +++ b/bot.py @@ -378,7 +378,7 @@ async def purge(ctx, *, arg): deleted = await ctx.channel.purge(limit=limit) await ctx.send(content='Ich habe {} Nachrichten gelöscht.'.format(len(deleted)), delete_after=5.0) -@bot.command(help="zeige einem User Liebe", usage="<@User1> <@User2> ...", hidden=True) +@bot.command(help="zeige einem User Liebe", usage="<@User1> <@User2> ...") @is_member() async def liebe(ctx, *, arg): await ctx.message.delete() @@ -387,7 +387,7 @@ async def liebe(ctx, *, arg): await user.create_dm() await user.dm_channel.send("❤️ von {}".format(ctx.author.display_name)) -@bot.command(help="zeige einem User Hiebe", usage="<@User1> <@User2> ...", hidden=True) +@bot.command(help="zeige einem User Hiebe", usage="<@User1> <@User2> ...") @is_member() async def hiebe(ctx, *, arg): await ctx.message.delete() From a344db3ad1bcc64baff9d9e338c2fe53bd8e7c63 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Fri, 12 Jul 2024 14:20:28 +0200 Subject: [PATCH 24/29] add survey bot --- survey.py | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 survey.py diff --git a/survey.py b/survey.py new file mode 100644 index 0000000..8812b88 --- /dev/null +++ b/survey.py @@ -0,0 +1,42 @@ +import discord +import asyncio +import time +import datetime +import random +import os +from os import system +from os import environ +from discord.ext import commands +from discord.commands import Option +from discord.commands import permissions +from discord.ui import InputText, Modal + +def left(s, amount): + return s[:amount] + +def right(s, amount): + return s[-amount:] + +def mid(s, offset, amount): + return s[offset:offset+amount] + +token = os.environ['TOKEN'] +survey_channel = os.environ['SURVEY_CHANNEL'] +mention_id = os.environ['MENTION_ID'] +guild_id = os.environ['GUILD_ID'] +runtime = 48 + +bot = discord.Bot(description=None) + +@bot.event +async def on_ready(): + print("Bot ready on Version %s..." % discord.__version__) + # build survey + po = discord.Poll(question="Wie habt ihr nächste Woche Zeit?", answers=[discord.PollAnswer(text="Montag", emoji="1\u20E3"), discord.PollAnswer(text="Dienstag", emoji="2\u20E3"), discord.PollAnswer(text="Mittwoch", emoji="3\u20E3"), discord.PollAnswer(text="Donnerstag", emoji="4\u20E3"), discord.PollAnswer(text="Freitag", emoji="5\u20E3"), discord.PollAnswer(text="Samstag", emoji="6\u20E3"), discord.PollAnswer(text="Sonntag", emoji="7\u20E3"), discord.PollAnswer(text="keine Zeit", emoji="❌")], duration=runtime, allow_multiselect=True) + # send message + msg = await bot.get_channel(survey_channel).send(content="||%s||"% bot.get_guild(guild_id).get_role(mention_id).mention ,poll=po) + await msg.create_thread(name="Diskussion") + # close connection + await bot.close() + +bot.run(token) \ No newline at end of file From 4c261a30d4813e91cc4a837044b96b4dfab8e4f2 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Fri, 12 Jul 2024 14:37:49 +0200 Subject: [PATCH 25/29] fix issue with survey script --- survey.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/survey.py b/survey.py index 8812b88..1031c61 100644 --- a/survey.py +++ b/survey.py @@ -21,9 +21,9 @@ def mid(s, offset, amount): return s[offset:offset+amount] token = os.environ['TOKEN'] -survey_channel = os.environ['SURVEY_CHANNEL'] -mention_id = os.environ['MENTION_ID'] -guild_id = os.environ['GUILD_ID'] +survey_channel = int(os.environ['SURVEY_CHANNEL']) +mention_id = int(os.environ['MENTION_ID']) +guild_id = int(os.environ['GUILD_ID']) runtime = 48 bot = discord.Bot(description=None) From 836d6b1d3dac4369acb0469e9a1d3760091ef335 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 15 Sep 2024 20:22:12 +0000 Subject: [PATCH 26/29] Update dependency py-cord to v2.6.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 22c11d2..62f4ab2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -py-cord==2.6.0 +py-cord==2.6.1 From a39ea9e50b0e91260f5b7e7d523780a99786dde2 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Thu, 10 Oct 2024 21:15:00 +0200 Subject: [PATCH 27/29] woodpecker --- .drone.yml | 77 ---------------------------------------- .woodpecker/.build.yaml | 42 ++++++++++++++++++++++ .woodpecker/.deploy.yaml | 34 ++++++++++++++++++ 3 files changed, 76 insertions(+), 77 deletions(-) delete mode 100644 .drone.yml create mode 100644 .woodpecker/.build.yaml create mode 100644 .woodpecker/.deploy.yaml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 0621ecc..0000000 --- a/.drone.yml +++ /dev/null @@ -1,77 +0,0 @@ -kind: pipeline -name: deploy -steps: -- name: docker - image: plugins/docker - settings: - registry: git.ar21.de - username: - from_secret: REGISTRY_USER - password: - from_secret: REGISTRY_PASS - repo: git.ar21.de/secondhemd/shbot - tags: latest - when: - branch: - - master -- name: docker-build - image: plugins/docker - settings: - registry: git.ar21.de - username: - from_secret: REGISTRY_USER - password: - from_secret: REGISTRY_PASS - repo: git.ar21.de/secondhemd/shbot - tags: latest - dry_run: true - when: - branch: - exclude: - - master -- name: dev docker - image: plugins/docker - settings: - registry: git.ar21.de - username: - from_secret: REGISTRY_USER - password: - from_secret: REGISTRY_PASS - repo: git.ar21.de/secondhemd/shbot - tags: dev - when: - branch: - - dev -- name: deploy - image: appleboy/drone-ssh - settings: - host: - - s.ar21.de - username: root - key: - from_secret: DEPLOY_SSH_KEY - port: 22 - command_timeout: 2m - script: - - cd ~/compose/shbot && docker compose pull shbot && docker compose up -d shbot - when: - branch: - - master -- name: deploy dev - image: appleboy/drone-ssh - settings: - host: - - s.ar21.de - username: root - key: - from_secret: DEPLOY_SSH_KEY - port: 22 - command_timeout: 2m - script: - - cd /root && docker compose -f shbot-dev.yaml pull shbot-dev && docker compose -f shbot-dev.yaml up -d shbot-dev - when: - branch: - - dev -when: - event: - - push \ No newline at end of file diff --git a/.woodpecker/.build.yaml b/.woodpecker/.build.yaml new file mode 100644 index 0000000..32ff27f --- /dev/null +++ b/.woodpecker/.build.yaml @@ -0,0 +1,42 @@ +steps: +- name: docker + image: woodpeckerci/plugin-docker-buildx + settings: + registry: git.ar21.de + username: + from_secret: REGISTRY_USER + password: + from_secret: REGISTRY_PASS + repo: git.ar21.de/secondhemd/shbot + tags: latest + when: + - branch: master + event: [push, manual] +- name: docker-build + image: woodpeckerci/plugin-docker-buildx + settings: + registry: git.ar21.de + username: + from_secret: REGISTRY_USER + password: + from_secret: REGISTRY_PASS + repo: git.ar21.de/secondhemd/shbot + tags: latest + dry_run: true + when: + - branch: + exclude: [master, dev] + event: [push, manual] +- name: dev docker + image: woodpeckerci/plugin-docker-buildx + settings: + registry: git.ar21.de + username: + from_secret: REGISTRY_USER + password: + from_secret: REGISTRY_PASS + repo: git.ar21.de/secondhemd/shbot + tags: dev + when: + - branch: dev + event: [push, manual] diff --git a/.woodpecker/.deploy.yaml b/.woodpecker/.deploy.yaml new file mode 100644 index 0000000..fb99a19 --- /dev/null +++ b/.woodpecker/.deploy.yaml @@ -0,0 +1,34 @@ +skip_clone: true +steps: +- name: deploy + image: appleboy/drone-ssh + settings: + host: + - s.ar21.de + username: root + key: + from_secret: DEPLOY_SSH_KEY + port: 22 + command_timeout: 2m + script: + - cd ~/compose/shbot && docker compose pull shbot && docker compose up -d shbot + when: + - branch: master + event: [push, manual] +- name: deploy dev + image: appleboy/drone-ssh + settings: + host: + - s.ar21.de + username: root + key: + from_secret: DEPLOY_SSH_KEY + port: 22 + command_timeout: 2m + script: + - cd /root && docker compose -f shbot-dev.yaml pull shbot-dev && docker compose -f shbot-dev.yaml up -d shbot-dev + when: + - branch: dev + event: [push, manual] +depends_on: + - build From 98f491860da2fed27fd8896d0b5001fb5d0e397b Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Thu, 10 Oct 2024 21:19:16 +0200 Subject: [PATCH 28/29] remove gitlab ci --- .gitlab-ci.yml | 91 -------------------------------------------------- 1 file changed, 91 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 93171ee..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,91 +0,0 @@ -stages: # List of stages for jobs, and their order of execution - - build - - test - - deploy - -docker-build-push: - # Use the official docker image. - image: docker:latest - stage: build - services: - - docker:dind - before_script: - - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - script: - - docker build --pull -t "$CI_REGISTRY_IMAGE" . - - docker push "$CI_REGISTRY_IMAGE" - allow_failure: false - only: - - master - -docker-build-push-dev: - # Use the official docker image. - image: docker:latest - stage: build - services: - - docker:dind - before_script: - - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - script: - - docker build --pull -t "$CI_REGISTRY_IMAGE:dev" . - - docker push "$CI_REGISTRY_IMAGE:dev" - allow_failure: false - only: - - dev - - merge_requests - -docker-build: - image: docker:latest - stage: build - services: - - docker:dind - before_script: - - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - script: - - docker build --pull -t "$CI_REGISTRY_IMAGE" . - allow_failure: false - except: - - master - - dev - - merge_requests - -include: - - template: Security/Container-Scanning.gitlab-ci.yml - - template: Security/SAST.gitlab-ci.yml -container_scanning: - variables: - DOCKER_IMAGE: "$CI_REGISTRY_IMAGE${tag}" - 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 - \ No newline at end of file From 7e4e23bdeaeaafb386006751e1fa22cf73e4510f Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Tue, 3 Dec 2024 21:47:16 +0100 Subject: [PATCH 29/29] update survey text --- survey.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/survey.py b/survey.py index 1031c61..7a19419 100644 --- a/survey.py +++ b/survey.py @@ -32,10 +32,10 @@ bot = discord.Bot(description=None) async def on_ready(): print("Bot ready on Version %s..." % discord.__version__) # build survey - po = discord.Poll(question="Wie habt ihr nächste Woche Zeit?", answers=[discord.PollAnswer(text="Montag", emoji="1\u20E3"), discord.PollAnswer(text="Dienstag", emoji="2\u20E3"), discord.PollAnswer(text="Mittwoch", emoji="3\u20E3"), discord.PollAnswer(text="Donnerstag", emoji="4\u20E3"), discord.PollAnswer(text="Freitag", emoji="5\u20E3"), discord.PollAnswer(text="Samstag", emoji="6\u20E3"), discord.PollAnswer(text="Sonntag", emoji="7\u20E3"), discord.PollAnswer(text="keine Zeit", emoji="❌")], duration=runtime, allow_multiselect=True) + po = discord.Poll(question="Habt ihr nächsten Dienstag Zeit?", answers=[discord.PollAnswer(text="Ja", emoji="✅"), discord.PollAnswer(text="keine Zeit", emoji="❌")], duration=runtime, allow_multiselect=False) # send message msg = await bot.get_channel(survey_channel).send(content="||%s||"% bot.get_guild(guild_id).get_role(mention_id).mention ,poll=po) - await msg.create_thread(name="Diskussion") + # await msg.create_thread(name="Diskussion") # close connection await bot.close()