Skip to content
This repository has been archived by the owner on Jan 10, 2022. It is now read-only.

v3 rewrite #305

Draft
wants to merge 106 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
c21eedc
Remove v2 files
mmattbtw Sep 7, 2021
d08e5c1
feat(core): Added the core
mmattbtw Sep 9, 2021
69e1cc5
Merge branch 'master' into rewrite/V3
mmattbtw Sep 9, 2021
d1c8703
feat(core): Added the core
mmattbtw Sep 13, 2021
91c8f61
feat(utils): Added Doob Colors
mmattbtw Sep 16, 2021
f7c55a9
fix(utils): Fixed colors returning a string.
mmattbtw Sep 16, 2021
0fb3662
refactor(utils): Refactored colors util
mmattbtw Sep 17, 2021
2e2ce90
chore(deps): Added axios as a dependency
mmattbtw Sep 18, 2021
2c07f08
feat(commands): Added coinflip command.
mmattbtw Sep 18, 2021
1aade20
feat(commands): Added coinfliptimes command.
mmattbtw Sep 18, 2021
05dd2a7
feat(commands): Added dogfact command.
mmattbtw Sep 18, 2021
47a9667
feat(commands): Added vote command
mmattbtw Sep 18, 2021
a5e1057
chore(docs): Updated the commands to keep file
mmattbtw Sep 18, 2021
16863fe
Updated settings.json vscode file
mmattbtw Sep 18, 2021
e435905
chore(docs): Updated contributors commit message
mmattbtw Sep 18, 2021
2d2eaee
chore(docs): Updated doobSwag's username in README
mmattbtw Sep 18, 2021
a60c75f
Fixed formatting?
mmattbtw Sep 18, 2021
e972ac2
Merge branch 'rewrite/V3' of https://github.com/doobdev/doob into rew…
mmattbtw Sep 18, 2021
24ea82f
fix(commands): Made all commands guild only.
mmattbtw Sep 18, 2021
502c958
feat(commands): Made dogfact error message look better.
mmattbtw Sep 18, 2021
49dbbd2
feat(commands): Added support command
mmattbtw Sep 18, 2021
98e5250
chore(deps): Added typescript as a dev dependency
mmattbtw Sep 18, 2021
42fe1e0
feat(commands): Added dog command
mmattbtw Sep 18, 2021
59e3e01
feat(commands): Made timebomb message look better.
mmattbtw Sep 19, 2021
e39d9a2
docs(commands_to_keep): Updated commands to keep list.
mmattbtw Sep 19, 2021
3cb9d95
feat(commands): Added a limit for how short/long timebomb messages ca…
mmattbtw Sep 19, 2021
428c304
feat(testing): Added Doob Dev Server as a test server
mmattbtw Sep 19, 2021
ff73473
feat(core): Added statcord posting.
mmattbtw Sep 19, 2021
e251d61
Update FUNDING.yml
mmattbtw Sep 26, 2021
0762458
Update README.md
mmattbtw Sep 26, 2021
7f3ddac
docs(sponsorships): Removed patreon
mmattbtw Sep 29, 2021
fee7093
refactor(pkg-manager): From npm to yarn
mmattbtw Sep 29, 2021
434a49b
refactor(dog-apis): Refactored the dog and dogfact commands.
mmattbtw Oct 2, 2021
f06fe2d
chore(core): Updated wokcommands
mmattbtw Oct 17, 2021
9e831ba
chore(emotes): Added valid emotes
mmattbtw Oct 17, 2021
75266c4
feat(features): Added a welcome members feature. (#323)
mmattbtw Oct 17, 2021
4965e6f
chore(vscode): Removed python formatting part of settings.json
mmattbtw Oct 17, 2021
c31d986
feat(commands): Added a set status command
mmattbtw Oct 17, 2021
b4d1de4
refactor(commands): Made simjoin only a legacy command
mmattbtw Oct 17, 2021
96f8bd8
feat(core): Made Doob set a status on launch
mmattbtw Oct 17, 2021
d6ba310
chore(pre-commit): Added pre-commit
mmattbtw Oct 17, 2021
d060ef1
chore(pre-commit): Changed pre-commit.ci message
mmattbtw Oct 17, 2021
9d2b743
feat(commands): Added fill command
mmattbtw Oct 20, 2021
1a32582
feat(core): Added generic embeds
mmattbtw Oct 20, 2021
8b3f4b4
refactor(core): Added more comments/documentation for index.ts
mmattbtw Oct 23, 2021
73dd11c
refactor(core): made everything lowercase now because it looks cool
mmattbtw Oct 23, 2021
3e3b4f8
feat(commands): added invite command
mmattbtw Oct 23, 2021
541ed61
refactor(commands): moved set(status/welcome) to config category
mmattbtw Oct 23, 2021
3e11363
refactor(commands): moved set(status/welcome) to config category
mmattbtw Oct 23, 2021
992e115
fix(features): fixed welcome messages not replacing all insances of <…
mmattbtw Oct 23, 2021
193cf95
fix(commands): fixed setwelcome typo
mmattbtw Oct 23, 2021
2138200
feat(utils): changed color codes
mmattbtw Oct 23, 2021
6aeea1e
feat(utils): added support for custom colors and images for generic e…
mmattbtw Oct 23, 2021
0e5c376
feat(features): added logging support
mmattbtw Oct 23, 2021
3341402
chore(pre-commit): excluded tsconfig from json hooks
mmattbtw Oct 23, 2021
8b15dc7
feat(deployment): added automatic github action deployment
mmattbtw Oct 23, 2021
44eb6b4
feat(features): made logging text bold
mmattbtw Oct 23, 2021
82546b8
fix(commands): fixed error messages in typescript
mmattbtw Oct 24, 2021
f411592
feat(commands): added links command
mmattbtw Oct 24, 2021
2405649
chore(pre-commit): ignored .vscode folder
mmattbtw Oct 24, 2021
afc3f40
chore(pre-commit): removed json hooks
mmattbtw Oct 24, 2021
512925f
fix(commands): moved https:// to short link from long link
mmattbtw Oct 24, 2021
b39d175
docs(commands_to_keep.md): updated
mmattbtw Oct 24, 2021
8cbdf24
refactor(utils): made it so that the only strings that colors/discord…
mmattbtw Oct 24, 2021
743a6ab
chore(workflows): added tsc check
mmattbtw Oct 24, 2021
3b21298
chore(workflows): need node 16 and not 12
mmattbtw Oct 24, 2021
4e991e7
refactor(commands): added more comments
mmattbtw Oct 28, 2021
d69117c
refactor(core): added more comments
mmattbtw Oct 28, 2021
98b73b7
chore(deps): updated deps
mmattbtw Oct 30, 2021
a7d6120
feat(commands): added ko-fi link to patreon command
mmattbtw Oct 30, 2021
79e0bdb
refactor(utils): made getDoobColor an enum
mmattbtw Oct 30, 2021
449b3d4
refactor(commands): revert dog change
mmattbtw Oct 30, 2021
18a437e
docs(utils): added jsdoc for utils
mmattbtw Oct 30, 2021
89ff8a3
feat(commands): made links logging pull from WOKCommands owner list
mmattbtw Oct 30, 2021
31d5e10
feat(commands): made ping command show latency
mmattbtw Oct 31, 2021
5583070
refactor(commands): refactored long outputs
mmattbtw Oct 31, 2021
d20ede6
feat(commands): added bot info command
mmattbtw Oct 31, 2021
0ac52ae
refactor(commands): refactored bot_owner function in links
mmattbtw Oct 31, 2021
3b9f75d
refactor(workflows): updated deploy workflow
mmattbtw Oct 31, 2021
d7551f2
docs(COMMANDS_TO_KEEP): updated commands to keep list
mmattbtw Oct 31, 2021
becc2b8
fix(commands): reworded the 'guild only' error message
mmattbtw Oct 31, 2021
20f03b6
refactor(commands): moved invite to instead of
mmattbtw Oct 31, 2021
f75be22
feat(commands): added github commands
mmattbtw Oct 31, 2021
5c0eb68
docs(README): redid readme
mmattbtw Oct 31, 2021
0ccb68d
fix(commands): fixed the label arg
mmattbtw Oct 31, 2021
d23e834
refactor(utils): added descriptions to jsdocs
mmattbtw Nov 5, 2021
8edec18
feat(features): added message edits to logging (#328)
mmattbtw Nov 20, 2021
3e395cf
feat(core): added top.gg features (#329)
mmattbtw Dec 4, 2021
30d1637
fix(logging): fixed empty messages from edit logs
mmattbtw Dec 4, 2021
382b049
Update COMMANDS_TO_KEEP.md
mmattbtw Dec 27, 2021
d3bd4b6
feat(logging): added ghost ping logs and deleted messages logs (#330)
mmattbtw Dec 28, 2021
148a597
chore(formatting): cleaned up formatting for some commands
mmattbtw Dec 28, 2021
117c5fa
feat(moderation): added the timeout command
mmattbtw Dec 28, 2021
37a8d76
feat(moderation): added the untimeout command
mmattbtw Jan 6, 2022
d355ca4
chore(workflows): removed some github actions
mmattbtw Jan 7, 2022
d9034fd
refactor(config): moved from .env to config.ts (#331)
mmattbtw Jan 7, 2022
59431bb
chore(workflows): added `rewrite/V3` branch to tsc github action
mmattbtw Jan 7, 2022
790690f
fix(config): added types to config
mmattbtw Jan 8, 2022
91fd010
fix(config): actually fix tsc check
mmattbtw Jan 8, 2022
3772e25
chore(tsconfig): add moduleResolution
mmattbtw Jan 8, 2022
4ba33ae
chore(tsconfig): exclude config.ts and node_modules
mmattbtw Jan 8, 2022
da58191
chore(tsconfig): make things compile to js
mmattbtw Jan 8, 2022
30ab5df
chore(workflows): remove tsc check pepeAgony
mmattbtw Jan 8, 2022
4b1e82e
refactor(core): remove statcord integration
mmattbtw Jan 9, 2022
8b9205d
chore(config): remove statcord from config.ts.example
mmattbtw Jan 9, 2022
023e325
feat(core): added dev mode
mmattbtw Jan 9, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions .env_example

This file was deleted.

3 changes: 1 addition & 2 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
patreon: doobdev # Support Doob Dev monthly and get perks!
ko_fi: mmatt # Support Doob Dev directly with a one time payment, no perks.
ko_fi: mmatt # Support Doob Dev directly with a one time payment OR a monthly payment, both with perks!
liberapay: mmatt # Support Doob Dev monthly with no perks.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ about: Create a report to help us improve
title: ''
labels: bug
assignees: mmattbtw

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Doob Discord Support Server
url: https://discord.gg/ryTYWjD
about: Need help with using the bot? Join the server!
- name: Doob Discord Support Server
url: https://discord.gg/ryTYWjD
about: Need help with using the bot? Join the server!
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Suggest an idea for this project
title: ''
labels: feature_request
assignees: mmattbtw

---

**Is your feature request related to a problem? Please describe.**
Expand All @@ -19,4 +18,4 @@ A clear and concise description of any alternative solutions or features you've
**Additional context**
Add any other context or screenshots about the feature request here.

- [ ] I have acknowledged that this is a command/feature that will benefit the user base.
- [ ] I have acknowledged that this is a command/feature that will benefit the user base.
2 changes: 1 addition & 1 deletion .github/config.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
todo:
keyword: "TODO"
keyword: 'TODO'
20 changes: 10 additions & 10 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
version: 2
updates:
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "daily"
labels:
- "dependencies"
assignees:
- "mmattbtw"
commit-message:
prefix: "🔼"
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'daily'
labels:
- 'dependencies'
assignees:
- 'mmattbtw'
commit-message:
prefix: 'chore(deps): '
48 changes: 42 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,46 @@
## Describe what your pull request adds or fixes.
<!--- Provide a general summary of your changes in the Title above -->
<!--- Please do remember to follow the contributing guidelines -->

### Pre-Merge checklist
- [ ] - Made sure there were no bugs by testing the bot on your own Bot Application.
## Description

- [ ] - Added a `CHANGELOG.md` entry if applicable.
<!--- Why is this change required? What problem does it solve? -->
<!--- Describe your changes in detail here to communicate to the maintainers why this pull request should be accepted -->
<!--- Describe your technology stack here if not a documentation update -->
<!--- Tasklist format is recommended for all pull requests and is required for all draft pull requests. You can couple your description with the tasklist -->
<!--- If it fixes an open issue, please link to the issue here in the last line. -->

- [ ] - Edited the version number in `launcher.py`
## How Has This Been Tested

- [ ] - Added any dependencies in `requirements.txt` if needed
<!--- Please describe in detail how you tested your changes locally -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- For example, markdown files should pass markdownlint locally according to the rules -->
<!--- See how your change affects other areas of the code, etc. -->

## Screenshots(optional)

<!--- If Screenshots is not necessary or not available in this pull request, you can delete this section -->
<!--- Changes including html and css are required to have screenshots -->

## Types of changes

<!--- What types of changes does your code introduce? -->
<!--- Only left the line that best describes this pull request -->

- Bug fix (non-breaking change which fixes an issue)
- New feature (non-breaking change which adds functionality)
- Documentation (non-breaking change which updates documentation)
- Breaking change (fix or feature that would cause existing functionality to change)
- Code style (formatting, renaming)
- Refactoring (no functional changes, no api changes)
- Other (please describe here):

## Checklist

<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

- [ ] Changes follow the **CONTRIBUTING**.md guidelines.
- [ ] Update necessary documentation accordingly.
- [ ] Check issues and pull requests first. You don't want to duplicate effort.

## Other information
22 changes: 22 additions & 0 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Generate changelog
on:
release:
types: [created, edited]
push:
branches:
- master

jobs:
generate-changelog:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: BobAnkh/auto-generate-changelog@master
with:
REPO_NAME: 'DoobDev/Doob'
ACCESS_TOKEN: ${{secrets.GITHUB_TOKEN}}
PATH: '/CHANGELOG.md'
COMMIT_MESSAGE: 'docs(CHANGELOG): update release notes'
TYPE: 'feat:Feature,fix:Bug Fixes,docs:Documentation,refactor:Refactor,perf:Performance Improvements'
20 changes: 0 additions & 20 deletions .github/workflows/contributors.yml

This file was deleted.

22 changes: 22 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# https://medium.com/swlh/how-to-deploy-your-application-to-digital-ocean-using-github-actions-and-save-up-on-ci-cd-costs-74b7315facc2
name: Build & Deploy
on:
release:
types: [created, edited]

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- name: Deploy NodeJS app
uses: appleboy/ssh-action@v0.1.2
with:
host: ${{secrets.SSH_HOST}}
key: ${{secrets.SSH_KEY}}
username: ${{ secrets.SSH_USERNAME }}

script: |
cd ~/doob
git pull
pm2 restart doob3
echo 'Deployment Complete'
30 changes: 0 additions & 30 deletions .github/workflows/lint.yml

This file was deleted.

16 changes: 0 additions & 16 deletions .github/workflows/stale.yml

This file was deleted.

21 changes: 3 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
old v1/cogs/__pycache__
__pycache__
lib/bot/token.txt
*.db
*.db-journal
lib/bot/topgg.txt
lib/bot/webhook.txt
.env
pythonenv3.8
lib/bot/statcord.txt
lib/bot/trackergg api.txt
.idea
pyproject.toml
poetry.lock
.DS_store
logs/
test-venv/
lib/cogs/afk.json
lib/cogs/blacklisted_users.json
node_modules
config.ts

build/
18 changes: 18 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
exclude: CHANGELOG.md|^.vscode
ci:
autofix_commit_msg: |
chore(pre-commit): auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
hooks:
- id: check-yaml
- id: check-added-large-files
- id: check-merge-conflict
- repo: https://github.com/pre-commit/mirrors-prettier
rev: '6e24ff01ab7d5e64045599b81c4cd34d6a6a7159'
hooks:
- id: prettier
5 changes: 5 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"singleQuote": true,
"tabWidth": 4,
"printWidth": 150
}
2 changes: 0 additions & 2 deletions .replit

This file was deleted.

11 changes: 0 additions & 11 deletions .vscode/cdc.code-snippets

This file was deleted.

31 changes: 0 additions & 31 deletions .vscode/cncog.code-snippets

This file was deleted.

12 changes: 0 additions & 12 deletions .vscode/jal.code-snippets

This file was deleted.

Loading