From 1a8baecfa13254cc4a3253ede9eb09e18f04f175 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Mon, 4 Oct 2021 19:43:53 +0100 Subject: [PATCH 1/5] Improvements --- .gitignore | 3 +++ CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 50 ++++++++++++++++++++++------------------------ package.json | 5 +++-- 4 files changed, 31 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 948756c..e436cc5 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,6 @@ events/ # Linux Environment Files *.swp + +# macOS Environment Files +.DS_Store \ No newline at end of file diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 6c4a60e..743fe01 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -61,7 +61,7 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at -getgravitysoftware@gmail.com. +ethan@vylpes.com. All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9720b10..2e2d3cb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,7 +12,7 @@ This project and everyone participating in it is governed by the VylBot Core Cod > **Note:** Please don't file an issue to ask a question. You'll get faster results by using the resources below. -You can ask a question about the project by emailing us at `getgravitysoftware@gmail.com`. +You can ask a question about the project by emailing us at `ethan@vylpes.com`. You can ask a question about the project in the `#development` channel in the [Discord Server](https://discord.gg/UyAhAVp). @@ -32,7 +32,7 @@ There are a few conventions that have developed over time for this project. When We won't accept pull requests unless these checks pass. If yours fail, simply fix what the bot says until it passes and then get a repo member to review your code. -The rules for the code is based upon [Gravity Software's Config Repo](https://github.com/GetGravitySoft/Config) +The rules for the code is based upon [Vylpes' Config Repo](https://github.com/vylpes/Config) * Variable names should use **Camel Case** * Functions should put **braces on the same line** @@ -119,26 +119,26 @@ Enhancement suggestions are tracked as GitHub issues. After you've determined th Unsure where to begin contributing to VylBot Core? You can start by looking through these `good first` and `help wanted` issues: -* [Good first issue](https://github.com/getgravitysoft/vylbot-core/labels/good%20first%20issue) - issues which should only require a few lines of code, and a test or two. -* [Help wanted](https://github.com/getgravitysoft/vylbot-core/labels/help%20wanted) - issues which should be a bit more involved than `good first` issues. +* [Good first issue](https://github.com/vylpes/vylbot-core/labels/good%20first%20issue) - issues which should only require a few lines of code, and a test or two. +* [Help wanted](https://github.com/vylpes/vylbot-core/labels/help%20wanted) - issues which should be a bit more involved than `good first` issues. #### Prerequisites -In order to download necessary tools, clone the repository, and install dependencies via `npm` you need network access. +In order to download necessary tools, clone the repository, and install dependencies via `yarn` you need network access. You'll need the following tools: * Git * NodeJS -Install and build all of the dependencies using `npm` +Install and build all of the dependencies using `yarn` ```bash -cd VylBot Core -npm install -cp config.json.template config.json +cd vylbot-core +yarn install +cp .env.template .env ``` -And then use your text editor of choice to fill in the `config.json` file. +And then use your text editor of choice to fill in the `.env` file. #### Build and Run @@ -147,15 +147,15 @@ If you want to understand how VylBot Core works or want to debug an issue, you'l First, fork the VylBot Core repository so that you can make a pull request. Then, clone your fork locally: ```bash -git clone https://github.com//VylBot Core.git +git clone https://github.com//vylbot-core.git ``` Occasionally, you will want to merge changes in the upstream repository (the official code repo) with your fork. ```bash -cd VylBot Core +cd vylbot-core git checkout master -git pull https://github.com/getgravitysoft/VylBot Core.git master +git pull https://github.com/vylpes/vylbot-core.git master ``` Manage any merge conflicts, commit them, and then push them to your fork. @@ -202,20 +202,18 @@ As well as eslint's recommended defaults. Example -```js -function ban (member) { - let reason = "Example reason"; +```ts +// hello.ts +import { Command, ICommandContext } from "vylbot-core"; - let args = [ - "one", - "two" - ]; +export class hello extends Command { + constructor() { + super(); + } - member.ban(reason).then(() => { - // handle then here - }).catch(err => { - // handle error here - }); + public override execute(context: ICommandContext) { + context.message.reply("Hello"); + } } ``` @@ -251,7 +249,7 @@ There are a few conventions that have developed over time for this project. When We won't accept pull requests unless these checks pass. If yours fail, simply fix what the bot says until it passes and then get a repo member to review your code. -The rules for the code is based upon [Gravity Software's Config Repo](https://github.com/getgravitysoft/config) +The rules for the code is based upon [Vylpes' Config Repo](https://github.com/vylpes/config) * Variable names should use **Camel Case** * Functions should put **braces on the same line** diff --git a/package.json b/package.json index db996d9..3c6070e 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,13 @@ "main": "./src/index", "scripts": { "build": "tsc", - "test": "jest --coverage", + "test": "jest", + "test:coverage": "jest --coverage", "lint": "eslint ." }, "author": "Vylpes", "license": "MIT", - "funding": "https://ko-fi.com/gravitysoftware", + "funding": "https://ko-fi.com/vylpes", "dependencies": { "discord.js": "^12.3.1", "dotenv": "^10.0.0" From f6d57a1fda5666bd19f302ab3f6a1a1bfc93a29c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Oct 2021 18:45:44 +0000 Subject: [PATCH 2/5] Bump tmpl from 1.0.4 to 1.0.5 Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5. - [Release notes](https://github.com/daaku/nodejs-tmpl/releases) - [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5) --- updated-dependencies: - dependency-name: tmpl dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index dc93067..59ded77 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2984,9 +2984,9 @@ throat@^6.0.1: integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== tmpl@1.0.x: - version "1.0.4" - resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" - integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= + version "1.0.5" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" + integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== to-fast-properties@^2.0.0: version "2.0.0" From e302f2ee4dd6362e478a5362da00ba0d8650a031 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Oct 2021 18:45:45 +0000 Subject: [PATCH 3/5] Bump ansi-regex from 5.0.0 to 5.0.1 Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/chalk/ansi-regex/releases) - [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1) --- updated-dependencies: - dependency-name: ansi-regex dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index dc93067..08e6de0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -848,9 +848,9 @@ ansi-escapes@^4.2.1: type-fest "^0.21.3" ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-styles@^3.2.1: version "3.2.1" From 16ac225a442f136cd8d7e5f128b663e835311158 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Mon, 4 Oct 2021 19:51:21 +0100 Subject: [PATCH 4/5] v2.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3c6070e..3e490c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vylbot-core", - "version": "1.0.5", + "version": "2.0.0", "description": "A discord client based upon discord.js", "main": "./src/index", "scripts": { From 7c85aec9716278a78d4384bf28d5da1b488c24dd Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Mon, 11 Oct 2021 16:22:18 +0100 Subject: [PATCH 5/5] v2.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e490c5..eb1267d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vylbot-core", - "version": "2.0.0", + "version": "2.0.1", "description": "A discord client based upon discord.js", "main": "./src/index", "scripts": {