Merge pull request #2 from getferdi/master

Update to head

10 files changed, 169 insertions, 154 deletions

diff --git a/.dockerignore b/.dockerignore
index 110334e..e97b248 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -15,6 +15,4 @@ docker
 !docker/entrypoint.sh
 !docker/.env
 node_modules
-
-
-
+.husky
diff --git a/.husky/pre-commit b/.husky/pre-commit
index 20d0d06..1a92cb3 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,9 @@
 #!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
 
-npm run lint
+FILE_NAME="$(dirname "$0")/_/husky.sh"
+
+# Conditionally invoke so as to avoid running npm commands if this is a clean checkout (ie before installing npm modules)
+if [ -f $FILE_NAME ]; then
+  . $FILE_NAME
+  npm run lint
+fi
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 440cc19..a0b4c0b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,6 +17,7 @@
       - [Git](#git)
     - [Clone repository with submodule](#clone-repository-with-submodule)
     - [Install dependencies](#install-dependencies)
+    - [Start development app](#start-development-app)
     - [Styleguide](#styleguide)
       - [Git Commit Messages format](#git-commit-messages-format)
       - [Javascript Coding style-checker](#javascript-coding-style-checker)
@@ -87,7 +88,7 @@ cd server
 git submodule update --init --recursive
 ```
 
-It is important you execute the last command to get the required submodules (recipes, server).
+It is important you execute the last command to get the required submodules (recipes).
 
 ### Install dependencies
 
@@ -116,25 +117,17 @@ mkdir -p data
 
 - Run the database migrations with
 
-  ```bash
-  node ace migration:refresh
-  ```
+```bash
+node ace migration:refresh
+```
 
 - To get the full functionality, you will need to have an SMTP server running for local development.
 
-<!-- ### Package recipe repository
-
-Ferdi requires its recipes to be packaged before it can use it. When running Ferdi as a development instance, you'll need to package the local recipes before you can create any services inside Ferdi.
-
-```bash
-cd recipes && npm i && npm run package
-``` -->
-
 ### Start development app
 
-  ```bash
-  npm start --dev
-  ```
+```bash
+npm start --dev
+```
 
 ### Styleguide
 
diff --git a/Dockerfile b/Dockerfile
index 31dc994..ad057dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:lts-alpine as build
+FROM node:14.17-alpine as build
 
 WORKDIR /server-build
 
@@ -8,12 +8,12 @@ COPY . /server-build
 
 RUN ["npm", "ci", "--production", "--build-from-source", "--sqlite=/usr/local"]
 
-FROM node:lts-alpine
+FROM node:14.17-alpine
 
 WORKDIR /app
 LABEL maintainer="xthursdayx"
 
-ENV HOST=0.0.0.0 PORT=3333 DATA_DIR="/data" 
+ENV HOST=0.0.0.0 PORT=3333 DATA_DIR="/data"
 
 RUN ["apk", "add", "--no-cache", "sqlite-libs", "curl", "su-exec"]
 
diff --git a/README.md b/README.md
index 6a45b08..853d019 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 Official Server software for the [Ferdi Messaging Browser](https://getferdi.com)
 
 - [Ferdi-server](#ferdi-server)
-  - [Why use a custom Ferdi server?](#why-use-a-custom-ferdi-server)
+  - [Why use a custom Ferdi-server?](#why-use-a-custom-ferdi-server)
   - [Features](#features)
   - [Setup](#setup)
     - [with Docker](#with-docker)
@@ -89,7 +89,7 @@ For more information on configuring the Docker image, please read [the Ferdi doc
 
 ### Manual setup
 
-1. Clone this repository
+1. Clone repository with submodule
 2. Install the [AdonisJS CLI](https://adonisjs.com/)
 3. Copy `.env.example` to `.env` and edit the [configuration](#configuration) to your needs
 4. Have env DB_SSL=true only if your database is postgres and it is hosted online on platforms like GCP, AWS, etc
diff --git a/docker/.gitignore b/docker/.gitignore
new file mode 100644
index 0000000..7376571
--- /dev/null
+++ b/docker/.gitignore
@@ -0,0 +1 @@
+docker-compose.override.yml
diff --git a/docker/README.md b/docker/README.md
index 3d8bd5f..7581bef 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,5 +1,5 @@
 # Ferdi-server-docker
-[Ferdi](https://github.com/getferdi/ferdi) is a hard-fork of [Franz](https://github.com/meetfranz/franz), adding awesome features and removing unwanted ones. Ferdi-server is an unofficial replacement of the Franz server for use with the Ferdi Client. 
+[Ferdi](https://github.com/getferdi/ferdi) is a hard-fork of [Franz](https://github.com/meetfranz/franz), adding awesome features and removing unwanted ones. Ferdi-server is an unofficial replacement of the Franz server for use with the Ferdi Client.
 
 This is a dockerized version of [Ferdi-server](https://github.com/getferdi/server) running on Alpine Linux and Node.js (v10.16.3).
 
@@ -35,7 +35,7 @@ To create the docker container with the proper parameters:
         docker create \
           --name=ferdi-server \
           -e NODE_ENV=development \
-          -e EXTERNAL_DOMAIN=<ferdi-serverdomain> \  
+          -e EXTERNAL_DOMAIN=<ferdi-serverdomain> \
           -e DB_CONNECTION=<database> \
           -e DB_HOST=<yourdbhost> \
           -e DB_PORT=<yourdbport> \
@@ -65,15 +65,15 @@ To create the docker container with the proper parameters:
 
   You can use the provided sample [docker-compose.yml](https://github.com/getferdi/server/tree/master/docker/docker-compose.yml) if you are happy with the default environmental variables. This will pull the latest image from Docker Hub or use a local copy of the image which you can build using the instructions provided in the [Building locally section](#building-locally).
 
-  To start the application, use `docker-compose up -d`.
+  To start the application, use `docker-compose -f docker/docker-compose.yml up -d`.
 The server will be launched at [http://localhost:3333/](http://localhost:3333/) address.
 
 ## Configuration
 
 Container images are configured using parameters passed at runtime (such as those above). An explanaition of the default parameters is included below, but please see [the Docker documentation](https://docs.docker.com/get-started/overview/) for additional information.
 
-<strike>If any environmental parameter is not passed to the container, its value will be taken from the `/config/config.txt` file.</strike> 
-**Warning, the use of `config.txt` is now deprecated. Please make sure to pass the correct environmental variables to your container at runtime. ** 
+<strike>If any environmental parameter is not passed to the container, its value will be taken from the `/config/config.txt` file.</strike>
+**Warning, the use of `config.txt` is now deprecated. Please make sure to pass the correct environmental variables to your container at runtime. **
 
 | Parameter | Function |
 | :----: | --- |
@@ -108,7 +108,7 @@ By enabling the `CONNECT_WITH_FRANZ` option, Ferdi-server can:
 
 ## Supported databases and drivers
 
-To use a different database than the default, SQLite3, enter the driver code below in your ENV configuration. 
+To use a different database than the default, SQLite3, enter the driver code below in your ENV configuration.
 
 | Database | Driver |
 | :----: | --- |
@@ -150,7 +150,7 @@ If you are an existing Ferdi-server user who usees an external database or diffe
 | `-v <path to recipes>:/app/recipes` | this will strore Ferdi-server's recipes on the docker host for persistence |
 
 **In eithr case, pleasee be sure to pass the correct variables to the new Ferdi-server container in order maintain access to your existing database.**
- 
+
 ## NGINX config block
 
 To access Ferdi-server from outside of your home network on a subdomain use this server block:
@@ -158,19 +158,19 @@ To access Ferdi-server from outside of your home network on a subdomain use this
 ```
 # Ferdi-server
 server {
-        listen 443 ssl http2;
-        server_name ferdi.my.website;
-
-        # all ssl related config moved to ssl.conf
-        include /config/nginx/ssl.conf;
-
-        location / {
-             proxy_pass              http://<Ferdi-IP>:3333;
-             proxy_set_header        X-Real-IP            $remote_addr;
-             proxy_set_header        X-Forwarded-For      $proxy_add_x_forwarded_for;
-             proxy_set_header        Host                 $host;
-             proxy_set_header        X-Forwarded-Proto    $scheme;
-        }
+  listen 443 ssl http2;
+  server_name ferdi.my.website;
+
+  # all ssl related config moved to ssl.conf
+  include /config/nginx/ssl.conf;
+
+  location / {
+    proxy_pass http://<Ferdi-IP>:3333;
+    proxy_set_header  X-Real-IP  $remote_addr;
+    proxy_set_header  X-Forwarded-For  $proxy_add_x_forwarded_for;
+    proxy_set_header  Host  $host;
+    proxy_set_header  X-Forwarded-Proto  $scheme;
+  }
 }
 ```
 
@@ -217,15 +217,13 @@ Below are the instructions for updating the container to get the most recent ver
 * Delete the container: `docker rm ferdi-server`
 * Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and ENV settings will be preserved)
 * Start the new container: `docker start ferdi-server`
-* You can also remove the old dangling images: `docker image prune`
 
 ### Via Docker Compose
 
-* Update all images: `docker-compose pull`
-  * or update a single image: `docker-compose pull ferdi-server`
-* Let compose update all containers as necessary: `docker-compose up -d`
-  * or update a single container: `docker-compose up -d ferdi-server`
-* You can also remove the old dangling images: `docker image prune`
+* Update all images: `docker-compose -f docker/docker-compose.yml pull`
+  * or update a single image: `docker-compose -f docker/docker-compose.yml pull ferdi-server`
+* Let compose update all containers as necessary: `docker-compose -f docker/docker-compose.yml up -d`
+  * or update a single container: `docker-compose -f docker/docker-compose.yml up -d ferdi-server`
 
 ## Building locally
 
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 2d1fd89..2e58abc 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-echo << EOL
+cat << EOL
 -------------------------------------
           ____           ___
          / __/__ _______/ (_)
@@ -14,24 +14,31 @@ Support our Open Collective at:
 https://opencollective.com/getferdi/
 EOL
 
+key_file="${DATA_DIR}/FERDI_APP_KEY.txt"
+
+print_app_key_message() {
+  app_key=$1
+  printf '**** App key is %s. ' ${app_key}
+  printf 'You can modify `%s` to update the app key ****\n' ${key_file}
+}
+
 # Create APP key if needed
-if  [[ -f "${DATA_DIR}/FERDI_APP_KEY.txt" ]]; then
-        echo " "
-        echo "**** App Key found ****"
-        APP_KEY=$(cat /data/FERDI_APP_KEY.txt)
-        echo "**** App Key set to $APP_KEY you can modify FERDI_APP_KEY.txt to update your key ****"
-elif [[ -z "${APP_KEY}" ]]; then
-        echo "**** Generating Ferdi-server app key for first run ****"
-        adonis key:generate
-        APP_KEY=$(grep APP_KEY .env | cut -d '=' -f2)
-        echo "${APP_KEY}" > "${DATA_DIR}/FERDI_APP_KEY.txt"
-        echo "**** App Key set to $APP_KEY you can modify FERDI_APP_KEY.txt to update your key ****"
+if [ -z ${APP_KEY} ] && [ ! -f ${key_file} ]
+then
+  echo '**** Generating Ferdi-server app key for first run ****'
+  adonis key:generate
+  APP_KEY=$(grep APP_KEY .env | cut -d '=' -f2)
+  echo ${APP_KEY} > ${key_file}
+  print_app_key_message ${APP_KEY}
+else
+  APP_KEY=$(cat ${key_file})
+  print_app_key_message ${APP_KEY}
 fi
 
 export APP_KEY
 
 node ace migration:run --force
 
-chown -R ${PUID:-1000}:${PGID:-1000} $DATA_DIR /app
+chown -R "${PUID:-1000}":"${PGID:-1000}" "${DATA_DIR}" /app
 
-su-exec ${PUID:-1000}:${PGID:-1000} node server.js
+su-exec "${PUID:-1000}":"${PGID:-1000}" node server.js
diff --git a/package-lock.json b/package-lock.json
index 313d615..cdd0e6e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2745,14 +2745,6 @@
         "universalify": "^0.1.0"
       }
     },
-    "fs-minipass": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz",
-      "integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==",
-      "requires": {
-        "minipass": "^2.2.1"
-      }
-    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -3994,23 +3986,6 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
-    "minipass": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
-      "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
-      "requires": {
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.0"
-      }
-    },
-    "minizlib": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
-      "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
-      "requires": {
-        "minipass": "^2.2.1"
-      }
-    },
     "mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
@@ -4752,46 +4727,38 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pg": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-7.18.2.tgz",
-      "integrity": "sha512-Mvt0dGYMwvEADNKy5PMQGlzPudKcKKzJds/VbOeZJpb6f/pI3mmoXX0JksPgI3l3JPP/2Apq7F36O63J7mgveA==",
+      "version": "8.7.1",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.7.1.tgz",
+      "integrity": "sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA==",
       "requires": {
         "buffer-writer": "2.0.0",
         "packet-reader": "1.0.0",
-        "pg-connection-string": "0.1.3",
-        "pg-packet-stream": "^1.1.0",
-        "pg-pool": "^2.0.10",
+        "pg-connection-string": "^2.5.0",
+        "pg-pool": "^3.4.1",
+        "pg-protocol": "^1.5.0",
         "pg-types": "^2.1.0",
-        "pgpass": "1.x",
-        "semver": "4.3.2"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz",
-          "integrity": "sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c="
-        }
+        "pgpass": "1.x"
       }
     },
     "pg-connection-string": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz",
-      "integrity": "sha1-2hhHsglA5C7hSSvq9l1J2RskXfc="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz",
+      "integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="
     },
     "pg-int8": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
       "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="
     },
-    "pg-packet-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz",
-      "integrity": "sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg=="
-    },
     "pg-pool": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.10.tgz",
-      "integrity": "sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg=="
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.4.1.tgz",
+      "integrity": "sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ=="
+    },
+    "pg-protocol": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz",
+      "integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="
     },
     "pg-types": {
       "version": "2.2.0",
@@ -4806,11 +4773,11 @@
       }
     },
     "pgpass": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz",
-      "integrity": "sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz",
+      "integrity": "sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==",
       "requires": {
-        "split": "^1.0.0"
+        "split2": "^3.1.1"
       }
     },
     "pify": {
@@ -4867,9 +4834,9 @@
       "integrity": "sha1-AntTPAqokOJtFy1Hz5zOzFIazTU="
     },
     "postgres-date": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.4.tgz",
-      "integrity": "sha512-bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
+      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q=="
     },
     "postgres-interval": {
       "version": "1.2.0",
@@ -6041,14 +6008,6 @@
       "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==",
       "dev": true
     },
-    "split": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-      "requires": {
-        "through": "2"
-      }
-    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -6076,6 +6035,26 @@
         }
       }
     },
+    "split2": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
+      "requires": {
+        "readable-stream": "^3.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -6381,19 +6360,37 @@
       }
     },
     "tar": {
-      "version": "4.4.15",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.15.tgz",
-      "integrity": "sha512-ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA==",
-      "requires": {
-        "chownr": "^1.1.1",
-        "fs-minipass": "^1.2.5",
-        "minipass": "^2.8.6",
-        "minizlib": "^1.2.1",
-        "mkdirp": "^0.5.0",
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.3"
+      "version": "4.4.19",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
+      "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
+      "requires": {
+        "chownr": "^1.1.4",
+        "fs-minipass": "^1.2.7",
+        "minipass": "^2.9.0",
+        "minizlib": "^1.3.3",
+        "mkdirp": "^0.5.5",
+        "safe-buffer": "^5.2.1",
+        "yallist": "^3.1.1"
       },
       "dependencies": {
+        "chownr": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+        },
+        "fs-minipass": {
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+          "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+          "requires": {
+            "minipass": "^2.6.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+        },
         "minipass": {
           "version": "2.9.0",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
@@ -6402,6 +6399,32 @@
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
           }
+        },
+        "minizlib": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+          "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+          "requires": {
+            "minipass": "^2.9.0"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
         }
       }
     },
@@ -6475,11 +6498,6 @@
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
     "tildify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
@@ -6962,11 +6980,6 @@
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
     },
-    "yallist": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-      "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
-    },
     "youch": {
       "version": "2.0.10",
       "resolved": "https://registry.npmjs.org/youch/-/youch-2.0.10.tgz",
@@ -6986,4 +6999,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index eb5c3a2..cfb563f 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "fs-extra": "^8.1.0",
     "mysql": "2.18.1",
     "node-fetch": "^2.6.1",
-    "pg": "^7.18.2",
+    "pg": "^8.0.3",
     "sqlite3": "^4.1.0",
     "targz": "^1.0.1",
     "uuid": "^8.3.2"