.gitea/workflows/deploy_dev.yaml

@@ -8,8 +8,14 @@ on:
 jobs:
   on-push-deploy_sh-edraft:
     runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: sh-edraft.de/act-runner:latest
+    container: catthehacker/ubuntu:act-latest
     steps:
+      - name: Setup Python 3.10
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.10.12"
+      - run: python -v
+
       - name: Setup docker
         uses: https://github.com/papodaca/install-docker-action@main
       - run: docker -v

.gitea/workflows/deploy_prod.yaml

@@ -8,8 +8,14 @@ on:
 jobs:
   on-push-deploy_sh-edraft:
     runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: sh-edraft.de/act-runner:latest
+    container: catthehacker/ubuntu:act-latest
     steps:
+      - name: Setup Python 3.10
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.10.12"
+      - run: python -v
+
       - name: Setup docker
         uses: https://github.com/papodaca/install-docker-action@main
       - run: docker -v

.gitea/workflows/deploy_staging.yaml

@@ -8,8 +8,14 @@ on:
 jobs:
   on-push-deploy_sh-edraft:
     runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: sh-edraft.de/act-runner:latest
+    container: catthehacker/ubuntu:act-latest
     steps:
+      - name: Setup Python 3.10
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.10.12"
+      - run: python -v
+
       - name: Setup docker
         uses: https://github.com/papodaca/install-docker-action@main
       - run: docker -v

bot/docker

@@ -1 +1 @@
-Subproject commit 9c0dc595348f9ccd58409cc21171456d9ba85758
+Subproject commit 9634f3e4d7ecdba619bd4596b18d407f88b281cc

bot/src/bot/config

@@ -1 +1 @@
-Subproject commit c11ca6f2e8e54bacdf16da677fbcf03705ff9780
+Subproject commit 990c7df3ff9c84085795282e7cb2eaeb36603200

bot/src/bot_api/config

@@ -1 +1 @@
-Subproject commit 521951b8abb0f784b59b6d3e0210606fa193e60a
+Subproject commit f51429090df0bac7c93622e8fb3eac9dd1b9a5e7

bot/src/bot_core/service/data_integrity_service.py

@@ -398,9 +398,6 @@ class DataIntegrityService:
                 if user is None:
                     continue
 
-                for join in self._user_joins.get_user_joined_servers_by_user_id(user.id):
-                    self._user_joins.delete_user_joined_server(join)
-
                 self._user_joins_vc.delete_user_joined_voice_channel_by_user_id(user.id)
                 self._users.delete_user(user)
                 self._db_context.save_changes()

bot/src/bot_data/migration/fix_user_history_migration.py

@@ -17,10 +17,14 @@ class FixUserHistoryMigration(MigrationABC):
 
         # fix 1.1.0_AchievementsMigration
         self._cursor.execute(
-            str(f"""ALTER TABLE UsersHistory ADD COLUMN ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP;""")
+            str(
+                f"""ALTER TABLE UsersHistory ADD COLUMN IF NOT EXISTS ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP;"""
+            )
         )
         self._cursor.execute(
-            str(f"""ALTER TABLE UsersHistory ADD COLUMN MessageCount BIGINT NOT NULL DEFAULT 0 AFTER ReactionCount;""")
+            str(
+                f"""ALTER TABLE UsersHistory ADD COLUMN IF NOT EXISTS MessageCount BIGINT NOT NULL DEFAULT 0 AFTER ReactionCount;"""
+            )
         )
         self._exec(__file__, "users.sql")
 

bot/src/bot_data/migration/steam_special_offer_migration.py

@@ -36,7 +36,7 @@ class SteamSpecialOfferMigration(MigrationABC):
             str(
                 f"""
                     ALTER TABLE CFG_Server
-                    ADD COLUMN GameOfferNotificationChatId BIGINT NULL AFTER ShortRoleNameSetOnlyHighest;
+                    ADD COLUMN IF NOT EXISTS GameOfferNotificationChatId BIGINT NULL AFTER ShortRoleNameSetOnlyHighest;
                 """
             )
         )
@@ -45,7 +45,7 @@ class SteamSpecialOfferMigration(MigrationABC):
             str(
                 f"""
                     ALTER TABLE CFG_ServerHistory
-                    ADD COLUMN GameOfferNotificationChatId BIGINT NULL AFTER ShortRoleNameSetOnlyHighest;
+                    ADD COLUMN IF NOT EXISTS GameOfferNotificationChatId BIGINT NULL AFTER ShortRoleNameSetOnlyHighest;
                 """
             )
         )