warengroup/eximiabots-radiox
warengroup/eximiabots-radiox
1
0
Fork 0
mirror of https://github.com/warengroup/eximiabots-radiox.git synced 2024-09-19 01:01:14 +00:00
Code Issues Packages Releases Activity

Merge branch 'develop' into fix-33

Browse Source
This commit is contained in:
Christer Warén 2021-09-09 13:03:46 +03:00
commit e08c20aa3d
49 changed files with 186 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.dockerignore
View File

@ -4,4 +4,4 @@
datastore
Dockerfile
LICENSE
README.md
README.md

2
.env_example
View File

@ -1,2 +1,2 @@
DISCORD_TOKEN=
RADIOX_STATIONSLISTURL=https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json
RADIOX_STATIONSLISTURL=https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json

2
.github/dependabot.yml vendored
View File

@ -16,4 +16,4 @@ updates:
interval: "daily"
target-branch: "develop"
labels:
- "dependencies"
- "dependencies"

2
.github/labeler.yml vendored
View File

@ -4,4 +4,4 @@ dependencies:
documentation:
- README.md
- LICENSE
- .env_example
- .env_example

2
.github/workflows/docker-build.yml vendored
View File

@ -16,4 +16,4 @@ jobs:
with:
install: true
- name: Build
run: docker build . # will run buildx
run: docker build . # will run buildx

2
.github/workflows/labeler.yml vendored
View File

@ -14,4 +14,4 @@ jobs:
- uses: actions/labeler@v3
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
sync-labels: true
sync-labels: true

3
.gitignore vendored
View File

@ -1,6 +1,5 @@
datastore/
node_modules/
npm-debug.log
.vscode/
.env
build/
build/

6
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,6 @@
{
"files.trimTrailingWhitespace": true,
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"editor.renderFinalNewline": false
}

2
Dockerfile
View File

@ -14,4 +14,4 @@ RUN npm install
RUN npm run build
CMD [ "npm", "start" ]
CMD [ "npm", "start" ]

106
package-lock.json generated
View File

@ -13,7 +13,7 @@
"@discordjs/opus": "^0.6.0",
"@discordjs/rest": "^0.1.1-canary.0",
"@discordjs/voice": "^0.6.0",
"discord-api-types": "^0.22.0",
"discord-api-types": "^0.23.1",
"discord.js": "^13.1.0",
"dotenv": "^10.0.0",
"libsodium-wrappers": "^0.7.9",
@ -21,7 +21,7 @@
"path": "^0.12.7"
},
"devDependencies": {
"@types/node": "^16.7.13",
"@types/node": "^16.9.0",
"@types/ws": "^7.4.7",
"@typescript-eslint/eslint-plugin": "^4.31.0",
"@typescript-eslint/parser": "^4.31.0",
@ -180,6 +180,14 @@
"npm": ">=7.0.0"
}
},
"node_modules/@discordjs/builders/node_modules/discord-api-types": {
"version": "0.22.0",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
"integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg==",
"engines": {
"node": ">=12"
}
},
"node_modules/@discordjs/collection": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.2.1.tgz",
@ -259,6 +267,14 @@
"node": ">=16.0.0"
}
},
"node_modules/@discordjs/rest/node_modules/discord-api-types": {
"version": "0.22.0",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
"integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg==",
"engines": {
"node": ">=12"
}
},
"node_modules/@discordjs/rest/node_modules/node-fetch": {
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",
@ -297,6 +313,14 @@
"node": ">=12.0.0"
}
},
"node_modules/@discordjs/voice/node_modules/discord-api-types": {
"version": "0.22.0",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
"integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg==",
"engines": {
"node": ">=12"
}
},
"node_modules/@discordjs/voice/node_modules/node-addon-api": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
@ -476,9 +500,9 @@
"dev": true
},
"node_modules/@types/node": {
"version": "16.7.13",
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.13.tgz",
"integrity": "sha512-pLUPDn+YG3FYEt/pHI74HmnJOWzeR+tOIQzUx93pi9M7D8OE7PSLr97HboXwk5F+JS+TLtWuzCOW97AHjmOXXA=="
"version": "16.9.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.0.tgz",
"integrity": "sha512-nmP+VR4oT0pJUPFbKE4SXj3Yb4Q/kz3M9dSAO1GGMebRKWHQxLfDNmU/yh3xxCJha3N60nQ/JwXWwOE/ZSEVag=="
},
"node_modules/@types/ws": {
"version": "7.4.7",
@ -1309,9 +1333,9 @@
}
},
"node_modules/discord-api-types": {
"version": "0.22.0",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
"integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg==",
"version": "0.23.1",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.23.1.tgz",
"integrity": "sha512-igWmn+45mzXRWNEPU25I/pr8MwxHb767wAr51oy3VRLRcTlp5ADBbrBR0lq3SA1Rfw3MtM4TQu1xo3kxscfVdQ==",
"engines": {
"node": ">=12"
}
@ -1351,6 +1375,14 @@
"npm": ">=7.0.0"
}
},
"node_modules/discord.js/node_modules/discord-api-types": {
"version": "0.22.0",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
"integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg==",
"engines": {
"node": ">=12"
}
},
"node_modules/discord.js/node_modules/node-fetch": {
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",
@ -2897,9 +2929,9 @@
}
},
"node_modules/prettier": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz",
"integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==",
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz",
"integrity": "sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==",
"dev": true,
"bin": {
"prettier": "bin-prettier.js"
@ -3943,9 +3975,9 @@
}
},
"node_modules/ws": {
"version": "7.5.4",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.4.tgz",
"integrity": "sha512-zP9z6GXm6zC27YtspwH99T3qTG7bBFv2VIkeHstMLrLlDJuzA7tQ5ls3OJ1hOGGCzTQPniNJoHXIAOS0Jljohg==",
"version": "7.5.5",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
"integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
"engines": {
"node": ">=8.3.0"
},
@ -4096,6 +4128,13 @@
"ow": "^0.27.0",
"ts-mixer": "^6.0.0",
"tslib": "^2.3.1"
},
"dependencies": {
"discord-api-types": {
"version": "0.22.0",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
"integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg=="
}
}
},
"@discordjs/collection": {
@ -4160,6 +4199,11 @@
"tslib": "^2.3.0"
},
"dependencies": {
"discord-api-types": {
"version": "0.22.0",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
"integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg=="
},
"node-fetch": {
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",
@ -4190,6 +4234,11 @@
"node-addon-api": "^3.2.1"
}
},
"discord-api-types": {
"version": "0.22.0",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
"integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg=="
},
"node-addon-api": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
@ -4320,9 +4369,9 @@
"dev": true
},
"@types/node": {
"version": "16.7.13",
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.13.tgz",
"integrity": "sha512-pLUPDn+YG3FYEt/pHI74HmnJOWzeR+tOIQzUx93pi9M7D8OE7PSLr97HboXwk5F+JS+TLtWuzCOW97AHjmOXXA=="
"version": "16.9.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.0.tgz",
"integrity": "sha512-nmP+VR4oT0pJUPFbKE4SXj3Yb4Q/kz3M9dSAO1GGMebRKWHQxLfDNmU/yh3xxCJha3N60nQ/JwXWwOE/ZSEVag=="
},
"@types/ws": {
"version": "7.4.7",
@ -4918,9 +4967,9 @@
}
},
"discord-api-types": {
"version": "0.22.0",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
"integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg=="
"version": "0.23.1",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.23.1.tgz",
"integrity": "sha512-igWmn+45mzXRWNEPU25I/pr8MwxHb767wAr51oy3VRLRcTlp5ADBbrBR0lq3SA1Rfw3MtM4TQu1xo3kxscfVdQ=="
},
"discord.js": {
"version": "13.1.0",
@ -4949,6 +4998,11 @@
"tslib": "^2.3.0"
}
},
"discord-api-types": {
"version": "0.22.0",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
"integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg=="
},
"node-fetch": {
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",
@ -6123,9 +6177,9 @@
"dev": true
},
"prettier": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz",
"integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==",
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz",
"integrity": "sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==",
"dev": true
},
"prettier-linter-helpers": {
@ -6890,9 +6944,9 @@
}
},
"ws": {
"version": "7.5.4",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.4.tgz",
"integrity": "sha512-zP9z6GXm6zC27YtspwH99T3qTG7bBFv2VIkeHstMLrLlDJuzA7tQ5ls3OJ1hOGGCzTQPniNJoHXIAOS0Jljohg==",
"version": "7.5.5",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
"integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
"requires": {}
},
"xdg-basedir": {

6
package.json
View File

@ -22,7 +22,7 @@
"@discordjs/opus": "^0.6.0",
"@discordjs/rest": "^0.1.1-canary.0",
"@discordjs/voice": "^0.6.0",
"discord-api-types": "^0.22.0",
"discord-api-types": "^0.23.1",
"discord.js": "^13.1.0",
"dotenv": "^10.0.0",
"libsodium-wrappers": "^0.7.9",
@ -30,7 +30,7 @@
"path": "^0.12.7"
},
"devDependencies": {
"@types/node": "^16.7.13",
"@types/node": "^16.9.0",
"@types/ws": "^7.4.7",
"@typescript-eslint/eslint-plugin": "^4.31.0",
"@typescript-eslint/parser": "^4.31.0",
@ -48,4 +48,4 @@
"node": ">=16.8.0",
"npm": ">=7.0.0"
}
}
}

12
src/Client.ts
View File

@ -73,11 +73,11 @@ class RadioClient extends Client {
this.on("interactionCreate", interaction => {
require(`${events}interactionCreate`).execute(this, interaction);
});
this.on("voiceStateUpdate", (oldState, newState) => {
require(`${events}voiceStateUpdate`).execute(this, oldState, newState);
});
process.on('SIGINT', () => {
require(`${events}SIGINT`).execute(this);
});
@ -89,7 +89,11 @@ class RadioClient extends Client {
process.on('uncaughtException', (error) => {
require(`${events}uncaughtException`).execute(this, error);
});
process.on('exit', () => {
this.funcs.logger("Bot", "Stopping");
});
this.on("error", error => {
console.error(error);
});
@ -98,4 +102,4 @@ class RadioClient extends Client {
}
}
export default RadioClient
export default RadioClient

4
src/client/commands.js
View File

@ -15,7 +15,7 @@ module.exports = {
command.data = new SlashCommandBuilder()
.setName(command.name)
.setDescription(command.description);
command.data = command.data.toJSON();
if(command.options) {
command.options.forEach(function(option) {
@ -67,4 +67,4 @@ module.exports = {
}
})();
}
}
}

2
src/client/commands/bug.js
View File

@ -23,4 +23,4 @@ module.exports = {
ephemeral: true
});
}
};
};

2
src/client/commands/help.js
View File

@ -26,7 +26,7 @@ module.exports = {
.setDescription(message.helpDescription)
.setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
interaction.reply({
embeds: [embed],
ephemeral: true

2
src/client/commands/invite.js
View File

@ -19,4 +19,4 @@ module.exports = {
ephemeral: true
});
}
};
};

6
src/client/commands/list.js
View File

@ -13,9 +13,9 @@ module.exports = {
ephemeral: true
});
}
const radio = client.radio.get(interaction.guild.id);
if(radio){
client.funcs.listStations(client, interaction);
} else {
@ -39,4 +39,4 @@ module.exports = {
});
}
}
};
};

49
src/client/commands/maintenance.js
View File

@ -61,7 +61,7 @@ module.exports = {
value: "9"
}
);
const menu = new Discord.MessageActionRow()
.addComponents(
new Discord.MessageSelectMenu()
@ -85,7 +85,7 @@ module.exports = {
.setColor(client.config.embedColor)
.setDescription(options.find(option => option.value == action).label)
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
interaction.reply({
embeds: [embed],
ephemeral: true
@ -117,7 +117,7 @@ module.exports = {
client.stations = await fetch(client.config.stationslistUrl)
.then(client.funcs.checkFetchStatus)
.then(response => response.json());
client.funcs.logger('Stations', 'Successfully fetched list');
} catch (error) {
client.funcs.logger('Stations', 'Fetching list failed');
@ -133,46 +133,5 @@ module.exports = {
}
/*
if(!client.stations) {
message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
}
let currentRadios = client.radio.keys();
let radio = currentRadios.next();
let stoppedRadios = "";
client.user.setStatus('dnd');
while (!radio.done) {
let currentRadio = client.radio.get(radio.value);
currentRadio.guild = client.datastore.getEntry(radio.value).guild;
if(currentRadio){
client.funcs.statisticsUpdate(client, currentRadio.guild, currentRadio);
currentRadio.connection?.destroy();
currentRadio.audioPlayer?.stop();
currentRadio.message?.delete();
client.radio.delete(radio.value);
stoppedRadios += "-" + radio.value + ": " + currentRadio.guild.name + "\n";
}
radio = currentRadios.next();
}
const embed = new Discord.MessageEmbed()
.setTitle(client.messages.maintenanceTitle)
.setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["maintenance"].replace(/[^0-9]+/g, ''))
.setColor(client.config.embedColor)
.setDescription("Stopped all radios" + "\n" + stoppedRadios)
.setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
interaction.reply({
embeds: [embed],
ephemeral: true
});*/
}
};
};

6
src/client/commands/next.js
View File

@ -5,7 +5,7 @@ module.exports = {
async execute(interaction, client, command) {
if (client.funcs.check(client, interaction, command)) {
const radio = client.radio.get(interaction.guild.id);
let index = client.stations.findIndex(station => station.name == radio.station.name) + 1;
if(index == client.stations.length) index = 0;
@ -20,7 +20,7 @@ module.exports = {
client.funcs.statisticsUpdate(client, interaction.guild, radio);
radio.audioPlayer.stop();
let date = new Date();
radio.station = station;
radio.textChannel = interaction.channel;
@ -36,4 +36,4 @@ module.exports = {
}
}
}
}

4
src/client/commands/nowplaying.js
View File

@ -25,11 +25,11 @@ module.exports = {
.setDescription(message.nowplayingDescription)
.setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
interaction.reply({
embeds: [embed],
ephemeral: true
});
}
}
};
};

4
src/client/commands/play.js
View File

@ -90,7 +90,7 @@ module.exports = {
if (radio) {
client.funcs.statisticsUpdate(client, interaction.guild, radio);
radio.audioPlayer.stop();
let date = new Date();
radio.station = station;
radio.textChannel = interaction.channel;
@ -141,4 +141,4 @@ module.exports = {
});
}
}
};
};

6
src/client/commands/prev.js
View File

@ -20,12 +20,12 @@ module.exports = {
client.funcs.statisticsUpdate(client, interaction.guild, radio);
radio.audioPlayer.stop();
let date = new Date();
radio.station = station;
radio.textChannel = interaction.channel;
radio.startTime = date.getTime();
if(interaction.isCommand()) {
client.funcs.play(interaction, interaction.guild, client, url);
}
@ -36,4 +36,4 @@ module.exports = {
}
}
}
}

6
src/client/commands/statistics.js
View File

@ -11,7 +11,7 @@ module.exports = {
let currentGuild = client.datastore.getEntry(interaction.guild.id);
let global = client.datastore.getEntry("global");
let statistics = "";
if(!client.stations) {
message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
return interaction.reply({
@ -35,7 +35,7 @@ module.exports = {
}
});
}
const embed = new Discord.MessageEmbed()
.setTitle(client.messages.statisticsTitle)
.setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["statistics"].replace(/[^0-9]+/g, ''))
@ -49,4 +49,4 @@ module.exports = {
ephemeral: true
});
}
};
};

2
src/client/commands/status.js
View File

@ -28,4 +28,4 @@ module.exports = {
});
}
};
};

2
src/client/commands/stop.js
View File

@ -38,4 +38,4 @@ module.exports = {
});
}
}
};
};

20
src/client/datastore.js
View File

@ -6,7 +6,7 @@ module.exports = class {
this.map = new Map();
this.loadData();
}
loadData() {
const dir = path.join(path.dirname(__dirname), '../datastore');
if (!fs.existsSync(dir)) {
@ -33,7 +33,7 @@ module.exports = class {
var statistics = {};
if(!client.stations) return;
let calculation = guilds.next();
while (!calculation.done) {
@ -47,7 +47,7 @@ module.exports = class {
statistics[stations[station].name].time = 0;
statistics[stations[station].name].used = 0;
}
statistics[stations[station].name].time = parseInt(statistics[stations[station].name].time)+parseInt(currentGuild.statistics[stations[station].name].time);
statistics[stations[station].name].used = parseInt(statistics[stations[station].name].used)+parseInt(currentGuild.statistics[stations[station].name].used);
}
@ -84,26 +84,26 @@ module.exports = class {
this.map.set(id, newData);
this.saveEntry(id, newData);
}
getEntry(id){
return this.map.get(id);
}
updateEntry(guild, newData) {
newData.guild.name = guild.name;
let date = new Date();
newData.updated = date.toISOString().substring(0, 10)
this.map.set(guild.id, newData);
this.saveEntry(guild.id, newData);
//this.showEntry(this.getEntry(guild.id));
}
showEntry(data){
console.log(data);
}
createTestFile () {
let newData = {
"guild": {
@ -120,10 +120,10 @@ module.exports = class {
}
}
this.updateEntry(newData.guild, newData);
}
saveEntry(file, data) {
data = JSON.stringify(data, null, 4);

2
src/client/emojis.js
View File

@ -39,4 +39,4 @@ module.exports = {
}
}
}
}
}

8
src/client/events/SIGINT.js
View File

@ -3,16 +3,12 @@ module.exports = {
execute(client) {
client.user.setStatus('dnd');
console.log("\n");
client.funcs.logger("Bot", "Closing");
console.log("\n");
client.funcs.saveRadios(client);
setInterval(() => {
if(client.radio.size == 0){
process.exit();
}
}, 500);
}
}
}

2
src/client/events/SIGTERM.js
View File

@ -3,4 +3,4 @@ module.exports = {
execute(client) {
process.emit('SIGINT');
}
}
}

4
src/client/events/interactionCreate.js
View File

@ -4,7 +4,7 @@ module.exports = {
const permissions = interaction.channel.permissionsFor(interaction.client.user);
if (!permissions.has('VIEW_CHANNEL')) return;
if (!permissions.has('EMBED_LINKS')) return interaction.reply({
content: client.messages.noPermsEmbed,
ephemeral: true
@ -14,7 +14,7 @@ module.exports = {
const commandName = interaction.commandName;
const command = client.commands.get(commandName);
if (!command) return;
try {
command.execute(interaction, client);
} catch (error) {

6
src/client/events/messageCreate.js
View File

@ -16,7 +16,7 @@ module.exports = {
} else {
return;
}
const args = message.content.slice(prefix.length).split(' ');
if (!message.content.startsWith(prefix)) return;
if (!args[0]) return;
@ -30,7 +30,7 @@ module.exports = {
let newMessage = {};
newMessage.messageCommandsDeprecatedTitle = client.messages.messageCommandsDeprecatedTitle.replace("%client.user.username%", client.user.username);
const embed = new Discord.MessageEmbed()
.setTitle(newMessage.messageCommandsDeprecatedTitle)
.setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
@ -55,4 +55,4 @@ module.exports = {
console.error(error);
}
}
}
}

2
src/client/events/messageDelete.js
View File

@ -7,4 +7,4 @@ module.exports = {
if(msg.id != radio.message.id) return;
radio.message = null;
}
}
}

10
src/client/events/ready.js
View File

@ -22,7 +22,7 @@ module.exports = {
/*DEVELOPERS*/
client.funcs.logger('Developers');
client.developers = "";
let user = "";
for (let i = 0; i < client.config.devId.length; i++) {
@ -54,7 +54,7 @@ module.exports = {
client.funcs.logger('Stations', 'Fetching list failed');
console.error(error + "\n");
}
setInterval(async () => {
try {
client.funcs.logger('Stations', 'Started fetching list – ' + client.config.stationslistUrl);
@ -72,7 +72,7 @@ module.exports = {
if(!client.stations) {
client.user.setStatus('dnd');
}
/*GUILDS*/
client.funcs.logger('Guilds', 'Started fetching list');
@ -84,7 +84,7 @@ module.exports = {
console.log("\n");
client.funcs.logger('Guilds', 'Successfully fetched list');
/*STATISTICS*/
client.datastore.calculateGlobal(client);
@ -100,4 +100,4 @@ module.exports = {
}, 5000);
}
}
}

2
src/client/events/uncaughtException.js
View File

@ -4,4 +4,4 @@ module.exports = {
console.log(error.stack);
process.emit('SIGINT');
}
}
}

2
src/client/funcs/checkFetchStatus.js
View File

@ -4,4 +4,4 @@ module.exports = function (response) {
} else {
throw new Error(response.status + " " + response.statusText);
}
}
}

2
src/client/funcs/isDev.js
View File

@ -7,4 +7,4 @@ module.exports = function (devList, authorID){
}
});
return response;
}
}

2
src/client/funcs/listStations.js
View File

@ -30,4 +30,4 @@ module.exports = function (client, interaction){
components: [menu],
ephemeral: true
});
}
}

2
src/client/funcs/loadState.js
View File

@ -7,4 +7,4 @@ module.exports = function loadState(client, guild){
data.state = {};
client.datastore.updateEntry(guild, data);
return state;
}
}

2
src/client/funcs/logger.js
View File

@ -2,4 +2,4 @@ module.exports = function (area, text){
let date = new Date();
console.log('[' + area + '] – ' + date.toISOString());
if(text) console.log(text + '\n');
}
}

2
src/client/funcs/msToTime.js
View File

@ -9,4 +9,4 @@ module.exports = function msToTime(duration) {
: +hours > 0
? `${+hours < 10 ? `0${hours}` : hours}:${+minutes < 10 ? `0${minutes}` : minutes}:${+seconds < 10 ? `0${seconds}` : seconds}`
: `${+minutes < 10 ? `0${minutes}` : minutes}:${+seconds < 10 ? `0${seconds}` : seconds}`;
}
}

8
src/client/funcs/play.js
View File

@ -47,7 +47,7 @@ module.exports = async function play(interaction, guild, client, url) {
.addField(client.messages.nowplayingTitle, message.nowplayingDescription, true)
.setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
const buttons = new Discord.MessageActionRow()
.addComponents(
new Discord.MessageButton()
@ -87,10 +87,10 @@ module.exports = async function play(interaction, guild, client, url) {
}
message.play = client.messages.play.replace("%radio.station.name%", radio.station.name);
interaction?.reply({
content: client.messageEmojis["play"] + message.play,
ephemeral: true
});
}
}

4
src/client/funcs/restoreRadios.js
View File

@ -43,7 +43,7 @@ module.exports = async function restoreRadios(client, guilds) {
construct.connection = connection;
let date = new Date();
construct.startTime = date.getTime();
client.funcs.play(null, guild, client, url, Discord);
client.datastore.checkEntry(guild.id);
@ -59,4 +59,4 @@ module.exports = async function restoreRadios(client, guilds) {
console.log(error);
}
});
}
}

8
src/client/funcs/saveRadios.js
View File

@ -1,11 +1,11 @@
module.exports = function saveRadios(client) {
let currentRadios = client.radio.keys();
let radio = currentRadios.next();
while (!radio.done) {
let currentRadio = client.radio.get(radio.value);
currentRadio.guild = client.datastore.getEntry(radio.value).guild;
if (currentRadio) {
client.funcs.statisticsUpdate(client, currentRadio.guild, currentRadio);
client.funcs.saveState(client, currentRadio.guild, currentRadio);
@ -14,7 +14,7 @@ module.exports = function saveRadios(client) {
currentRadio.message?.delete();
client.radio.delete(radio.value);
}
radio = currentRadios.next();
}
}
}

4
src/client/funcs/saveState.js
View File

@ -1,6 +1,6 @@
module.exports = function saveState(client, guild, radio){
client.datastore.checkEntry(guild.id);
let date = new Date();
let data = client.datastore.getEntry(guild.id);
@ -15,4 +15,4 @@ module.exports = function saveState(client, guild, radio){
data.state.station.owner = radio.station.owner;
client.datastore.updateEntry(guild, data);
}
}

2
src/client/funcs/searchStation.js
View File

@ -59,4 +59,4 @@ module.exports = function searchStation(key, client) {
}
}
return highestProbabilityStation;
}
}

12
src/client/funcs/statisticsUpdate.js
View File

@ -1,22 +1,22 @@
module.exports = function statisticsUpdate(client, guild, radio) {
client.datastore.checkEntry(guild.id);
radio.datastore = client.datastore.getEntry(guild.id);
if(!radio.datastore.statistics[radio.station.name]){
radio.datastore.statistics[radio.station.name] = {};
radio.datastore.statistics[radio.station.name].time = 0;
radio.datastore.statistics[radio.station.name].used = 0;
client.datastore.updateEntry(guild, radio.datastore);
}
let date = new Date();
radio.currentTime = date.getTime();
radio.playTime = parseInt(radio.currentTime)-parseInt(radio.startTime);
radio.datastore.statistics[radio.station.name].time = parseInt(radio.datastore.statistics[radio.station.name].time)+parseInt(radio.playTime);
radio.datastore.statistics[radio.station.name].used = parseInt(radio.datastore.statistics[radio.station.name].used)+1;
client.datastore.updateEntry(guild, radio.datastore);
client.datastore.calculateGlobal(client);
}
}

2
src/client/messages.js
View File

@ -37,4 +37,4 @@ module.exports = {
errorStationURL: "Station can't be URL",
messageCommandsDeprecatedTitle: "%client.user.username%",
messageCommandsDeprecatedDescription: "We recommend you to reauthorize our bot by clicking the invite link down below, because Discord is planning to remove message content from verified bots [Read More](https://support-dev.discord.com/hc/en-us/articles/4404772028055)" + "\n\n" + "**Invite Bot**" + "\n" + "https://wgi.fi/radiox_invite" + "\n\n" + "This bot now supports slash commands, you should start using them instead. Type / into the message box and select the bot you wish to use. Remember to be careful as there are a few bugs here and there on Discord." + "\n\n" + "We will remove this deprecation message in March of 2022 when RadioX 1.0.0 is released."
};
};

2
src/client/utils/typings.ts
View File

@ -1,3 +1,3 @@
export interface command { }
export interface radio {}
export interface radio {}

2
src/config.js
View File

@ -23,4 +23,4 @@ module.exports = {
version: process.env.RADIOX_VERSION || process.env.npm_package_version,
debug: process.env.DEBUG_MODE || false
}
}