From d27108659aebeac3e3fed7d2576c8058b733ae25 Mon Sep 17 00:00:00 2001 From: OscarVsp Date: Thu, 16 Feb 2023 13:14:21 +0100 Subject: [PATCH 01/11] add missing information about admin command --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index b9038ed..903c15f 100644 --- a/README.md +++ b/README.md @@ -224,6 +224,10 @@ Edit info of a user. Delete a user. +* `/server info` + +Get information about a guild (ULB role, number of registered members, ...) + * `/update` This forces a total update of the database and of all the servers. Since the bot already does this automatically at startup and after each reconnection, the only normal usecase for this would be if you manually add an entry (server or user) to the google sheet instead of using the `/user add` command above, we don't recommend manually editing the google sheet. From 3acc68b87dba4b9d42f4237b077402c0e3306ef3 Mon Sep 17 00:00:00 2001 From: OscarVsp Date: Thu, 16 Feb 2023 13:15:45 +0100 Subject: [PATCH 02/11] change disnake version from 2.6 to 2.7 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cc8bb6d..743d71e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ cfgv==3.3.1 cfscrape==2.1.1 charset-normalizer==2.1.1 classify-imports==4.2.0 -disnake==2.6.0 +disnake==2.7.0 distlib==0.3.6 filelock==3.8.0 frozenlist==1.3.0 From 6c08c4b7f7b4b4600db2d9059a176dc5fec46a00 Mon Sep 17 00:00:00 2001 From: OscarVsp Date: Thu, 16 Feb 2023 13:23:00 +0100 Subject: [PATCH 03/11] removed frozenlist since it had compiler issu with python 3.11 --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 743d71e..04cec82 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,6 @@ classify-imports==4.2.0 disnake==2.7.0 distlib==0.3.6 filelock==3.8.0 -frozenlist==1.3.0 google-auth==2.11.1 google-auth-oauthlib==0.5.3 gspread==5.5.0 From 80e1829e05d6e2055d0425a3549834af418376ca Mon Sep 17 00:00:00 2001 From: OscarVsp Date: Thu, 16 Feb 2023 13:26:25 +0100 Subject: [PATCH 04/11] added the feedback command information --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 903c15f..62fd378 100644 --- a/README.md +++ b/README.md @@ -206,6 +206,10 @@ To see the bot logs when running with docker in detached mode (`-d`), use the [d Once the ULB role is set, when a new user joins the server, either they are already registered (from another of your servers) in which case they will get the `@ULB` role and get renamed, or they are not registered yet and will receive a DM message with the instructions to register themselves using the `/ulb` command. +* `/feedback` + +Send a feedback directly from discord. + ### Admin server * `/user add` From 2f6254794efd5a0869e92b2d74cfaf4f6580eea6 Mon Sep 17 00:00:00 2001 From: OscarVsp Date: Thu, 16 Feb 2023 13:27:39 +0100 Subject: [PATCH 05/11] Revert "add missing information about admin command" This reverts commit d27108659aebeac3e3fed7d2576c8058b733ae25. --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 62fd378..2e41dc0 100644 --- a/README.md +++ b/README.md @@ -228,10 +228,6 @@ Edit info of a user. Delete a user. -* `/server info` - -Get information about a guild (ULB role, number of registered members, ...) - * `/update` This forces a total update of the database and of all the servers. Since the bot already does this automatically at startup and after each reconnection, the only normal usecase for this would be if you manually add an entry (server or user) to the google sheet instead of using the `/user add` command above, we don't recommend manually editing the google sheet. From f835bface09e03a4fc4a048c50d12a208e19f45f Mon Sep 17 00:00:00 2001 From: OscarVsp Date: Thu, 16 Feb 2023 13:27:46 +0100 Subject: [PATCH 06/11] Revert "added the feedback command information" This reverts commit 80e1829e05d6e2055d0425a3549834af418376ca. --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 2e41dc0..b9038ed 100644 --- a/README.md +++ b/README.md @@ -206,10 +206,6 @@ To see the bot logs when running with docker in detached mode (`-d`), use the [d Once the ULB role is set, when a new user joins the server, either they are already registered (from another of your servers) in which case they will get the `@ULB` role and get renamed, or they are not registered yet and will receive a DM message with the instructions to register themselves using the `/ulb` command. -* `/feedback` - -Send a feedback directly from discord. - ### Admin server * `/user add` From a02321439f56953d9caa1b04d209c34f152d4084 Mon Sep 17 00:00:00 2001 From: OscarVsp Date: Fri, 17 Feb 2023 12:26:10 +0100 Subject: [PATCH 07/11] change disnake to 2.8 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 04cec82..a54c01a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ cfgv==3.3.1 cfscrape==2.1.1 charset-normalizer==2.1.1 classify-imports==4.2.0 -disnake==2.7.0 +disnake==2.8.* distlib==0.3.6 filelock==3.8.0 google-auth==2.11.1 From 68f26799ea4ee39b63dc66832aadd37e9100c663 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 18:29:51 +0000 Subject: [PATCH 08/11] Bump aiohttp from 3.8.3 to 3.9.0 Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.8.3 to 3.9.0. - [Release notes](https://github.com/aio-libs/aiohttp/releases) - [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst) - [Commits](https://github.com/aio-libs/aiohttp/compare/v3.8.3...v3.9.0) --- updated-dependencies: - dependency-name: aiohttp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8daee22..feadc55 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -aiohttp==3.8.3 +aiohttp==3.9.0 aiosignal==1.2.0 async-timeout==4.0.2 asyncpg==0.26.0 From e0cf852cb09c90752fc832c387102f37de1feb99 Mon Sep 17 00:00:00 2001 From: ticccco <23436953+LucasPlacentino@users.noreply.github.com> Date: Tue, 5 Dec 2023 21:31:35 +0100 Subject: [PATCH 09/11] update python image to 3.11.6-alpine- Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a14845d..2496153 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ #FROM python:3 -FROM python:3.8.6-alpine +FROM python:3.11.6-alpine # use python:3.11.0rc2-slim for less vulnerabilities ? (from `docker scan`) # use python:3.8.6 for no pip dependencies build errors ? # use python:alpine for reduced size From 230cb857cdb33f6b6908a9a9a1bdb75b591382e8 Mon Sep 17 00:00:00 2001 From: ticccco <23436953+LucasPlacentino@users.noreply.github.com> Date: Tue, 5 Dec 2023 21:55:08 +0100 Subject: [PATCH 10/11] bump asyncpg, frozenlist, multidict, yarl to latest- Update requirements.txt --- requirements.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8daee22..ae40001 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,8 @@ aiohttp==3.8.3 aiosignal==1.2.0 async-timeout==4.0.2 -asyncpg==0.26.0 +#asyncpg==0.26.0 +asyncpg==0.29.0 attrs==22.1.0 autopep8==1.7.0 cachetools==5.2.0 @@ -13,7 +14,8 @@ classify-imports==4.2.0 disnake==2.6.0 distlib==0.3.6 filelock==3.8.0 -frozenlist==1.3.0 +#frozenlist==1.3.1 +frozenlist==1.4.0 google-auth==2.11.1 google-auth-oauthlib==0.5.3 gspread==5.5.0 @@ -21,7 +23,8 @@ httplib2==0.20.4 identify==2.5.5 idna==3.4 lor-deckcodes==5.0.0 -multidict==6.0.2 +#multidict==6.0.2 +multidict==6.0.4 mypy==0.971 mypy-extensions==0.4.3 nodeenv==1.7.0 @@ -48,4 +51,5 @@ tomli==2.0.1 typing_extensions==4.3.0 urllib3==1.26.12 virtualenv==20.16.3 -yarl==1.8.1 +#yarl==1.8.1 +yarl==1.9.3 From 985a96350b5bb10ae81bf1d6f94f71c02b2a1226 Mon Sep 17 00:00:00 2001 From: ticccco <23436953+LucasPlacentino@users.noreply.github.com> Date: Tue, 5 Dec 2023 21:58:36 +0100 Subject: [PATCH 11/11] bump async-timeout to latest - Update requirements.txt --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ae40001..548180d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ aiohttp==3.8.3 aiosignal==1.2.0 -async-timeout==4.0.2 +#async-timeout==4.0.2 +async-timeout==4.0.3 #asyncpg==0.26.0 asyncpg==0.29.0 attrs==22.1.0