From 640d481018aaefc5b4d309ace133c5753f1439dc Mon Sep 17 00:00:00 2001 From: imcompiling Date: Tue, 21 Mar 2023 21:41:51 -0400 Subject: [PATCH 01/25] Add guild name to database on join. --- cogs/guild_listener/__init__.py | 4 ++-- highscores_database.sql | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cogs/guild_listener/__init__.py b/cogs/guild_listener/__init__.py index c428826..4312305 100644 --- a/cogs/guild_listener/__init__.py +++ b/cogs/guild_listener/__init__.py @@ -8,7 +8,7 @@ from sqlalchemy.orm import Session # pylint: disable=import-error from utilities.sql_data_classes import Guild, engine -from utilities.utils import add_preset_configuration +from utilities.utils import add_preset_configuration # TODO class GuildListener(commands.Cog, name="Guild Listener"): @@ -21,7 +21,7 @@ class GuildListener(commands.Cog, name="Guild Listener"): async def on_guild_join(self, guild: nextcord.Guild): """Listener for Guild Join. Adds guild to database.""" - new_guild = Guild(GuildId=guild.id) + new_guild = Guild(GuildId=guild.id, GuildName=guild.name) with Session(engine) as session: session.add(new_guild) diff --git a/highscores_database.sql b/highscores_database.sql index ae0a0f6..992f43f 100644 --- a/highscores_database.sql +++ b/highscores_database.sql @@ -3,6 +3,7 @@ use highscores; CREATE TABLE Guilds( GuildId bigint unsigned not null unique, + GuildName varchar(95) not null, SubmissionChannel bigint unsigned, VerificationChannel bigint unsigned, PRIMARY KEY (GuildId) From 16b662875f4181a5c6f7a8894e37a30a7ac9465e Mon Sep 17 00:00:00 2001 From: imcompiling Date: Tue, 21 Mar 2023 21:53:04 -0400 Subject: [PATCH 02/25] Add build_develop workflow. --- .gitea/workflows/build_develop.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .gitea/workflows/build_develop.yml diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml new file mode 100644 index 0000000..9192803 --- /dev/null +++ b/.gitea/workflows/build_develop.yml @@ -0,0 +1,16 @@ +name: build_develop + +on: + push: + branches: [develop] + +jobs: + build_develop: + runs-on: docker:dind + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - run: git fetch --force --tags + - run: docker build -t viker.cheezers.net:5000/agon:develop . + - run: docker push viker.cheezers.net:5000/agon:develop From 1b337a291dbe69cd8f1f2d4b7ee5eaabc3fe48bb Mon Sep 17 00:00:00 2001 From: imcompiling Date: Tue, 21 Mar 2023 22:06:46 -0400 Subject: [PATCH 03/25] add demo workflow --- .gitea/workflows/demo.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .gitea/workflows/demo.yml diff --git a/.gitea/workflows/demo.yml b/.gitea/workflows/demo.yml new file mode 100644 index 0000000..e007988 --- /dev/null +++ b/.gitea/workflows/demo.yml @@ -0,0 +1,18 @@ +name: GitHub Actions Demo +run-name: ${{ github.actor }} is testing out GitHub Actions 🚀 +on: [push] +jobs: + Explore-GitHub-Actions: + runs-on: ubuntu-latest + steps: + - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." + - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" + - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." + - name: Check out repository code + uses: actions/checkout@v3 + - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner." + - run: echo "🖥️ The workflow is now ready to test your code on the runner." + - name: List files in the repository + run: | + ls ${{ github.workspace }} + - run: echo "🍏 This job's status is ${{ job.status }}." From c43b2297a45d07a701a33fc760707e42249fd281 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 18:56:20 -0400 Subject: [PATCH 04/25] Change runs-on, use action to build docker image. --- .gitea/workflows/build_develop.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 9192803..391ca16 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -5,12 +5,16 @@ on: branches: [develop] jobs: - build_develop: - runs-on: docker:dind + build: + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout Code + uses: actions/checkout@v3 with: fetch-depth: 0 - - run: git fetch --force --tags - - run: docker build -t viker.cheezers.net:5000/agon:develop . - - run: docker push viker.cheezers.net:5000/agon:develop + - name: Build and push to viker registry + uses: docker/build-push-action@v4 + with: + context: . + push: true + tags: viker.cheezers.net:5000/agon:develop From 3b597aeac7cc32d8d68a7b482d899f0aa3b08aff Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 19:11:22 -0400 Subject: [PATCH 05/25] delete unneeded files. --- .gitea/workflows/demo.yml | 18 ------------------ build_develop.sh | 7 ------- build_release.sh | 17 ----------------- 3 files changed, 42 deletions(-) delete mode 100644 .gitea/workflows/demo.yml delete mode 100755 build_develop.sh delete mode 100644 build_release.sh diff --git a/.gitea/workflows/demo.yml b/.gitea/workflows/demo.yml deleted file mode 100644 index e007988..0000000 --- a/.gitea/workflows/demo.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: GitHub Actions Demo -run-name: ${{ github.actor }} is testing out GitHub Actions 🚀 -on: [push] -jobs: - Explore-GitHub-Actions: - runs-on: ubuntu-latest - steps: - - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" - - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." - - name: Check out repository code - uses: actions/checkout@v3 - - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner." - - run: echo "🖥️ The workflow is now ready to test your code on the runner." - - name: List files in the repository - run: | - ls ${{ github.workspace }} - - run: echo "🍏 This job's status is ${{ job.status }}." diff --git a/build_develop.sh b/build_develop.sh deleted file mode 100755 index abd2e50..0000000 --- a/build_develop.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -x - -# this file is intended to build the docker image and push to the correct repository. Intended to be run by my buildbot instance. - -# build, tag, and push develop -docker build -t viker.cheezers.net:5000/agon:develop . -docker push viker.cheezers.net:5000/agon:develop \ No newline at end of file diff --git a/build_release.sh b/build_release.sh deleted file mode 100644 index 80d9819..0000000 --- a/build_release.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -x - -# this file is intended to build the docker image and push to the correct repository. Intended to be run by my buildbot instance. - -# check if there is a git tag. if so, tag with that tag and release -# expecting tag to be 6 characters long. otherwise isn't not the right tag -GITTAG=$(git describe --tags) -length=${#GITTAG} - -if [ $length -eq 6 ]; then - docker build -t viker.cheezers.net:5000/agon:release -t viker.cheezers.net:5000/agon:$GITTAG . - docker push viker.cheezers.net:5000/agon:release - docker push viker.cheezers.net:5000/agon:$GITTAG -else - docker build -t viker.cheezers.net:5000/agon:release . - docker push viker.cheezers.net:5000/agon:release -fi \ No newline at end of file From 0f8637be23fd8d4f3c76895df5270468c8fcaa21 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 19:12:03 -0400 Subject: [PATCH 06/25] try adding buildx to fix missing token. --- .gitea/workflows/build_develop.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 391ca16..ba077c1 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -1,8 +1,9 @@ name: build_develop -on: - push: - branches: [develop] +on: [push] +# commenting out develop push while testing workflow +# push: +# branches: [develop] jobs: build: @@ -12,6 +13,8 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 - name: Build and push to viker registry uses: docker/build-push-action@v4 with: From 7c592e6accda821e1162111f162b12b688946cd6 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 19:15:15 -0400 Subject: [PATCH 07/25] correct http url, try again without buildx. --- .gitea/workflows/build_develop.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index ba077c1..963c2b7 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -13,11 +13,11 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v2 - name: Build and push to viker registry uses: docker/build-push-action@v4 with: context: . push: true - tags: viker.cheezers.net:5000/agon:develop + tags: http://viker.cheezers.net:5000/agon:develop From e34739a0b129246d715e41e35bb56a5478719211 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 19:16:54 -0400 Subject: [PATCH 08/25] Need buildx, don't understand why. --- .gitea/workflows/build_develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 963c2b7..315dbb7 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -13,8 +13,8 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - # - name: Set up Docker Buildx - # uses: docker/setup-buildx-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 - name: Build and push to viker registry uses: docker/build-push-action@v4 with: From 836673198a63a4efe700936ed96a40cccb4668cb Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 19:22:18 -0400 Subject: [PATCH 09/25] try localhost for repo. --- .gitea/workflows/build_develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 315dbb7..ad67089 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -20,4 +20,4 @@ jobs: with: context: . push: true - tags: http://viker.cheezers.net:5000/agon:develop + tags: localhost:5000/agon:develop From 216becff6ec55626b1c43e5fc122da4513ad0cd1 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 19:34:27 -0400 Subject: [PATCH 10/25] try with docker commands instead of action. --- .gitea/workflows/build_develop.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index ad67089..cf7a611 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -13,11 +13,13 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Build and push to viker registry - uses: docker/build-push-action@v4 - with: - context: . - push: true - tags: localhost:5000/agon:develop + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v2 + # - name: Build and push to viker registry + # uses: docker/build-push-action@v4 + # with: + # context: . + # push: true + # tags: viker.cheezers.net:5000/agon:develop + - run: docker build -t viker.cheezers.net:5000/agon:develop . + - run: docker push viker.cheezers.net:5000/agon:develop From cb9cad978377f2dd11ad25e85f740bb07d0b46f9 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 19:35:11 -0400 Subject: [PATCH 11/25] maybe need buildx to set up docker --- .gitea/workflows/build_develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index cf7a611..9ddb48f 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -13,8 +13,8 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - # - name: Set up Docker Buildx - # uses: docker/setup-buildx-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 # - name: Build and push to viker registry # uses: docker/build-push-action@v4 # with: From 8b43f766b3bac46b11244a59d74190287114a52e Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 21:47:28 -0400 Subject: [PATCH 12/25] try https url --- .gitea/workflows/build_develop.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 9ddb48f..872c257 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -15,11 +15,13 @@ jobs: fetch-depth: 0 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - # - name: Build and push to viker registry - # uses: docker/build-push-action@v4 - # with: - # context: . - # push: true - # tags: viker.cheezers.net:5000/agon:develop - - run: docker build -t viker.cheezers.net:5000/agon:develop . - - run: docker push viker.cheezers.net:5000/agon:develop + - name: Build and push to viker registry + uses: docker/build-push-action@v4 + with: + context: . + push: true + tags: registry.cheezers.net/agon:develop + + # docker isn't installed?? + # - run: docker build -t viker.cheezers.net:5000/agon:develop . + # - run: docker push viker.cheezers.net:5000/agon:develop From e08a76459141090961cefbdf29625b5eb99215d8 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 22:27:05 -0400 Subject: [PATCH 13/25] Install docker onto image. --- .gitea/workflows/build_develop.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 872c257..5e76305 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -13,15 +13,11 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + - name: Install Docker + uses: https://github/papodaca/install-docker-action@v1 - name: Build and push to viker registry uses: docker/build-push-action@v4 with: context: . push: true tags: registry.cheezers.net/agon:develop - - # docker isn't installed?? - # - run: docker build -t viker.cheezers.net:5000/agon:develop . - # - run: docker push viker.cheezers.net:5000/agon:develop From a9a6ab452064e4dcf5985c62d577a711b85d0894 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 22:31:42 -0400 Subject: [PATCH 14/25] correct github address. --- .gitea/workflows/build_develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 5e76305..7a9c33f 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -14,7 +14,7 @@ jobs: with: fetch-depth: 0 - name: Install Docker - uses: https://github/papodaca/install-docker-action@v1 + uses: https://github.com/papodaca/install-docker-action@v1 - name: Build and push to viker registry uses: docker/build-push-action@v4 with: From 9eed0a1f4e180f48ed0ce1c29d08ff24a8585192 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 23:14:15 -0400 Subject: [PATCH 15/25] Don't use action due to using local repo. --- .gitea/workflows/build_develop.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 7a9c33f..fce8471 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -15,9 +15,7 @@ jobs: fetch-depth: 0 - name: Install Docker uses: https://github.com/papodaca/install-docker-action@v1 - - name: Build and push to viker registry - uses: docker/build-push-action@v4 - with: - context: . - push: true - tags: registry.cheezers.net/agon:develop + - name: Build Docker Image + run: docker build -t viker.cheezers.net:5000/agon:develop . + - name: Push Docker Image + run: docker push viker.cheezers.net:5000/agon:develop From 2356d5edbf33e637d0724fd36b54baf9836d4650 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 22 Mar 2023 23:25:26 -0400 Subject: [PATCH 16/25] Change workflow back to develop branch. --- .gitea/workflows/build_develop.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index fce8471..62a8f8d 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -1,9 +1,8 @@ name: build_develop on: [push] -# commenting out develop push while testing workflow -# push: -# branches: [develop] + push: + branches: [develop] jobs: build: From 635419dc7c0ea7774d96b9948e066183314ae40a Mon Sep 17 00:00:00 2001 From: imcompiling Date: Thu, 23 Mar 2023 09:09:41 -0400 Subject: [PATCH 17/25] Change to operate on the main branch. No need for dev branch. --- .gitea/workflows/build_develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index 62a8f8d..b52f4b5 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -2,7 +2,7 @@ name: build_develop on: [push] push: - branches: [develop] + branches: [main] jobs: build: From 90763c73a7699e2098b6b254788090c1d23fab80 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Thu, 23 Mar 2023 09:16:01 -0400 Subject: [PATCH 18/25] Add release workflow. --- .gitea/workflows/build_release.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .gitea/workflows/build_release.yml diff --git a/.gitea/workflows/build_release.yml b/.gitea/workflows/build_release.yml new file mode 100644 index 0000000..87c12cd --- /dev/null +++ b/.gitea/workflows/build_release.yml @@ -0,0 +1,22 @@ +name: build_release + +on: [push] + push: + tags: ['*'] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout Code + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Install Docker + uses: https://github.com/papodaca/install-docker-action@v1 + - name: Build Docker Images + run: docker build -t viker.cheezers.net:5000/agon:latest -t viker.cheezers.net:5000/agon:${{env.BRANCH_TAG}} . + - name: Push Latest Image + run: docker push viker.cheezers.net:5000/agon:latest + - name: Push Tagged Image + run: docker push viker.cheezers.net:5000/agon:${{env.BRANCH_TAG}} From b3f48d460365623f775a658bf521728847d7a5d8 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Thu, 23 Mar 2023 09:30:00 -0400 Subject: [PATCH 19/25] Correct on push. --- .gitea/workflows/build_develop.yml | 2 +- .gitea/workflows/build_release.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build_develop.yml b/.gitea/workflows/build_develop.yml index b52f4b5..b54781e 100644 --- a/.gitea/workflows/build_develop.yml +++ b/.gitea/workflows/build_develop.yml @@ -1,6 +1,6 @@ name: build_develop -on: [push] +on: push: branches: [main] diff --git a/.gitea/workflows/build_release.yml b/.gitea/workflows/build_release.yml index 87c12cd..fdb92c0 100644 --- a/.gitea/workflows/build_release.yml +++ b/.gitea/workflows/build_release.yml @@ -1,8 +1,8 @@ name: build_release -on: [push] +on: push: - tags: ['*'] + tags: ["*"] jobs: build: From 4bb7db3f71fced5e4970f62ad67fadf10671180f Mon Sep 17 00:00:00 2001 From: imcompiling Date: Thu, 23 Mar 2023 16:44:08 -0400 Subject: [PATCH 20/25] Set push for specific tag only, set GIT_TAG env var. --- .gitea/workflows/build_release.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build_release.yml b/.gitea/workflows/build_release.yml index fdb92c0..a46cca3 100644 --- a/.gitea/workflows/build_release.yml +++ b/.gitea/workflows/build_release.yml @@ -2,7 +2,7 @@ name: build_release on: push: - tags: ["*"] + tags: ["t[0-9].[0-9].[0-9]"] jobs: build: @@ -14,9 +14,11 @@ jobs: fetch-depth: 0 - name: Install Docker uses: https://github.com/papodaca/install-docker-action@v1 + - name: Set env + run: echo "GIT_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - name: Build Docker Images - run: docker build -t viker.cheezers.net:5000/agon:latest -t viker.cheezers.net:5000/agon:${{env.BRANCH_TAG}} . + run: docker build -t viker.cheezers.net:5000/agon:latest -t viker.cheezers.net:5000/agon:${{env.GIT_TAG}} . - name: Push Latest Image run: docker push viker.cheezers.net:5000/agon:latest - name: Push Tagged Image - run: docker push viker.cheezers.net:5000/agon:${{env.BRANCH_TAG}} + run: docker push viker.cheezers.net:5000/agon:${{env.GIT_TAG}} From b905ce7216bbc6cbcead940161ca4b4477ae85ea Mon Sep 17 00:00:00 2001 From: imcompiling Date: Thu, 23 Mar 2023 16:50:39 -0400 Subject: [PATCH 21/25] Change tag to v. --- .gitea/workflows/build_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build_release.yml b/.gitea/workflows/build_release.yml index a46cca3..1d885a3 100644 --- a/.gitea/workflows/build_release.yml +++ b/.gitea/workflows/build_release.yml @@ -2,7 +2,7 @@ name: build_release on: push: - tags: ["t[0-9].[0-9].[0-9]"] + tags: ["v[0-9].[0-9].[0-9]"] jobs: build: From 7d1e69c007daf515afec2bedaa91e828883ea1b2 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Tue, 28 Mar 2023 12:56:50 -0400 Subject: [PATCH 22/25] Don't need this import. --- cogs/guild_listener/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cogs/guild_listener/__init__.py b/cogs/guild_listener/__init__.py index 4312305..25e5197 100644 --- a/cogs/guild_listener/__init__.py +++ b/cogs/guild_listener/__init__.py @@ -8,7 +8,6 @@ from sqlalchemy.orm import Session # pylint: disable=import-error from utilities.sql_data_classes import Guild, engine -from utilities.utils import add_preset_configuration # TODO class GuildListener(commands.Cog, name="Guild Listener"): From 379f280c118a8ab6d16ff18d55148dc12e9c441b Mon Sep 17 00:00:00 2001 From: imcompiling Date: Tue, 28 Mar 2023 13:02:07 -0400 Subject: [PATCH 23/25] Refactor presence to loops. --- cogs/loops/__init__.py | 14 ++++++++++++++ .../__init__.py => loops/bot_presence.py} | 9 +-------- 2 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 cogs/loops/__init__.py rename cogs/{presence/__init__.py => loops/bot_presence.py} (85%) diff --git a/cogs/loops/__init__.py b/cogs/loops/__init__.py new file mode 100644 index 0000000..5cd44f5 --- /dev/null +++ b/cogs/loops/__init__.py @@ -0,0 +1,14 @@ +""" +Initializing code for all loops. +""" + +from nextcord.ext import commands + +from .bot_presence import BotPresence + + +# This function will be called when this extension is loaded. +# It is necessary to add these functions to the bot. +def setup(bot: commands.Bot): + """Adds function to bot""" + bot.add_cog(BotPresence(bot)) diff --git a/cogs/presence/__init__.py b/cogs/loops/bot_presence.py similarity index 85% rename from cogs/presence/__init__.py rename to cogs/loops/bot_presence.py index 6646e08..d752396 100644 --- a/cogs/presence/__init__.py +++ b/cogs/loops/bot_presence.py @@ -1,5 +1,5 @@ """ -Functions for controlling the bot's presence. +Functions for controlling the bot's presence. Also contains the loop. """ import random @@ -46,10 +46,3 @@ class BotPresence(commands.Cog, name="Bot Presence"): status += f" | {len(self.bot.guilds)} servers" await self.bot.change_presence(activity=nextcord.Game(status)) - - -# This function will be called when this extension is loaded. -# It is necessary to add these functions to the bot. -def setup(bot: commands.Bot): - """Adds function to bot""" - bot.add_cog(BotPresence(bot)) From 74aa78c7483bbb4dfe0719da85a14c36856b3513 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Tue, 28 Mar 2023 13:44:03 -0400 Subject: [PATCH 24/25] Add loop for updating guild data. --- cogs/loops/__init__.py | 2 ++ cogs/loops/guild_data.py | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 cogs/loops/guild_data.py diff --git a/cogs/loops/__init__.py b/cogs/loops/__init__.py index 5cd44f5..9ee014f 100644 --- a/cogs/loops/__init__.py +++ b/cogs/loops/__init__.py @@ -5,6 +5,7 @@ Initializing code for all loops. from nextcord.ext import commands from .bot_presence import BotPresence +from .guild_data import GuildData # This function will be called when this extension is loaded. @@ -12,3 +13,4 @@ from .bot_presence import BotPresence def setup(bot: commands.Bot): """Adds function to bot""" bot.add_cog(BotPresence(bot)) + bot.add_cog(GuildData(bot)) diff --git a/cogs/loops/guild_data.py b/cogs/loops/guild_data.py new file mode 100644 index 0000000..3ff9dd8 --- /dev/null +++ b/cogs/loops/guild_data.py @@ -0,0 +1,48 @@ +""" +Contains a loop that updates guild data in the database periodically. +""" + +from nextcord.ext import commands, tasks +from sqlalchemy import select +from sqlalchemy.orm import Session + +# pylint: disable=import-error +from utilities.sql_data_classes import Guild, engine + + +class GuildData(commands.Cog, name="Guild Data"): + """Class to contain loop.""" + + def __init__(self, bot: commands.bot) -> None: + self.bot = bot + + @commands.Cog.listener() + async def on_ready(self): + """Starts the loop when bot is ready.""" + await self.bot.wait_until_ready() + # pylint doesn't recognize that periodic_update_guild_data is subclassed from tasks.loop. + await self.periodic_update_guild_data.start() # pylint: disable=no-member + + @tasks.loop(hours=24) + async def periodic_update_guild_data(self): + """Loops every day, calls update_guild_data.""" + self.update_guild_data() + + def update_guild_data(self): + """ + Updates all known guild's data in the database. + """ + with Session(engine) as session: + for guild in self.bot.guilds: + # update given guild name for guild id + stmt = select(Guild).where(Guild.GuildId == guild.id) + g = session.scalar(stmt) + + # just in case checking if the guild doesn't exist. + if g is None: + new_guild = Guild(GuildId=guild.id, GuildName=guild.name) + session.add(new_guild) + else: + g.GuildName = guild.name + + session.commit() From 390bf8a489a72d84c7ff1dc9ed11955cce8fc37f Mon Sep 17 00:00:00 2001 From: imcompiling Date: Tue, 28 Mar 2023 13:55:18 -0400 Subject: [PATCH 25/25] rename variable. --- cogs/loops/guild_data.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cogs/loops/guild_data.py b/cogs/loops/guild_data.py index 3ff9dd8..98fd77b 100644 --- a/cogs/loops/guild_data.py +++ b/cogs/loops/guild_data.py @@ -36,13 +36,13 @@ class GuildData(commands.Cog, name="Guild Data"): for guild in self.bot.guilds: # update given guild name for guild id stmt = select(Guild).where(Guild.GuildId == guild.id) - g = session.scalar(stmt) + guild_data = session.scalar(stmt) # just in case checking if the guild doesn't exist. - if g is None: + if guild_data is None: new_guild = Guild(GuildId=guild.id, GuildName=guild.name) session.add(new_guild) else: - g.GuildName = guild.name + guild_data.GuildName = guild.name session.commit()