diff --git a/.dev.env b/.dev.env index 199bb0a..fb4a31c 100644 --- a/.dev.env +++ b/.dev.env @@ -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 diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..4584051 --- /dev/null +++ b/.drone.yml @@ -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 \ No newline at end of file diff --git a/.prod.env b/.prod.env index c4fd73a..f0c75d5 100644 --- a/.prod.env +++ b/.prod.env @@ -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 diff --git a/.stage.env b/.stage.env index 85e3068..9b90831 100644 --- a/.stage.env +++ b/.stage.env @@ -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 diff --git a/package.json b/package.json index 7fa70ed..adece3f 100644 --- a/package.json +++ b/package.json @@ -33,9 +33,9 @@ "emoji-regex": "^9.2.0", "jest": "^27.4.5", "jest-mock-extended": "^3.0.0", - "minimatch": "6.1.6", + "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" diff --git a/src/commands/about.ts b/src/commands/about.ts index b1ad17b..5da00b8 100644 --- a/src/commands/about.ts +++ b/src/commands/about.ts @@ -31,7 +31,7 @@ export default class About extends Command { value: process.env.BOT_AUTHOR!, inline: true, }, - ]) + ]); const row = new ActionRowBuilder(); @@ -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 ] : [] }); } } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index a81cd5f..9e719a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2226,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" @@ -2324,10 +2329,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@6.1.6: - version "6.1.6" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-6.1.6.tgz#5384bb324be5b5dae12a567c03d22908febd0ddd" - integrity sha512-6bR3UIeh/DF8+p6A9Spyuy67ShOq42rOkHWi7eUe3Ua99Zo5lZfGC6lJJWkeoK4k9jQFT3Pl7czhTXimG2XheA== +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 "^2.0.1" @@ -2579,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"