From 71bc9899c137a8407b17cf97b1597b6bf4ca4d1d Mon Sep 17 00:00:00 2001
From: Luke Robles <lukelrobles@gmail.com>
Date: Sun, 12 May 2024 21:03:23 -0700
Subject: [PATCH] i dunno man

---
 .gitea/workflows/build-and-push.yaml | 42 ++++++----------------------
 app/cogs/server_utils.py             |  2 +-
 2 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/.gitea/workflows/build-and-push.yaml b/.gitea/workflows/build-and-push.yaml
index 2e273ec6..b4bb5d1e 100755
--- a/.gitea/workflows/build-and-push.yaml
+++ b/.gitea/workflows/build-and-push.yaml
@@ -1,18 +1,9 @@
 name: Build and push
-run-name: ${{ gitea.actor }} Triggered a new run 🚀
+run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
 on: [push]
 
 jobs:
-  post-startup-message:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: sarisia/actions-status-discord@v1
-        if: always()
-        with:
-          title: "Pipeline is starting 🚀"
-          webhook: ${{ secrets.DISCORD_WEBHOOK }}
-          avatar_url: "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTP3ekDW_jiUIEmAym337xeS7WN-k_DUq8YHi6VVfwQQw&s"
-  detect-changed-files:
+  changes:
     runs-on: ubuntu-latest
     outputs:
       python_files: ${{ steps.filter.outputs.python_files }}
@@ -30,8 +21,8 @@ jobs:
             - 'helm/**'
   Lint-Python:
     runs-on: ubuntu-latest
-    needs: detect-changed-files
-    if: ${{ needs.detect-changed-files.outputs.python_files == 'true' }}
+    needs: changes
+    if: ${{ needs.changes.outputs.python_files == 'true' }}
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
@@ -50,10 +41,9 @@ jobs:
           uv pip install black --system --quiet
           black app --check --fast
         if: steps.filter.outputs.python_files == 'true'
-
   Build-and-Push-Docker:
-    needs: detect-changed-files
-    if: ${{ (needs.detect-changed-files.outputs.python_files == 'true') && (steps.Lint-Python.outcome == 'success') }}
+    needs: [changes, Lint-Python]
+    if: ${{ needs.changes.outputs.python_files == 'true' }}
     steps:
       - name: Login to Docker Hub
         if: github.event_name != 'pull_request'
@@ -61,12 +51,9 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
-
       - name: Check out repository code
         uses: actions/checkout@v4
-
       - name: Build and push
-        if: github.event_name != 'pull_request'
         uses: docker/build-push-action@v2
         with:
           context: .
@@ -74,10 +61,9 @@ jobs:
           tags: |
             ldooks/dragon-bot:latest
             ldooks/dragon-bot:${{ gitea.run_id }}
-
   sync-argocd-app:
-    needs: [detect-changed-files, Build-and-Push-Docker]
-    if: ${{ (needs.detect-changed-files.outputs.python_files == 'true') && (steps.Build-and-Push-Docker.outcome == 'success') }}
+    needs: [changes, Build-and-Push-Docker]
+    if: ${{ needs.changes.outputs.python_files == 'true' }}
     steps:
       - name: Sync app in ArgoCD
         uses: clowdhaus/argo-cd-action/@main
@@ -85,15 +71,3 @@ jobs:
           version: 2.6.7
           command: app
           options: --insecure --server 192.168.1.205 --auth-token ${{ secrets.ARGOCD_TOKEN }} set dragon-bot --helm-set image.tag=${{ gitea.run_id }}
-
-  post-finish-message:
-    runs-on: ubuntu-latest
-    if: ${{ (steps.Build-and-Push-Docker.outcome == 'success') }}
-    steps:
-      - uses: sarisia/actions-status-discord@v1
-        if: always()
-        with:
-          title: "Pipeline has completed successfully"
-          status:
-          webhook: ${{ secrets.DISCORD_WEBHOOK }}
-          avatar_url: "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTP3ekDW_jiUIEmAym337xeS7WN-k_DUq8YHi6VVfwQQw&s"
\ No newline at end of file
diff --git a/app/cogs/server_utils.py b/app/cogs/server_utils.py
index 2517b594..11e0cb61 100755
--- a/app/cogs/server_utils.py
+++ b/app/cogs/server_utils.py
@@ -185,7 +185,7 @@ class ServerUtils(commands.Cog):
 
         await ctx.channel.purge(limit=int(count), check=is_me)
 
-        await ctx.respond("ok", delete_after=2)
+        await ctx.respond("ok", delete_after=1)
 
     @commands.slash_command(
         guild_ids=None, name="cleanup", description="cleanup bot messages"