Merge pull request #79 from HenrySpartGlobal/main

update with main
HenrySpartGlobal · Apr 9, 2024 · a9fab7f · a9fab7f
2 parents 9679de6 + 79ee652
commit a9fab7f
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 33 deletions.
diff --git a/.github/workflows/deploy-live.yml b/.github/workflows/deploy-live.yml
@@ -25,34 +25,18 @@ jobs:
 
         - name: Build Docker image
           run: |
-            docker build -t in-house-queue-site \
-            --build-arg DATABASE_URL=${{ secrets.DATABASE_URL }} \
-            --build-arg NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET }} \
-            --build-arg DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }} \
-            --build-arg DISCORD_CLIENT_SECRET=${{ secrets.DISCORD_CLIENT_SECRET }} \
-            --build-arg UPSTASH_REDIS_REST_URL=${{ secrets.UPSTASH_REDIS_REST_URL }} \
-            --build-arg UPSTASH_REDIS_REST_TOKEN=${{ secrets.UPSTASH_REDIS_REST_TOKEN }} \
-            .
+            docker build -t in-house-queue-site .
 
-        - name: Install doctl
-          uses: digitalocean/action-doctl@v2
+        - name: Login to Amazon ECR
+          uses: aws-actions/configure-aws-credentials@v4
           with:
-            token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
-
-        - name: Log in to DigitalOcean Container Registry with short-lived credentials
-          run: doctl registry login --expiry-seconds 600
-
-        - name: Get the latest release tag
-          id: latest_release
-          run: |
-            tag=$(curl -s -H "Authorization: token ${{ secrets.GH_TOKEN }}" "https://api.github.com/repos/${{ env.REPO_OWNER }}/${{ env.REPO_NAME }}/releases/latest" | jq -r ".tag_name")
-            echo "TAG=$tag" >> $GITHUB_ENV
+            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-region: us-east-1
 
         - name: Tag and push Docker image
           run: |
-            export DO_REPOSITORY=${{ secrets.DO_REPO }}
-            TAG=${{ env.TAG }}
-            echo "Tagging image as $DO_REPOSITORY:$TAG"
-            docker tag in-house-queue-site $DO_REPOSITORY:$TAG
-            echo "Pushing image..."
-            docker push $DO_REPOSITORY:$TAG
+            export ECR_REPOSITORY=${{ secrets.ECR_REPO }}
+            aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin $ECR_REPOSITORY
+            docker tag inhousequeue-site:latest $ECR_REPOSITORY:latest
+            docker push $ECR_REPOSITORY:latest
diff --git a/Dockerfile b/Dockerfile
@@ -46,13 +46,7 @@ RUN \
 FROM base AS runner
 WORKDIR /app
 
-ENV NODE_ENV=production \
-    DATABASE_URL=$DATABASE_URL \
-    NEXTAUTH_SECRET=$NEXTAUTH_SECRET \
-    DISCORD_CLIENT_ID=$DISCORD_CLIENT_ID \
-    DISCORD_CLIENT_SECRET=$DISCORD_CLIENT_SECRET \
-    UPSTASH_REDIS_REST_URL=$UPSTASH_REDIS_REST_URL \
-    UPSTASH_REDIS_REST_TOKEN=$UPSTASH_REDIS_REST_TOKEN
+ENV NODE_ENV=production
 
 # Uncomment the following line in case you want to disable telemetry during runtime.
 # ENV NEXT_TELEMETRY_DISABLED 1

diff --git a/src/data/commands.ts b/src/data/commands.ts
@@ -810,6 +810,39 @@ const commands = [
       "/list_teams",
     ]
   },
+  {
+    "name": "ready_penalty ",
+    "type": "Premium",
+    "description": "Award timed queue bans for players who don't ready up",
+    "usage": [
+      "/ready_penalty [preference] (duration_1) (duration_2) (duration_3)",
+    ],
+    "examples": [
+      "/ready_penalty True 5minutes 30minutes 60minutes",
+    ]
+  },
+  {
+    "name": "reset_server_penalties ",
+    "type": "Premium",
+    "description": "Remove all queue bans from the server",
+    "usage": [
+      "/reset_server_penalties",
+    ],
+    "examples": [
+      "reset_server_penalties",
+    ]
+  },
+  {
+    "name": "reset_user_penalty ",
+    "type": "Premium",
+    "description": "Remove all queue bans from a Member",
+    "usage": [
+      "/reset_user_penalty [member]",
+    ],
+    "examples": [
+      "/reset_user_penalty @Faker",
+    ]
+  },
 //   {
 //     "name": "hero",
 //     "type": "Overwatch",