Compare commits

..

6 commits

Author SHA1 Message Date
b82e74bc68 Remove unused import statement
Some checks failed
continuous-integration/drone/pr Build is failing
continuous-integration/drone/push Build is failing
2023-06-26 18:00:00 +01:00
04b6c840cd Merge branch 'develop' into feature/98-timeout-command-2 2023-06-26 17:59:15 +01:00
e84f871329 Update dependency typeorm to v0.3.17 (#310)
Some checks failed
continuous-integration/drone/push Build is failing
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

<details>
<summary>typeorm/typeorm</summary>

### [`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

-   [#&#8203;10040](https://github.com/typeorm/typeorm/issues/10040) TypeORM synchronize database even if it is up to date ([#&#8203;10041](https://github.com/typeorm/typeorm/issues/10041)) ([b1a3a39](b1a3a39504))
-   add missing await ([#&#8203;10084](https://github.com/typeorm/typeorm/issues/10084)) ([f5d4397](f5d43975db))

</details>

---

### 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.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC43NC4yIiwidXBkYXRlZEluVmVyIjoiMzQuNzQuMiJ9-->

Co-authored-by: Renovate Bot <renovate@vylpes.com>
Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/310
Co-authored-by: RenovateBot <renovate@vylpes.com>
Co-committed-by: RenovateBot <renovate@vylpes.com>
2023-06-26 17:58:24 +01:00
a23028b40c Update dependency minimatch to v9.0.2 (#309)
Some checks failed
continuous-integration/drone/push Build is failing
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

<details>
<summary>isaacs/minimatch</summary>

### [`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)

</details>

---

### 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.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC43NC4yIiwidXBkYXRlZEluVmVyIjoiMzQuNzQuMiJ9-->

Co-authored-by: Renovate Bot <renovate@vylpes.com>
Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/309
Co-authored-by: RenovateBot <renovate@vylpes.com>
Co-committed-by: RenovateBot <renovate@vylpes.com>
2023-06-26 17:51:49 +01:00
915efc226e Remove github workflows (#308)
Some checks failed
continuous-integration/drone/push Build is failing
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 <ethan@vylpes.com>
Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/308
2023-06-23 17:39:40 +01:00
a56076e118 Update rules for Vylpes' Den with gitea link (#307)
Some checks failed
continuous-integration/drone/push Build is failing
- 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 <ethan@vylpes.com>
Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/307
2023-06-23 17:37:31 +01:00
7 changed files with 16 additions and 93 deletions

View file

@ -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}}

View file

@ -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

View file

@ -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}}

View file

@ -6,7 +6,7 @@
"title": "Vylpes' Den", "title": "Vylpes' Den",
"description": [ "description": [
"Welcome to Vylpes' Den! Make sure to say hi!", "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": [ "description": [
"This server uses a bot made by me, VylBot, to help moderate the server.", "This server uses a bot made by me, VylBot, to help moderate the server.",
"For more information on it, see the GitHub repositories:", "For more information on it, see the GitHub repositories:",
"https://github.com/Vylpes/vylbot-core", "https://gitea.vylpes.xyz/rabbitlabs/vylbot-app"
"https://github.com/Vylpes/vylbot-app"
] ]
}, },
{ {
"title": "Links", "title": "Links",
"description": [ "description": [
"YouTube: https://www.youtube.com/channel/UCwPlzKwCmP5Q9bCX3fHk2BA", "YouTube: https://www.youtube.com/@vylpes",
"Patreon: https://www.patreon.com/vylpes", "Patreon: https://www.patreon.com/vylpes",
"Twitch: https://www.twitch.tv/vylpes_", "Twitch: https://www.twitch.tv/vylpes_",
"Twitter: https://twitter.com/vylpes", "Twitter: https://twitter.com/vylpes"
"Blog: https://vylpes.xyz"
], ],
"footer": "Last updated 01/02/2022" "footer": "Last updated 20/06/2023"
} }
] ]

View file

@ -33,11 +33,11 @@
"emoji-regex": "^10.0.0", "emoji-regex": "^10.0.0",
"jest": "^29.0.0", "jest": "^29.0.0",
"jest-mock-extended": "^3.0.0", "jest-mock-extended": "^3.0.0",
"minimatch": "9.0.1", "minimatch": "9.0.2",
"mysql": "^2.18.1", "mysql": "^2.18.1",
"random-bunny": "^2.0.5", "random-bunny": "^2.0.5",
"ts-jest": "^29.0.0", "ts-jest": "^29.0.0",
"typeorm": "0.3.16" "typeorm": "0.3.17"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^20.0.0", "@types/node": "^20.0.0",

View file

@ -2,7 +2,6 @@ import { CoreClient } from "./client/client";
import * as dotenv from "dotenv"; import * as dotenv from "dotenv";
import registry from "./registry"; import registry from "./registry";
import { IntentsBitField } from "discord.js"; import { IntentsBitField } from "discord.js";
import StringTools from "./helpers/StringTools";
dotenv.config(); dotenv.config();

View file

@ -2168,10 +2168,10 @@ mimic-response@^3.1.0:
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
minimatch@9.0.1: minimatch@9.0.2:
version "9.0.1" version "9.0.2"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.2.tgz#397e387fff22f6795844d00badc903a3d5de7057"
integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w== integrity sha512-PZOT9g5v2ojiTL7r1xF6plNHLtOeTpSlDI007As2NlA2aYBMfVom17yqa6QzhmDP8QOhn7LjHTg7DFCVSSa6yg==
dependencies: dependencies:
brace-expansion "^2.0.1" brace-expansion "^2.0.1"
@ -2783,10 +2783,10 @@ type-fest@^0.21.3:
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
typeorm@0.3.16: typeorm@0.3.17:
version "0.3.16" version "0.3.17"
resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.16.tgz#a001d77b36cfaaf9ff495e15805dd17883116b7b" resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.17.tgz#a73c121a52e4fbe419b596b244777be4e4b57949"
integrity sha512-wJ4Qy1oqRKNDdZiBTTaVMqwo/XxC52Q7uNPTjltPgLhvIW173bL6Iad0lhptMOsFlpixFPaUu3PNziaRBwX2Zw== integrity sha512-UDjUEwIQalO9tWw9O2A4GU+sT3oyoUXheHJy4ft+RFdnRdQctdQ34L9SqE2p7LdwzafHx1maxT+bqXON+Qnmig==
dependencies: dependencies:
"@sqltools/formatter" "^1.2.5" "@sqltools/formatter" "^1.2.5"
app-root-path "^3.1.0" app-root-path "^3.1.0"