From a56076e118746d0c441be56e06a12ab6951c0acc Mon Sep 17 00:00:00 2001 From: Vylpes Date: Fri, 23 Jun 2023 17:37:31 +0100 Subject: [PATCH 1/4] Update rules for Vylpes' Den with gitea link (#307) - Update rules file with: - Gitea link - Short url for server invite - New youtube link - Remove old vylbot core link as deprecated - Remove blog site as deprecated #234 Co-authored-by: Ethan Lane Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/307 --- data/rules/290149509969739776.json | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/data/rules/290149509969739776.json b/data/rules/290149509969739776.json index 9fa7a1e..a01ef0c 100644 --- a/data/rules/290149509969739776.json +++ b/data/rules/290149509969739776.json @@ -6,7 +6,7 @@ "title": "Vylpes' Den", "description": [ "Welcome to Vylpes' Den! Make sure to say hi!", - "Invite link: https://discord.gg/UyAhAVp" + "Invite link: https://go.vylpes.xyz/A6HcA" ] }, { @@ -70,19 +70,17 @@ "description": [ "This server uses a bot made by me, VylBot, to help moderate the server.", "For more information on it, see the GitHub repositories:", - "https://github.com/Vylpes/vylbot-core", - "https://github.com/Vylpes/vylbot-app" + "https://gitea.vylpes.xyz/rabbitlabs/vylbot-app" ] }, { "title": "Links", "description": [ - "YouTube: https://www.youtube.com/channel/UCwPlzKwCmP5Q9bCX3fHk2BA", + "YouTube: https://www.youtube.com/@vylpes", "Patreon: https://www.patreon.com/vylpes", "Twitch: https://www.twitch.tv/vylpes_", - "Twitter: https://twitter.com/vylpes", - "Blog: https://vylpes.xyz" + "Twitter: https://twitter.com/vylpes" ], - "footer": "Last updated 01/02/2022" + "footer": "Last updated 20/06/2023" } ] \ No newline at end of file From 915efc226e723193060d584b4f300cf6b8f40831 Mon Sep 17 00:00:00 2001 From: Vylpes Date: Fri, 23 Jun 2023 17:39:40 +0100 Subject: [PATCH 2/4] Remove github workflows (#308) Removing the github action workflows. This is because we no longer use github, and this just causes unnecessary compute minutes being used over on github. #251 Co-authored-by: Ethan Lane Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/308 --- .github/workflows/deployment.yml | 27 --------------------------- .github/workflows/integration.yml | 20 -------------------- .github/workflows/staging.yml | 27 --------------------------- 3 files changed, 74 deletions(-) delete mode 100644 .github/workflows/deployment.yml delete mode 100644 .github/workflows/integration.yml delete mode 100644 .github/workflows/staging.yml diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml deleted file mode 100644 index 53e7f47..0000000 --- a/.github/workflows/deployment.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: deployment - -on: - push: - branches: - - main - workflow_dispatch: - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Build and Test - uses: actions/setup-node@v1 - with: - node-version: 16.x - - run: yarn install --frozen-lockfile - - run: yarn build - - name: Deploy Production - uses: D3rHase/ssh-command-action@v0.2.1 - with: - HOST: ${{secrets.HOST}} - PORT: ${{secrets.PORT}} - USER: ${{secrets.USER}} - PRIVATE_SSH_KEY: ${{secrets.PRIVATE_SSH_KEY}} - COMMAND: ${{secrets.PROD_COMMAND}} \ No newline at end of file diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml deleted file mode 100644 index d74e7aa..0000000 --- a/.github/workflows/integration.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: integration - -on: - push: - branches: - - feature/* - - hotfix/* - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Build and Test - uses: actions/setup-node@v1 - with: - node-version: 16.x - - run: yarn install --frozen-lockfile - - run: yarn build - - run: yarn test \ No newline at end of file diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml deleted file mode 100644 index 5cff552..0000000 --- a/.github/workflows/staging.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: staging - -on: - push: - branches: - - develop - workflow_dispatch: - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Build and Test - uses: actions/setup-node@v1 - with: - node-version: 16.x - - run: yarn install --frozen-lockfile - - run: yarn build - - name: Deploy Staging - uses: D3rHase/ssh-command-action@v0.2.1 - with: - HOST: ${{secrets.HOST}} - PORT: ${{secrets.PORT}} - USER: ${{secrets.USER}} - PRIVATE_SSH_KEY: ${{secrets.PRIVATE_SSH_KEY}} - COMMAND: ${{secrets.STAGE_COMMAND}} \ No newline at end of file From a23028b40cd84b6ae3eff6fdd8a423529fab0f33 Mon Sep 17 00:00:00 2001 From: RenovateBot Date: Mon, 26 Jun 2023 17:51:49 +0100 Subject: [PATCH 3/4] Update dependency minimatch to v9.0.2 (#309) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [minimatch](https://github.com/isaacs/minimatch) | dependencies | patch | [`9.0.1` -> `9.0.2`](https://renovatebot.com/diffs/npm/minimatch/9.0.1/9.0.2) | --- ### Release Notes
isaacs/minimatch ### [`v9.0.2`](https://github.com/isaacs/minimatch/compare/v9.0.1...v9.0.2) [Compare Source](https://github.com/isaacs/minimatch/compare/v9.0.1...v9.0.2)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Co-authored-by: Renovate Bot Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/309 Co-authored-by: RenovateBot Co-committed-by: RenovateBot --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 988a97d..95cdaaf 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "emoji-regex": "^10.0.0", "jest": "^29.0.0", "jest-mock-extended": "^3.0.0", - "minimatch": "9.0.1", + "minimatch": "9.0.2", "mysql": "^2.18.1", "random-bunny": "^2.0.5", "ts-jest": "^29.0.0", diff --git a/yarn.lock b/yarn.lock index 54ec5c2..cfed787 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2168,10 +2168,10 @@ mimic-response@^3.1.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== -minimatch@9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253" - integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w== +minimatch@9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.2.tgz#397e387fff22f6795844d00badc903a3d5de7057" + integrity sha512-PZOT9g5v2ojiTL7r1xF6plNHLtOeTpSlDI007As2NlA2aYBMfVom17yqa6QzhmDP8QOhn7LjHTg7DFCVSSa6yg== dependencies: brace-expansion "^2.0.1" From e84f871329ab222e54764c0274f7e3642a2bbe07 Mon Sep 17 00:00:00 2001 From: RenovateBot Date: Mon, 26 Jun 2023 17:58:24 +0100 Subject: [PATCH 4/4] Update dependency typeorm to v0.3.17 (#310) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [typeorm](https://typeorm.io) ([source](https://github.com/typeorm/typeorm)) | dependencies | patch | [`0.3.16` -> `0.3.17`](https://renovatebot.com/diffs/npm/typeorm/0.3.16/0.3.17) | --- ### Release Notes
typeorm/typeorm ### [`v0.3.17`](https://github.com/typeorm/typeorm/releases/tag/0.3.17) [Compare Source](https://github.com/typeorm/typeorm/compare/0.3.16...0.3.17) ##### Bug Fixes - [#​10040](https://github.com/typeorm/typeorm/issues/10040) TypeORM synchronize database even if it is up to date ([#​10041](https://github.com/typeorm/typeorm/issues/10041)) ([b1a3a39](https://github.com/typeorm/typeorm/commit/b1a3a395049052f3f031e9fd27b99769b03b9011)) - add missing await ([#​10084](https://github.com/typeorm/typeorm/issues/10084)) ([f5d4397](https://github.com/typeorm/typeorm/commit/f5d43975dbbf02d0e40d64d01265105d4018cf7a))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Co-authored-by: Renovate Bot Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/310 Co-authored-by: RenovateBot Co-committed-by: RenovateBot --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 95cdaaf..4aa91b7 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "mysql": "^2.18.1", "random-bunny": "^2.0.5", "ts-jest": "^29.0.0", - "typeorm": "0.3.16" + "typeorm": "0.3.17" }, "devDependencies": { "@types/node": "^20.0.0", diff --git a/yarn.lock b/yarn.lock index cfed787..fe4eccd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2783,10 +2783,10 @@ type-fest@^0.21.3: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== -typeorm@0.3.16: - version "0.3.16" - resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.16.tgz#a001d77b36cfaaf9ff495e15805dd17883116b7b" - integrity sha512-wJ4Qy1oqRKNDdZiBTTaVMqwo/XxC52Q7uNPTjltPgLhvIW173bL6Iad0lhptMOsFlpixFPaUu3PNziaRBwX2Zw== +typeorm@0.3.17: + version "0.3.17" + resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.17.tgz#a73c121a52e4fbe419b596b244777be4e4b57949" + integrity sha512-UDjUEwIQalO9tWw9O2A4GU+sT3oyoUXheHJy4ft+RFdnRdQctdQ34L9SqE2p7LdwzafHx1maxT+bqXON+Qnmig== dependencies: "@sqltools/formatter" "^1.2.5" app-root-path "^3.1.0"