From c3d65b5579852ad8bbfed8403996c5360e4d30a5 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Fri, 27 Jan 2023 17:41:05 +0000 Subject: [PATCH 01/10] Add .drone.yml --- .drone.yml | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..99949c6 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,76 @@ +--- + +kind: pipeline +type: ssh +name: deployment + +server: + host: 192.168.68.121 + user: vylpes + password: + from_secret: ssh_password + +steps: +- name: deploy + commands: + - sh /home/vylpes/scripts/vylbot/deploy_prod.sh + +trigger: + branch: + - main + event: + - promote + target: + - production + +--- + +kind: pipeline +type: ssh +name: staging + +server: + host: 192.168.68.121 + user: vylpes + password: + from_secret: ssh_password + +steps: +- name: deploy + commands: + - 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 From 27afb3dd222a38d1adbedeebdf2cb155a8be374f Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sat, 28 Jan 2023 14:53:23 +0000 Subject: [PATCH 02/10] Fix not having a link set in the config crashing the bot --- .dev.env | 2 +- .prod.env | 2 +- .stage.env | 2 +- src/commands/about.ts | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) 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/.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/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 From d3f894978b11eff777e9cf09b382e35387138507 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 30 Jan 2023 00:02:48 +0000 Subject: [PATCH 03/10] Update dependency minimatch to v6 --- package.json | 2 +- yarn.lock | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 2ab4f46..7fa70ed 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "emoji-regex": "^9.2.0", "jest": "^27.4.5", "jest-mock-extended": "^3.0.0", - "minimatch": "3.1.2", + "minimatch": "6.1.6", "mysql": "^2.18.1", "random-bunny": "^2.0.0", "ts-jest": "^27.1.2", diff --git a/yarn.lock b/yarn.lock index f5a318c..a81cd5f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" @@ -2317,12 +2324,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.6: + version "6.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-6.1.6.tgz#5384bb324be5b5dae12a567c03d22908febd0ddd" + integrity sha512-6bR3UIeh/DF8+p6A9Spyuy67ShOq42rOkHWi7eUe3Ua99Zo5lZfGC6lJJWkeoK4k9jQFT3Pl7czhTXimG2XheA== dependencies: - brace-expansion "^1.1.7" + brace-expansion "^2.0.1" minimatch@^3.0.4: version "3.0.4" From 4c1726f5c8a91cbd96dfcf7d58e7413f2e34c25b Mon Sep 17 00:00:00 2001 From: Vylpes Date: Mon, 30 Jan 2023 11:11:04 +0000 Subject: [PATCH 04/10] Update '.drone.yml' --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 99949c6..ec32358 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ type: ssh name: deployment server: - host: 192.168.68.121 + host: 192.168.1.2 user: vylpes password: from_secret: ssh_password @@ -30,7 +30,7 @@ type: ssh name: staging server: - host: 192.168.68.121 + host: 192.168.1.2 user: vylpes password: from_secret: ssh_password From 6d7dc26e091b1beb665777007c9053ace69d147a Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 1 Feb 2023 17:33:13 +0000 Subject: [PATCH 05/10] Update random-bunny to v2.0.5 --- package.json | 2 +- yarn.lock | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2ab4f46..5fe1e24 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "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": "^27.1.2", "typeorm": "^0.2.44", "uuid": "^9.0.0" diff --git a/yarn.lock b/yarn.lock index f5a318c..69249c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2219,6 +2219,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" @@ -2572,13 +2577,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" From 8e5ac6d01e8a2af0096c8c8b68945f50b6c49901 Mon Sep 17 00:00:00 2001 From: Vylpes Date: Thu, 2 Feb 2023 08:38:14 +0000 Subject: [PATCH 06/10] Update '.drone.yml' --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index ec32358..99949c6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ type: ssh name: deployment server: - host: 192.168.1.2 + host: 192.168.68.121 user: vylpes password: from_secret: ssh_password @@ -30,7 +30,7 @@ type: ssh name: staging server: - host: 192.168.1.2 + host: 192.168.68.121 user: vylpes password: from_secret: ssh_password From f5f87a52dc7ccdeb28df991e474002c9b11781c5 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Fri, 3 Feb 2023 17:55:10 +0000 Subject: [PATCH 07/10] Update drone.yml --- .drone.yml | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index 99949c6..4ed9c9e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,44 +1,38 @@ --- kind: pipeline -type: ssh name: deployment -server: +image: appleboy/drone-ssh +settings: host: 192.168.68.121 - user: vylpes + username: vylpes password: from_secret: ssh_password - -steps: -- name: deploy - commands: - - sh /home/vylpes/scripts/vylbot/deploy_prod.sh + port: 22 + script: + - sh /home/vylpes/scripts/vylbot/deploy_prod.sh trigger: branch: - main event: - promote - target: - - production --- kind: pipeline -type: ssh name: staging -server: +image: appleboy/drone-ssh +settings: host: 192.168.68.121 - user: vylpes + username: vylpes password: from_secret: ssh_password - -steps: -- name: deploy - commands: - - sh /home/vylpes/scripts/vylbot/deploy_stage.sh + port: 22 + script: + - sh /home/vylpes/scripts/vylbot/deploy_stage.sh trigger: branch: From 1908f7505c4da29ba97e10b96b32bc798ebe0cb9 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Fri, 3 Feb 2023 18:01:06 +0000 Subject: [PATCH 08/10] Update drone.yml --- .drone.yml | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4ed9c9e..bdcc199 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,15 +3,16 @@ kind: pipeline name: deployment -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 +steps: + 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: @@ -24,15 +25,16 @@ trigger: kind: pipeline name: staging -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 +steps: + 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: From b9fdd51897c453f1afa6c5d8eef380bd30634eed Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Fri, 3 Feb 2023 18:02:40 +0000 Subject: [PATCH 09/10] Update drone.yml --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index bdcc199..4584051 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,6 +4,7 @@ kind: pipeline name: deployment steps: +- name: deploy image: appleboy/drone-ssh settings: host: 192.168.68.121 @@ -26,6 +27,7 @@ kind: pipeline name: staging steps: +- name: stage image: appleboy/drone-ssh settings: host: 192.168.68.121 From 92d0cf7a728ef43a0eacbf68b08a2869d5233a7a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 13 Feb 2023 00:02:37 +0000 Subject: [PATCH 10/10] Update dependency minimatch to v6 --- package.json | 2 +- yarn.lock | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 5fe1e24..adece3f 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "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.5", "ts-jest": "^27.1.2", diff --git a/yarn.lock b/yarn.lock index 69249c2..9e719a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" @@ -2322,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"