Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1f58ffb
refactor: package-lock.json
MDCYT Feb 3, 2022
2ec62ca
refactor: Pre release automatic
MDCYT Feb 3, 2022
5a0816e
fix: Delete duplicated xpchannel
MDCYT Feb 3, 2022
a255650
fix: Updated package and package-lock
MDCYT Feb 4, 2022
0b031f8
refactor: Time to answer the trivia increased
MDCYT Feb 4, 2022
ad56a96
feat: Remove songs command
MDCYT Feb 4, 2022
2f7cf54
fix: Minecraft Topic Fixed
MDCYT Feb 4, 2022
895aef1
feat: API for a future DashBoard
MDCYT Feb 4, 2022
2b6b4cf
fix: Error Message ChatBot
MDCYT Feb 4, 2022
cb0456f
feat: Best Queue Music
MDCYT Feb 4, 2022
29003dc
refactor: Change Type play.js
MDCYT Feb 4, 2022
b4888a6
refactor: Delete Unused Code
MDCYT Feb 4, 2022
5df88d5
feat: Support Server Compatibility
MDCYT Feb 4, 2022
1921d82
feat: Update to Mongo DB
MDCYT Feb 21, 2022
5def584
fix: New NPM for the chatbot
MDCYT Feb 25, 2022
f0dcb65
refactor: 2 more things added to the .gitignore
MDCYT Feb 25, 2022
04334cc
refactor: Updated voice list
MDCYT Feb 25, 2022
3ade6ec
feat: setAvatar command
MDCYT Feb 25, 2022
ae4ec67
fix: Commands NSFW can now correctly read the tags
MDCYT Feb 25, 2022
7c215e7
feat: New dependencies
MDCYT Feb 25, 2022
cb58f2b
test: Pre-MongoDB
MDCYT Feb 25, 2022
b1b585c
refactor: Avatar Command
MDCYT Feb 25, 2022
68d5475
test: Trying to upgrade to using Shards
MDCYT Feb 25, 2022
465d4fa
refactor: Fixed minor syntax errors
MDCYT Feb 25, 2022
86bc3dd
refactor: Server Icon in Best Quality
MDCYT Feb 25, 2022
b8998f3
feat!: Update the bot to Discord V13
MDCYT Feb 25, 2022
a1b1d36
fix: 3 missing files for it to run properly
MDCYT Feb 25, 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
2 changes: 1 addition & 1 deletion .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Pre-release"

on:
push:
branches: [ developement ]
branches: [ dev ]

jobs:
pre-release:
Expand Down
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,15 @@ lerna-debug.log
Thumbs.db
/.github/
src/commands/backup/backups
data/
data/db.sqlite-wal
data/db.sqlite-shm
data/db.sqlite
data/notes.json
data/backups
logs/
blapi.json
config.json
src/commands/fun/notes.json
src/commands/fun/notes.json
/.vscode/settings.json
/identifier.sqlite
81 changes: 44 additions & 37 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,37 +1,44 @@
const config = require("./config.json");
const Client = require("./src/client.js");
const {Intents} = require("discord.js");

const botlist = config.botlist;
global.__basedir = __dirname;

// Client setup
const intents = new Intents();
intents.add(
"GUILD_PRESENCES",
"GUILD_MEMBERS",
"GUILDS",
"GUILD_VOICE_STATES",
"GUILD_MESSAGES",
"GUILD_MESSAGE_REACTIONS"
);
const client = new Client(config, {ws: {intents: intents}});

// Initialize client
function init() {
client.loadEvents("./src/events");
client.loadCommands("./src/commands");
client.loadTopics("./data/trivia");
client.login(client.token);
}

init();

if (botlist) {
let {botlist} = require("./src/utils/botlist.js")
botlist(client).then(() => {
client.logger.info("Botlist updated!");
}
);
}
process.on("unhandledRejection", (err) => client.logger.error(err));
require("dotenv").config();
const Client = require("./src/client.js");
const config = require("./config.json");
const { Player } = require('discord-player');
const {index} = require("./src/utils/dashboard.js");
const botlist = config.botlist;
global.__basedir = __dirname;

const client = new Client(config, {
intents: 8191,
allowedMentions: { parse: ['users', 'roles'], repliedUser: true }
});

client.player = new Player(client);
const player = client.player;

// Initialize client
function init() {
client.loadCommands("./src/commands");
client.loadSlashCommands("./src/slash")
client.loadEvents("./src/events", client, player);
client.loadMusicEvents("./src/music", player);
client.loadTopics("./data/trivia");
client.login(client.token);
}

init();

if (botlist) {
let {botlist} = require("./src/utils/botlist.js")
botlist(client).then(() => {
client.logger.info("Botlist updated!");
}
);
}


if(!(client.shard)) {
const { index } = require("./src/utils/dashboard.js");
index(client);
}


process.on("unhandledRejection", (err) => client.logger.error(err));
6 changes: 3 additions & 3 deletions blapi.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"discordbotlist": "Token-here", //https://discordbotlist.com/
"topgg": "Token-here", //top.gg
"bdl": "Toekn-here" //https://botdesignerlist.com
"discordbotlist": "Token-here",
"topgg": "Token-here",
"bdl": "Token-here"
}
42 changes: 21 additions & 21 deletions data/trivia/minecraft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ questions:
- Grumm
- question: Which what tag name do sheeps a rainbow color?
answers:
- jeb_
- "jeb_"
- question: What Game Inspired Notch To Start Making Minecraft?
answers:
- Infiniminer
Expand All @@ -88,7 +88,7 @@ questions:
- Kill the Dragon
- Kill Ender Dragon
- Kill Dragon
- question: "Who is the \"Feared Player\" in Minecraft?"
- question: "Who is the 'Feared Player' in Minecraft?"
answers:
- Herobrine
- question: Which Is The Most Important Block Type In Minecraft And Is Used To Make Everything Else?
Expand All @@ -105,10 +105,10 @@ questions:
- Cave Gam
- question: How Far Away Can You Be From A Ghast For It To See You?
answers:
- 100 blocks
- 100 blocks away
- 100 blocks away from you
- 100 blocks from you
- "100 blocks"
- "100 blocks away"
- "100 blocks away from you"
- "100 blocks from you"
- question: What Does The Creeper Mob Drop After It Is Killed?
answers:
- Gunpowder
Expand All @@ -119,10 +119,10 @@ questions:
- Skeleton Warrior
- question: How Much Wool Is Required To Build A Bed?
answers:
- 3
- 3 blocks
- 3 blocks of wool
- 3 blocks of wool required
- "3"
- "3 blocks"
- "3 blocks of wool"
- "3 blocks of wool required"
- question: Which Item Is Dropped By Slimes?
answers:
- Slimeball
Expand All @@ -148,12 +148,12 @@ questions:
answers:
- Ocelot
- Cat
- question: In A Full Set, How Many Pieces Of Armor Are There?
- question: "In A Full Set, How Many Pieces Of Armor Are There?"
answers:
- 4
- 4 pieces
- 4 pieces of armor
- 4 pieces of armor required
- "4"
- "4 pieces"
- "4 pieces of armor"
- "4 pieces of armor required"
- question: Tell me one of the three items required to get an active conduit
answers:
- Heart of the Sea
Expand All @@ -164,9 +164,9 @@ questions:
- Sweden
- question: Which Version Added The Dark Dimension Known As The End?
answers:
- 1.0.0
- V 1.0.0
- Version 1.0.0
- "1.0.0"
- "V 1.0.0"
- "Version 1.0.0"
- question: "How Do You Earn The Achievement Titled \"The End\"?"
answers:
- Enter the exit portal
Expand All @@ -181,6 +181,6 @@ questions:
- Witch
- question: Can You Revive The Ender Dragon?
answers:
- Yes
- Yes, you can
- Yes, you can revive the Ender Dragon
- "Yes"
- "Yes, you can"
- "Yes, you can revive the Ender Dragon"
30 changes: 30 additions & 0 deletions data/under_contruction.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
module.exports = {
name: "under_construction",
run: async () => {
require("dotenv").config();
const {Client} = require("Discord.js");
global.__basedir = __dirname;

const client = new Client({
intents: 8191,
allowedMentions: { parse: ["users", "roles"], repliedUser: true },
});

client.once("ready", () => {
//Change the bot's status dnd
client.user.setPresence(
{
activities: [
{
name: "Under Construction",
type: 'LISTENING'
}
],
status: "dnd"
}
)
});

client.login(process.env.TOKEN);
},
};
Loading