Skip to content

Commit e3c7068

Browse files
MDCYTMDCYT
authored
Merge pull request #32 from MDCYT/dev
The 3.0.0
2 parents 122e47e + fd5295a commit e3c7068

230 files changed

Lines changed: 26501 additions & 26592 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ logs/
9898
blapi.json
9999
config.json
100100
src/commands/fun/notes.json
101-
src/commands/fun/notes.json
102101
/.vscode/settings.json
103102
/identifier.sqlite
103+
.storyteller
104+
.vscode

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<p align="center">
55

6-
<img src="https://github.com/MDCYT/Any-Bot/actions/workflows/pre-release.yml/badge.svg">
6+
<img src="https://github.com/MDCYT/Any-Bot/actions/workflows/pre-release.yml/badge.svg" alt="prerelease">
77

88
<img src="https://github.com/MDCYT/Any-Bot/actions/workflows/codeql-analysis.yml/badge.svg">
99

‎app.js‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,32 @@
11
require("dotenv").config();
22
const Client = require("./src/client.js");
33
const config = require("./config.json");
4-
const { Player } = require('discord-player');
5-
const {index} = require("./src/utils/dashboard.js");
4+
const { Player } = require("discord-player");
65
const botlist = config.botlist;
6+
const discordModals = require("discord-modals");
77
global.__basedir = __dirname;
8+
const WebSocket = require("ws");
89

910
const client = new Client(config, {
10-
intents: 8191,
11-
allowedMentions: { parse: ['users', 'roles'], repliedUser: true }
11+
partials: ["CHANNEL"],
12+
intents: 130815,
13+
allowedMentions: { parse: ["users", "roles"], repliedUser: true },
1214
});
1315

16+
discordModals(client);
17+
1418
client.player = new Player(client);
1519
const player = client.player;
1620

1721
// Initialize client
1822
function init() {
23+
1924
client.loadCommands("./src/commands");
20-
client.loadSlashCommands("./src/slash")
25+
client.loadSlashCommands("./src/slash");
26+
client.loadButtons("./src/buttons");
27+
client.loadSelectMenus("./src/selectmenus");
28+
client.loadContextMenus("./src/contextmenus");
29+
client.loadModals("./src/modals");
2130
client.loadEvents("./src/events", client, player);
2231
client.loadMusicEvents("./src/music", player);
2332
client.loadTopics("./data/trivia");
@@ -27,18 +36,19 @@ function init() {
2736
init();
2837

2938
if (botlist) {
30-
let {botlist} = require("./src/utils/botlist.js")
31-
botlist(client).then(() => {
32-
client.logger.info("Botlist updated!");
33-
}
34-
);
39+
let { botlist } = require("./src/utils/botlist.js");
40+
botlist(client).then(() => {
41+
client.logger.info("Botlist updated!");
42+
});
3543
}
3644

37-
38-
if(!(client.shard)) {
39-
const { index } = require("./src/utils/dashboard.js");
40-
index(client);
45+
if (!client.shard) {
46+
const { index } = require("./src/utils/dashboard.js");
47+
index(client).then(() => {
48+
client.logger.info("Dashboard initialized!");
49+
});
4150
}
4251

52+
global.__Client = client;
4353

4454
process.on("unhandledRejection", (err) => client.logger.error(err));

‎config-example.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"serverLogId": "Your_Server_Log_Channel_Id",
1111
"supportServerInvite": "Your_Support_Server_Invite",
1212
"mongodb_url": "Your_MongoDB_Url",
13-
"botStats":{
13+
"botStats": {
1414
"guilds_channel": "Your_Guilds_Channel_Stats_Bot",
1515
"users_channel": "Your_Users_Channel_Stats_Bot"
1616
},
@@ -30,4 +30,4 @@
3030
"osuapikey": "Osu_Api_Key"
3131
},
3232
"botlist": false
33-
}
33+
}

‎data/fake_data.json‎

Lines changed: 21002 additions & 1000 deletions
Large diffs are not rendered by default.

‎data/under_contruction.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module.exports = {
22
name: "under_construction",
33
run: async () => {
44
require("dotenv").config();
5-
const {Client} = require("Discord.js");
5+
const {Client} = require("discord.js");
66
global.__basedir = __dirname;
77

88
const client = new Client({
@@ -25,6 +25,6 @@ module.exports = {
2525
)
2626
});
2727

28-
client.login(process.env.TOKEN);
28+
await client.login(process.env.TOKEN);
2929
},
3030
};

0 commit comments

Comments
 (0)