Merge pull request #454 from gowon-bot/server-split

Server split

.github/workflows/deploy.yml

@@ -0,0 +1,18 @@
+name: Deploy Gowon
+run-name: ${{ github.actor }} is deploying Gowon
+on:
+  push:
+    branches:
+      - main
+jobs:
+  Deploy:
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+      - name: executing remote ssh commands using ssh key
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.GOWON_HOST_IP }}
+          username: ${{ secrets.GOWON_HOST_USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
+          script: cd ./gowon && /bin/bash ./deploy.sh

.vscode/settings.json

@@ -3,5 +3,8 @@
   "editor.formatOnPaste": false,
   "editor.formatOnType": false,
   "editor.formatOnSaveMode": "file",
-  "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
+  "editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
+  "yaml.schemas": {
+    "https://json.schemastore.org/github-workflow.json": ".github/workflows/deploy.yml"
+  }
 }

deploy.sh

@@ -1,4 +1,4 @@
 git pull
 
-docker-compose build
-docker-compose up -d
+docker compose build
+docker compose up -d

docker-compose.yml

@@ -3,14 +3,6 @@ version: "3.9"
 services:
   gowon:
     build: .
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    depends_on:
-      - mirrorball
-      - lilac
-
-  mirrorball:
-    image: mirrorball
     extra_hosts:
       - "host.docker.internal:host-gateway"
     depends_on:
@@ -19,8 +11,4 @@ services:
   redis:
     image: "redis:alpine"
 
-  lilac:
-    image: lilac
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    restart: on-failure
+

src/commands/Fishy/Collection.ts

@@ -50,7 +50,9 @@ export class Collection extends FishyChildCommand<typeof args> {
       pageSize: 15,
       pageRenderer(items, { offset }) {
         return (
-          `_${displayFishyCollectionProgress(collection)}fishy collected_\n\n` +
+          `_${displayFishyCollectionProgress(
+            collection
+          )} fishy collected_\n\n` +
           displayNumberedList(
             items.map((f) => {
               const owned = collection.includes(f.id);