Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

This is the big one. The update to Discord.Js V13.1.0, and a switch from Commando to WOKCommands #110

Merged
merged 140 commits into from
Oct 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
140 commits
Select commit Hold shift + click to select a range
2f10106
Delete node.js.yml
nathen418 Apr 7, 2021
eea7261
update discord.js and mongoose
nathen418 Apr 7, 2021
608611c
A bunch of small improvements
nathen418 Apr 8, 2021
34217af
minor fixes
nathen418 Apr 8, 2021
bf5617f
Create main.yml
nathen418 Apr 8, 2021
b086798
Merge pull request #98 from Antares-Network/development
nathen418 Apr 8, 2021
53d7b95
Merge pull request #99 from Antares-Network/main
nathen418 Apr 9, 2021
0031f28
Addresses #97 #73 and removed many bugs
nathen418 Apr 9, 2021
b63fe9c
Update version to 1.3.19
nathen418 Apr 9, 2021
1b8e0e4
add .jshintrc
nathen418 Apr 9, 2021
1c44c9b
Added globals
nathen418 Apr 9, 2021
f3b9fd7
Fix some DeepSource issues
nathen418 Apr 9, 2021
5c597f0
add logo to files. Remove dependancy on ext-img
nathen418 Apr 9, 2021
46264bc
remove non utf8 char blocking from console
nathen418 Apr 9, 2021
c19f60c
add back index comments
nathen418 Apr 11, 2021
a01a413
Improve promise rejection handling
nathen418 Apr 11, 2021
4929da7
catch startup errors and exit program fatally
nathen418 Apr 11, 2021
5850153
Update test.js
nathen418 Apr 11, 2021
54dce51
fix fetch error handling
nathen418 Apr 12, 2021
20cd7b2
Update version to 1.3.20
nathen418 Apr 14, 2021
5a06a1c
Start rewrite using WOKCommands
nathen418 Sep 19, 2021
502ebea
add invite command
nathen418 Sep 19, 2021
c6442b8
Big Updates
nathen418 Sep 20, 2021
e53d181
Update logging
nathen418 Sep 20, 2021
c3edee8
remove unused imported function
nathen418 Sep 20, 2021
3ca637c
Stupid dumb dumb stupid stupid fix
nathen418 Sep 20, 2021
a221cc0
add cat command
nathen418 Sep 20, 2021
c5d736e
Make spacing consistant
nathen418 Sep 20, 2021
3f1bfb1
Add Axios as a dependancy
nathen418 Sep 20, 2021
a71fe56
Send a dm to the bot owner on startup
nathen418 Sep 20, 2021
e5e1e07
Add and fix readme
nathen418 Sep 20, 2021
d20edae
make cat async
nathen418 Sep 20, 2021
fb6c4b3
add header to index.ts
nathen418 Sep 20, 2021
1e8a7d0
remove extra spaces
nathen418 Sep 20, 2021
b6f6d9d
make the bot take the default prefix from .env
nathen418 Sep 20, 2021
1862476
NON WORKING: add anyways
nathen418 Sep 20, 2021
68374d2
New Commands
nathen418 Sep 20, 2021
a1b5c34
created mcuser command
nathen418 Sep 20, 2021
2ce05da
Give WOK a db connection
nathen418 Sep 20, 2021
af98408
add say command
nathen418 Sep 20, 2021
1b5e291
move mcuser to User group
nathen418 Sep 20, 2021
84381fb
add status change command
nathen418 Sep 20, 2021
5d7c7a7
remove unused import
nathen418 Sep 20, 2021
71da918
change send to be reply
nathen418 Sep 20, 2021
824580c
Update main.yml
nathen418 Sep 21, 2021
ac200c9
ci fix?
nathen418 Sep 21, 2021
1af6800
Merge branch 'wok-rewrite' of https://github.com/Antares-Network/Anta…
nathen418 Sep 21, 2021
43859b1
Update main.yml
nathen418 Sep 21, 2021
76cec7d
Update main.yml
nathen418 Sep 21, 2021
d5b3975
didnt work
nathen418 Sep 21, 2021
c2fab19
Merge branch 'wok-rewrite' of https://github.com/Antares-Network/Anta…
nathen418 Sep 21, 2021
ff0da6e
test.ts
nathen418 Sep 21, 2021
c3086cc
Update main.yml
nathen418 Sep 21, 2021
ff9838e
scanning
nathen418 Sep 21, 2021
2ff13b5
Merge branch 'wok-rewrite' of https://github.com/Antares-Network/Anta…
nathen418 Sep 21, 2021
8cadf6c
remove unused resources
nathen418 Sep 21, 2021
b8a4120
update heroku Procfile
nathen418 Sep 21, 2021
ac7f168
increase logging level untill a module can be made
nathen418 Sep 21, 2021
249704b
fixed models
nathen418 Sep 22, 2021
3f99c07
dumb idea anyways
nathen418 Sep 22, 2021
ba028c5
DB logic
nathen418 Sep 22, 2021
3baabfb
more db logic
nathen418 Sep 22, 2021
b3b7b5c
Merge pull request #109 from Antares-Network/wok-rewrite
nathen418 Sep 22, 2021
d224fb9
Convert to Typescript
nathen418 Sep 22, 2021
01982dd
Clean up some mess
nathen418 Sep 22, 2021
d9e7a01
Enable counting channels and make improvements
nathen418 Sep 23, 2021
8538076
remove stupid comment
nathen418 Sep 23, 2021
2e3b372
increase logging and translate more code over
nathen418 Sep 23, 2021
c371472
new commands, new dependencies
nathen418 Sep 28, 2021
18685be
new commands, changed some args
nathen418 Sep 28, 2021
030d08d
new permissions for counting
nathen418 Sep 28, 2021
6747552
bunch of little things, most changed later though
nathen418 Sep 28, 2021
aee9365
update channelCheck
nathen418 Sep 28, 2021
f3a17ba
add setup command
nathen418 Sep 28, 2021
d1d27f8
add channelCheck to command
nathen418 Sep 28, 2021
388aa59
enable adminChannel checking
nathen418 Sep 28, 2021
f1e90b3
disable testOnly
nathen418 Sep 28, 2021
98e2ab1
bleh
nathen418 Sep 28, 2021
0394768
logic for admin channel checking
nathen418 Sep 28, 2021
a9b715a
delete some whitespace
nathen418 Sep 28, 2021
b3b5bdc
oops
nathen418 Sep 28, 2021
5edfdd9
remove GUILD_MEMBERS as a needed intent
nathen418 Sep 28, 2021
a899695
remove entries on kick
nathen418 Sep 28, 2021
f345a50
fix typo
nathen418 Sep 28, 2021
77e8506
new admin/ owner commands
nathen418 Sep 28, 2021
78ddc80
remove slash/testonly
nathen418 Sep 28, 2021
c4af883
remove comments
nathen418 Sep 28, 2021
216a5a0
add aliases
nathen418 Sep 28, 2021
5789624
update invite link
nathen418 Sep 28, 2021
b966c1e
add ts-node to package.json
nathen418 Sep 28, 2021
51475b7
fix?
nathen418 Sep 28, 2021
fa93ed0
require node 16.x
nathen418 Sep 28, 2021
fd918af
remove unneeded intent from test
nathen418 Sep 28, 2021
185c981
comment out things that require guild_members
nathen418 Sep 28, 2021
2a01e1a
lotsa updates of lotsa stuff
nathen418 Oct 1, 2021
a30b747
almost there
nathen418 Oct 2, 2021
f63555c
update prefix
nathen418 Oct 2, 2021
ba03a01
remove nsfw filtering from channel
nathen418 Oct 2, 2021
6204464
update prefix
nathen418 Oct 2, 2021
9c4dc0c
remove admin chan check from setup command
nathen418 Oct 2, 2021
3f83f6d
update prefix
nathen418 Oct 2, 2021
b4abe2e
eh i guess
nathen418 Oct 2, 2021
ef39413
switch up the MD's
nathen418 Oct 2, 2021
512e03e
wording change
nathen418 Oct 2, 2021
d9c644e
fix some deepscan issues
nathen418 Oct 2, 2021
fc2dec5
Update .deepsource.toml
deepsourcebot Oct 2, 2021
46efbcf
Format code with standardjs and prettier
deepsource-autofix[bot] Oct 2, 2021
576d786
Update .deepsource.toml
nathen418 Oct 2, 2021
f85bc2c
oops
nathen418 Oct 2, 2021
e59792c
Merge pull request #111 from Antares-Network/deepsource-transform-52d…
nathen418 Oct 2, 2021
4993a60
Replace `==`/`!=` with `===`/`!==`
deepsource-autofix[bot] Oct 2, 2021
060437d
Merge pull request #116 from Antares-Network/deepsource-fix-875b7df3
nathen418 Oct 2, 2021
6fc8489
fix deepsource issues
nathen418 Oct 2, 2021
e7972cf
Merge branch 'development' of https://github.com/Antares-Network/Anta…
nathen418 Oct 2, 2021
00cbad5
Fix code quality issues
nathen418 Oct 2, 2021
5035005
Format code with standardjs and prettier
deepsource-autofix[bot] Oct 2, 2021
8fa4d22
Merge pull request #118 from Antares-Network/deepsource-transform-52a…
nathen418 Oct 2, 2021
6bd016f
fix some issues
nathen418 Oct 4, 2021
9fc536a
fix countingUpdate
nathen418 Oct 11, 2021
1cf6f35
Format code with standardjs and prettier
deepsource-autofix[bot] Oct 11, 2021
4713182
GRRR
nathen418 Oct 11, 2021
3b3835c
Merge pull request #120 from Antares-Network/deepsource-transform-5b3…
nathen418 Oct 11, 2021
60b8896
ok fine
nathen418 Oct 11, 2021
5d055af
Merge branch 'development' of https://github.com/Antares-Network/Anta…
nathen418 Oct 11, 2021
ee6d395
Replace `==`/`!=` with `===`/`!==`
deepsource-autofix[bot] Oct 11, 2021
787beee
add cooldown to suggest
nathen418 Oct 11, 2021
9f7b2f1
Merge pull request #122 from Antares-Network/deepsource-fix-caccd1ba
nathen418 Oct 11, 2021
543606a
fix issues? idk
nathen418 Oct 11, 2021
0e89a87
Merge branch 'development' of https://github.com/Antares-Network/Anta…
nathen418 Oct 11, 2021
acbbb1a
deepsource updates
nathen418 Oct 11, 2021
cd56d49
Updated documentation
nathen418 Oct 11, 2021
8c93f98
oops
nathen418 Oct 11, 2021
f4d845d
updates
nathen418 Oct 11, 2021
19e423a
fix some crashing
nathen418 Oct 12, 2021
66724e3
Ok this actually works
nathen418 Oct 12, 2021
25cc81b
add comments
nathen418 Oct 12, 2021
5e77686
handle some errors
nathen418 Oct 12, 2021
02c6edc
error handling
nathen418 Oct 12, 2021
5e29a1a
m
nathen418 Oct 12, 2021
8a17042
Merge branch 'main' into development
nathen418 Oct 12, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 5 additions & 1 deletion .deepsource.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
version = 1

test_patterns = ["/index.js"]
test_patterns = ["/index.ts"]

exclude_patterns = ["/node_modules/**"]

[[analyzers]]
name = "javascript"
enabled = true

[[transformers]]
name = "standardjs"
enabled = true
8 changes: 8 additions & 0 deletions .env-example
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
BOT_TOKEN=
BOT_MONGO_PATH=
BOT_SETTINGS_PATH=
BOT_OWNER_ID=
TEST_SERVERS=
BOT_DEFAULT_PREFIX=
VERSION=
REPORTING_CHANNEL=
37 changes: 37 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Node.js CI

on:
push:
branches:
- main
- development
pull_request:
branches:
- main
- development

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm run build --if-present
- run: npm install -g ts-node typescript
- run: ts-node test.ts
env:
BOT_MONGO_PATH: ${{ secrets.BOT_MONGO_PATH }}
BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
BOT_SETTINGS_PATH: ${{ secrets.BOT_SETTINGS_PATH }}
REPORTING_CHANNEL: ${{ secrets.REPORTING_CHANNEL }}
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
launch.json
README.md
.env
.vscode
.env
.env.old
v1.3.20
node_modules
3 changes: 3 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"esversion": 6
}
41 changes: 0 additions & 41 deletions Discarded commands/ip.js

This file was deleted.

29 changes: 17 additions & 12 deletions PRIVACY.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
# ![](https://cdn.discordapp.com/icons/649703068799336454/1a7ef8f706cd60d62547d2c7dc08d6f0.png) Antares Bot Privacy Policy

### Data Collected By Command and when features are enabled

The following may be collected when the bot joins a server and or when a user voluntarily enters this information.
When providing data in this way, you forego any rights to the content of the data provided.
- Server configurations (region, name, id, description, age, icon, channel names and channel ids)
- Server ownership
- List of server's members
- List of server's roles
- Messages sent (These are **not** stored but the bot sees them) *messages sent in the bot support server* **are** *stored*
- Commands sent (These **are** stored)
- Server invites (The bot may create an invite for your server)
- Number of commands and messages sent

When providing data in this way, you forego any rights to the content of the data provided.

- Server configurations (region, name, id, description, age, icon, channel names and channel ids)
- Server ownership
- List of server's members
- List of server's roles
- Messages sent (These are **not** stored but the bot sees them) _messages sent in the bot support server_ **are** _stored_
- Commands sent (These **are** stored)
- Server invites (The bot may create an invite for your server)
- Number of commands and messages sent

#### All data is stored on secured servers. Maximum efforts are taken to keep collected data protected, but absolute security cannot be guaranteed. We are not liable for any damages or stolen information, in which we collect, from our servers.

### Server Member Agreement
### Server Member Agreement

- By being a member of a server which uses Antares Bot's services or features, you are consenting to the policies outlined in this agreement. If you, the server member, do not agree with any policies outlined in this agreement, you have the right to leave the server in which this bot is a part of.

### Server Administrator Agreement

- By adding Antares Bot to your server, you are consenting to the policies outlined in this agreement. If you, the server administrator, do not agree with any of the policies outlined in this agreement, you have the right to remove Antares Bot from your server.
This policy may change at any time without warning. It is your responsibility as a server owner to keep up with the changes.
This policy may change at any time without warning. It is your responsibility as a server owner to keep up with the changes.

### To request the data we store on you to be deleted from our database, please run the command &remove, However the following data will remain: Server Name, ID, Owner, and previous bot join date
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
worker: node index.js
worker: ts-node index.ts
80 changes: 31 additions & 49 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,68 +1,50 @@
[![DeepSource](https://deepsource.io/gh/Antares-Network/AntaresBot.svg/?label=active+issues&show_trend=true)](https://deepsource.io/gh/Antares-Network/AntaresBot/?ref=repository-badge)
[![DeepScan grade](https://deepscan.io/api/teams/13494/projects/16475/branches/354970/badge/grade.svg)](https://deepscan.io/dashboard#view=project&tid=13494&pid=16475&bid=354970)
[![codebeat badge](https://codebeat.co/badges/571d8db9-611a-4c8e-bc2f-c55e557cf0a7)](https://codebeat.co/projects/github-com-antares-network-antaresbot-main)
[![Node.js CI](https://github.com/Antares-Network/AntaresBot/actions/workflows/node.js.yml/badge.svg?branch=main)](https://github.com/Antares-Network/AntaresBot/actions/workflows/node.js.yml)
![](https://img.shields.io/github/repo-size/Antares-Network/AntaresBot?color=Green&style=flat-square)
![](https://img.shields.io/tokei/lines/github/Antares-Network/AntaresBot?style=flat-square)
![](https://cdn.discordapp.com/icons/649703068799336454/1a7ef8f706cd60d62547d2c7dc08d6f0.png)
## AntaresBot
## Release version 1.3.20 Look below for specs
# MAJOR REWRITE COMING SOON
[![Codebeat badge](https://codebeat.co/badges/571d8db9-611a-4c8e-bc2f-c55e557cf0a7)](https://codebeat.co/projects/github-com-antares-network-antaresbot-main)
![Repository size](https://img.shields.io/github/repo-size/Antares-Network/AntaresBot?color=Green&style=flat-square)
![Lines in the project](https://img.shields.io/tokei/lines/github/Antares-Network/AntaresBot?style=flat-square)
![GitHub release (latest by date)](https://img.shields.io/github/v/release/Antares-Network/AntaresBot?style=social)
[![Discord](https://discordapp.com/api/guilds/649703068799336454/widget.png)](https://discordapp.com/invite/KKYw763)

# Antares Bot

# Join our discord server:
https://dsc.gg/antaresnetwork
- Description: Antares Bot is a small Discord bot with a lot of fun commands and features. It is built on top of [Discord.Js V13.1.0](https://discord.js.org/) and [WOKCommands](https://github.com/AlexzanderFlores/WOKCommands)

## How to run yourself

## Invite the bot at the link below:
**https://discord.com/oauth2/authorize?client_id=736086156759924762&scope=bot&permissions=125969**
- Create a `.env` file in the root directory of the project. Refer to [this file](/.env-example) for an example.
- git clone <https://github.com/Antares-Network/AntaresBot.git>
- cd AntaresBot
- npm install
- npm install -g typescript ts-node
- ts-node index.ts

## A list of User Commands
- 'Counting' channel information is available using the command: *adminhelp*
## End goal of the project

- This is a list of commands the bot currently supports
- This project is really just for fun and to test my (Nate's) skills at JavaScript and TypeScript and many other technologies. I will consider myself to have made it when the official Antares Bot gets verified by Discord.

- **8ball** or **ask**: Ask the bot a question and have it respond
## Bot Features

- **random**: ❗❗COMMAND DISABLED FOR A REWRITE❗❗
- You can find user commands listed [here](/commands/user/userCommands.md)
- You can find admin commands listed [here](/commands/admin/adminCommands.md)
- You can find owner commands listed [here](/commands/owner/ownerCommands.md)
- You can find other features listed [here](/functions/features.md)

- **cat**: Sends a random picture of a cat.
## Credits

- **dog**: Sends a random picture of a dog.
- [Nate Goldsborough](https://nathen418.com)
- [Seth T.](https://github.com/StickyFingies)

- **reddit** or **meme**: ❗❗This command is disabled as it is being rewritten to improve NSFW filtering❗❗
## Join our discord server

- **xkcd** or **comic**: Sends a random XKCD comic
<https://dsc.gg/antaresnetwork>

- **github**: Sends an embed with a link to the github repo for the bot.

- **prefix**: Shows the Prefix for the bot.

- **invite**: Sends an invite for the bot and the support server.

- **ping**: Sends the ping time of the bot.

- **uptime**: Sends the uptime of the bot

- **stats** and **update**: Updates the database and shows the bots most recent stats.

- **adminhelp**: Shows the Admin Help Embed

- **privacy**: Sends in a dm, the privacy policy for the bot.

## Admin Help Commands:

- **setup**: Sets the channel the bot will talk in

- **adminchannel**: Sets the channel the bot will send admin messages in

- **counting**: Creates a channel to be used for a counting game

- **remove**: Removes all data for the server this command is run in

- **say** or **echo**: Lets you make the bot say something. Careful, this is monitored for abuse
## Invite Antares Bot to your server

<https://discord.com/oauth2/authorize?client_id=736086156759924762&permissions=125969&scope=bot%20applications.commands>

## License

<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-nd/3.0/88x31.png" /></a>
- Default license is shown below. Other licenses may be chosen by the developer or the team at any time. Our default license will allow you to distribute our code without restriction as long as nothing is changed, and the terms of the Creative Commons License by--nc-nd are followed. However one must only contact us through our business email to request an exemption. If you wish to do anything that the cc by-nc-nd license does not allow, just ask about it and we will probably say go ahead.

![CC-BY_NC_ND](https://i.creativecommons.org/l/by-nc-nd/3.0/88x31.png)
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

| Version | Supported |
| ------- | ------------------ |
| 1.3.10 | :white_check_mark: |
| 1.3.18 | :white_check_mark: |
| < 1.3 | :x: |

## Reporting a Vulnerability
Expand Down
73 changes: 0 additions & 73 deletions actions/docCreate.js

This file was deleted.

Loading