Compare commits

..

19 commits

Author SHA1 Message Date
e3cdc2bc73 Update dependency ts-jest to v29
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2023-02-06 00:02:33 +00:00
fc7c9ef02c Merge pull request 'Update drone.yml' (#265) from feature/263-drone-stuck into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/265
2023-02-03 18:02:52 +00:00
b9fdd51897 Update drone.yml
Some checks reported errors
continuous-integration/drone/push Build was killed
continuous-integration/drone/pr Build was killed
2023-02-03 18:02:40 +00:00
1908f7505c Update drone.yml
Some checks reported errors
continuous-integration/drone/push Build encountered an error
continuous-integration/drone/pr Build encountered an error
2023-02-03 18:01:06 +00:00
b64ddacb41 Merge pull request 'Update drone.yml' (#264) from feature/263-drone-stuck into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/264
2023-02-03 17:55:37 +00:00
f5f87a52dc Update drone.yml
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2023-02-03 17:55:10 +00:00
1c3ba40b56 Merge pull request 'Add .drone.yml' (#260) from feature/218-drone-ci into develop
Some checks reported errors
continuous-integration/drone/push Build was killed
Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/260
Reviewed-by: VylpesTester <tester@vylpes.com>
2023-02-03 17:35:27 +00:00
45a92a7b48 Merge branch 'develop' into feature/218-drone-ci
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2023-02-03 17:35:22 +00:00
19b6cb033c Merge pull request 'Fix not having a link set in the config crashing the bot' (#261) from feature/176-about-command into develop
Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/261
Reviewed-by: VylpesTester <tester@vylpes.com>
2023-02-03 17:35:15 +00:00
ae5f9df366 Merge branch 'develop' into feature/176-about-command 2023-02-03 17:35:11 +00:00
3f09a2367c Merge pull request 'Update random-bunny to v2.0.5' (#262) from feature/179-update-random-bunny into develop
Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/262
Reviewed-by: VylpesTester <tester@vylpes.com>
2023-02-03 17:35:01 +00:00
8e5ac6d01e Update '.drone.yml'
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2023-02-02 08:38:14 +00:00
6d7dc26e09 Update random-bunny to v2.0.5 2023-02-01 17:33:13 +00:00
4c1726f5c8 Update '.drone.yml'
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2023-01-30 11:11:04 +00:00
27afb3dd22 Fix not having a link set in the config crashing the bot 2023-01-28 14:53:23 +00:00
c3d65b5579 Add .drone.yml
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2023-01-27 17:41:05 +00:00
4bc6280a1c Merge pull request 'Update dependency uuid to v9' (#245) from renovate/uuid-9.x into develop
Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/245
Reviewed-by: Vylpes <ethan@vylpes.com>
2023-01-23 19:56:57 +00:00
de5d0bab79 Merge branch 'develop' into renovate/uuid-9.x 2023-01-23 19:54:59 +00:00
17ae4079e5 Update dependency uuid to v9 2022-12-28 18:52:33 +00:00
7 changed files with 130 additions and 45 deletions

View file

@ -13,4 +13,4 @@ BOT_OWNERID=147392775707426816
BOT_CLIENTID=682942374040961060
ABOUT_FUNDING=https://ko-fi.com/vylpes
ABOUT_REPO=https://github.com/vylpes/vylbot-app
ABOUT_REPO=https://gitea.vylpes.xyz/RabbitLabs/vylbot-app

74
.drone.yml Normal file
View file

@ -0,0 +1,74 @@
---
kind: pipeline
name: deployment
steps:
- name: deploy
image: appleboy/drone-ssh
settings:
host: 192.168.68.121
username: vylpes
password:
from_secret: ssh_password
port: 22
script:
- sh /home/vylpes/scripts/vylbot/deploy_prod.sh
trigger:
branch:
- main
event:
- promote
---
kind: pipeline
name: staging
steps:
- name: stage
image: appleboy/drone-ssh
settings:
host: 192.168.68.121
username: vylpes
password:
from_secret: ssh_password
port: 22
script:
- sh /home/vylpes/scripts/vylbot/deploy_stage.sh
trigger:
branch:
- develop
event:
- push
---
kind: pipeline
name: integration
steps:
- name: build
image: node
commands:
- yarn install --frozen-lockfile
- yarn build
- name: test
image: node
commands:
- yarn install --frozen-lockfile
- yarn test
trigger:
branch:
- main
- develop
- hotfix/*
- feature/*
- renovate/*
event:
- push
- pull_request

View file

@ -13,4 +13,4 @@ BOT_OWNERID=147392775707426816
BOT_CLIENTID=680083120896081954
ABOUT_FUNDING=https://ko-fi.com/vylpes
ABOUT_REPO=https://github.com/vylpes/vylbot-app
ABOUT_REPO=https://gitea.vylpes.xyz/RabbitLabs/vylbot-app

View file

@ -13,4 +13,4 @@ BOT_OWNERID=147392775707426816
BOT_CLIENTID=1016767908740857949
ABOUT_FUNDING=https://ko-fi.com/vylpes
ABOUT_REPO=https://github.com/vylpes/vylbot-app
ABOUT_REPO=https://gitea.vylpes.xyz/RabbitLabs/vylbot-app

View file

@ -27,7 +27,7 @@
"dependencies": {
"@discordjs/rest": "^1.1.0",
"@types/jest": "^27.0.3",
"@types/uuid": "^8.3.4",
"@types/uuid": "^9.0.0",
"discord.js": "^14.3.0",
"dotenv": "^16.0.0",
"emoji-regex": "^9.2.0",
@ -35,10 +35,10 @@
"jest-mock-extended": "^3.0.0",
"minimatch": "3.1.2",
"mysql": "^2.18.1",
"random-bunny": "^2.0.0",
"random-bunny": "^2.0.5",
"ts-jest": "^29.0.0",
"typeorm": "^0.2.44",
"uuid": "^8.3.2"
"uuid": "^9.0.0"
},
"devDependencies": {
"@types/node": "^18.0.0",

View file

@ -31,7 +31,7 @@ export default class About extends Command {
value: process.env.BOT_AUTHOR!,
inline: true,
},
])
]);
const row = new ActionRowBuilder<ButtonBuilder>();
@ -51,6 +51,6 @@ export default class About extends Command {
.setStyle(ButtonStyle.Link));
}
await interaction.reply({ embeds: [ embed ]});
await interaction.reply({ embeds: [ embed ], components: row.components.length > 0 ? [ row ] : [] });
}
}

View file

@ -439,12 +439,12 @@
terminal-link "^2.0.0"
v8-to-istanbul "^8.1.0"
"@jest/schemas@^29.0.0":
version "29.0.0"
resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a"
integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA==
"@jest/schemas@^29.4.0":
version "29.4.0"
resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.0.tgz#0d6ad358f295cc1deca0b643e6b4c86ebd539f17"
integrity sha512-0E01f/gOZeNTG76i5eWWSupvSHaIINrTie7vCyjiYFKgzNdyEGd12BUv4oNBFHOqlHDbtoJi3HrQ38KCC90NsQ==
dependencies:
"@sinclair/typebox" "^0.24.1"
"@sinclair/typebox" "^0.25.16"
"@jest/source-map@^27.4.0":
version "27.4.0"
@ -507,12 +507,12 @@
"@types/yargs" "^16.0.0"
chalk "^4.0.0"
"@jest/types@^29.3.1":
version "29.3.1"
resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz#7c5a80777cb13e703aeec6788d044150341147e3"
integrity sha512-d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA==
"@jest/types@^29.4.1":
version "29.4.1"
resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.4.1.tgz#f9f83d0916f50696661da72766132729dcb82ecb"
integrity sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA==
dependencies:
"@jest/schemas" "^29.0.0"
"@jest/schemas" "^29.4.0"
"@types/istanbul-lib-coverage" "^2.0.0"
"@types/istanbul-reports" "^3.0.0"
"@types/node" "*"
@ -537,10 +537,10 @@
resolved "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.2.2.tgz#faacdc1b5f7c43145a71eddba917de2b707ef780"
integrity sha512-ula2O0kpSZtX9rKXNeQMrHwNd7E4jPDJYUXmEGTFdMRfyfMw+FPyh04oKMjAiDuOi64bYgVkOV3MjK+loImFhQ==
"@sinclair/typebox@^0.24.1":
version "0.24.51"
resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f"
integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==
"@sinclair/typebox@^0.25.16":
version "0.25.21"
resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.21.tgz#763b05a4b472c93a8db29b2c3e359d55b29ce272"
integrity sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==
"@sindresorhus/is@^4.0.0":
version "4.6.0"
@ -704,10 +704,10 @@
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
"@types/uuid@^8.3.4":
version "8.3.4"
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
"@types/uuid@^9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.0.tgz#53ef263e5239728b56096b0a869595135b7952d2"
integrity sha512-kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q==
"@types/ws@^8.5.3":
version "8.5.3"
@ -729,9 +729,9 @@
"@types/yargs-parser" "*"
"@types/yargs@^17.0.8":
version "17.0.17"
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.17.tgz#5672e5621f8e0fca13f433a8017aae4b7a2a03e7"
integrity sha512-72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g==
version "17.0.22"
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz#7dd37697691b5f17d020f3c63e7a45971ff71e9a"
integrity sha512-pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g==
dependencies:
"@types/yargs-parser" "*"
@ -2117,11 +2117,11 @@ jest-util@^27.4.2:
picomatch "^2.2.3"
jest-util@^29.0.0:
version "29.3.1"
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz#1dda51e378bbcb7e3bc9d8ab651445591ed373e1"
integrity sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ==
version "29.4.1"
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.4.1.tgz#2eeed98ff4563b441b5a656ed1a786e3abc3e4c4"
integrity sha512-bQy9FPGxVutgpN4VRc0hk6w7Hx/m6L53QxpDreTZgJd9gfx/AV2MjyPde9tGyZRINAUrSv57p2inGBu2dRLmkQ==
dependencies:
"@jest/types" "^29.3.1"
"@jest/types" "^29.4.1"
"@types/node" "*"
chalk "^4.0.0"
ci-info "^3.2.0"
@ -2241,10 +2241,10 @@ json5@^2.1.2:
dependencies:
minimist "^1.2.5"
json5@^2.2.1:
version "2.2.2"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab"
integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==
json5@^2.2.3:
version "2.2.3"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
keyv@^4.0.0:
version "4.3.2"
@ -2272,6 +2272,11 @@ levn@~0.3.0:
prelude-ls "~1.1.2"
type-check "~0.3.2"
linqts@^1.14.4:
version "1.14.4"
resolved "https://registry.yarnpkg.com/linqts/-/linqts-1.14.4.tgz#0aa0f78fc6be073d7db874e0a0480fda5d06db7d"
integrity sha512-b5sJjG1ZQ8iLSTJV19jWgMLoQicrQVVRkkQN7B/aboU+cf30lgnhIoGM8vEjqPxZFpryDU78PFpuTnfYNIHMeg==
locate-path@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@ -2625,13 +2630,14 @@ quick-lru@^5.1.1:
resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
random-bunny@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/random-bunny/-/random-bunny-2.0.0.tgz#f9950f53c7f5183a6dad26386db14f702d477cf7"
integrity sha512-xIDaPghs0nslKWNfxDLAGNtsUPUlmNagUmdNAHP7U4LSrGySbgSfAzCV8eECTeuny2csmf0SL5dBxEZdVvHgOA==
random-bunny@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/random-bunny/-/random-bunny-2.0.5.tgz#7a6fabc34c1999b13bc30eeb95c92d5cfa743fcb"
integrity sha512-pVSAufABfk1oBR32+gqkvs4s7d0pqKd3wxD09arPbgpR4mEDOVI4yx/BhU4fxyxFKgFnP01fDDAc6jSvr8WWzA==
dependencies:
glob-parent "^6.0.0"
got "^11.8.3"
linqts "^1.14.4"
react-is@^17.0.1:
version "17.0.2"
@ -3008,14 +3014,14 @@ ts-essentials@^7.0.3:
integrity sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==
ts-jest@^29.0.0:
version "29.0.3"
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.0.3.tgz#63ea93c5401ab73595440733cefdba31fcf9cb77"
integrity sha512-Ibygvmuyq1qp/z3yTh9QTwVVAbFdDy/+4BtIQR2sp6baF2SJU/8CKK/hhnGIDY2L90Az2jIqTwZPnN2p+BweiQ==
version "29.0.5"
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.0.5.tgz#c5557dcec8fe434fcb8b70c3e21c6b143bfce066"
integrity sha512-PL3UciSgIpQ7f6XjVOmbi96vmDHUqAyqDr8YxzopDqX3kfgYtX1cuNeBjP+L9sFXi6nzsGGA6R3fP3DDDJyrxA==
dependencies:
bs-logger "0.x"
fast-json-stable-stringify "2.x"
jest-util "^29.0.0"
json5 "^2.2.1"
json5 "^2.2.3"
lodash.memoize "4.x"
make-error "1.x"
semver "7.x"
@ -3108,6 +3114,11 @@ uuid@^8.3.2:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
uuid@^9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
v8-to-istanbul@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz#0aeb763894f1a0a1676adf8a8b7612a38902446c"