Compare commits

...

16 commits

Author SHA1 Message Date
92d0cf7a72 Update dependency minimatch to v6
Some checks failed
continuous-integration/drone/pr Build is failing
continuous-integration/drone/push Build is failing
2023-02-13 00:02:37 +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
7 changed files with 103 additions and 16 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

@ -33,9 +33,9 @@
"emoji-regex": "^9.2.0",
"jest": "^27.4.5",
"jest-mock-extended": "^3.0.0",
"minimatch": "3.1.2",
"minimatch": "6.1.8",
"mysql": "^2.18.1",
"random-bunny": "^2.0.0",
"random-bunny": "^2.0.5",
"ts-jest": "^27.1.2",
"typeorm": "^0.2.44",
"uuid": "^9.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

@ -894,6 +894,13 @@ brace-expansion@^1.1.7:
balanced-match "^1.0.0"
concat-map "0.0.1"
brace-expansion@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
dependencies:
balanced-match "^1.0.0"
braces@^3.0.1:
version "3.0.2"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
@ -2219,6 +2226,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"
@ -2317,12 +2329,12 @@ 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@3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
minimatch@6.1.8:
version "6.1.8"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-6.1.8.tgz#5a0ea694ca41342e14561bbec62802b59509f7e4"
integrity sha512-sTvS8Q4mIZiSnMo9192lZMxfeaGCslH5CC7B62hd9DlbifUVrc02ABTeRJINPosxKnvZlrmAaNSo8f4PZqDDdw==
dependencies:
brace-expansion "^1.1.7"
brace-expansion "^2.0.1"
minimatch@^3.0.4:
version "3.0.4"
@ -2572,13 +2584,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"