Compare commits

...

2 Commits

Author SHA1 Message Date
f07a6d9386 Merge branch 'main' of https://git.raphix.fr/subsonics/bot
All checks were successful
Subsonics - Pipeline/pipeline/head This commit looks good
2023-06-19 22:53:31 +02:00
5d64331479 Remove old discriminator 2023-06-19 22:53:12 +02:00
3 changed files with 23 additions and 20 deletions

View File

@ -82,4 +82,5 @@ module.exports = {
} }
} }
} }

View File

@ -30,11 +30,13 @@ function startDiscordBot() {
const { Manager } = require("erela.js") const { Manager } = require("erela.js")
const client = new Client({ const client = new Client({
intents:[GatewayIntentBits.Guilds, GatewayIntentBits.GuildVoiceStates, GatewayIntentBits.GuildMembers], intents:[GatewayIntentBits.Guilds, GatewayIntentBits.GuildVoiceStates, GatewayIntentBits.GuildMembers],
}) })
client.commands = new Collection() client.commands = new Collection()
client.dictator = false; client.dictator = false;
@ -260,7 +262,7 @@ function startServer(client) {
if(users.has(token)) { if(users.has(token)) {
log.server("Recherche avec les mots clés : " + value + " de musique de " + users.get(token).username + "#" + users.get(token).discriminator) log.server("Recherche avec les mots clés : " + value + " de musique de " + users.get(token).username)
find() find()
@ -301,7 +303,7 @@ function startServer(client) {
player.queue.add(songtrack.tracks[0]) player.queue.add(songtrack.tracks[0])
log.server("Lecture / Ajout du titre : " + songtrack.tracks[0].title + " de musique de " + users.get(token).username + "#" + users.get(token).discriminator) log.server("Lecture / Ajout du titre : " + songtrack.tracks[0].title + " de musique de " + users.get(token).username)
if(!player.playing) { if(!player.playing) {
@ -346,7 +348,7 @@ function startServer(client) {
if(users.has(token)) { if(users.has(token)) {
answer = true answer = true
log.server("Connexion au serveur par Token - SOCKET_ID : " + socket.id + " - DISCORD_USER : " + users.get(token).username + "#" + users.get(token).discriminator) log.server("Connexion au serveur par Token - SOCKET_ID : " + socket.id + " - DISCORD_USER : " + users.get(token).username)
actualize() actualize()
} }
@ -356,7 +358,7 @@ function startServer(client) {
socket.on("getState", (token) => { socket.on("getState", (token) => {
const data = { const data = {
"username":users.get(token).username + "#" + users.get(token).discriminator, "username":users.get(token).username,
"avatar": users.get(token).avatar, "avatar": users.get(token).avatar,
"id": users.get(token).id, "id": users.get(token).id,
} }
@ -373,7 +375,7 @@ function startServer(client) {
socket.on("play", (token) => { socket.on("play", (token) => {
if(users.has(token)) { if(users.has(token)) {
log.server("Mise en Play / Pause demandé par " + users.get(token).username + "#" + users.get(token).discriminator) log.server("Mise en Play / Pause demandé par " + users.get(token).username)
let player = client.manager.players.get("137291455336022018") let player = client.manager.players.get("137291455336022018")
@ -404,7 +406,7 @@ function startServer(client) {
if(users.has(token)) { if(users.has(token)) {
log.server("Avancement demandé par " + users.get(token).username + "#" + users.get(token).discriminator) log.server("Avancement demandé par " + users.get(token).username)
let player = client.manager.players.get("137291455336022018") let player = client.manager.players.get("137291455336022018")
@ -425,7 +427,7 @@ function startServer(client) {
if(users.has(token)) { if(users.has(token)) {
log.server("Changement de volume demandé par " + users.get(token).username + "#" + users.get(token).discriminator) log.server("Changement de volume demandé par " + users.get(token).username)
let player = client.manager.players.get("137291455336022018") let player = client.manager.players.get("137291455336022018")
@ -446,7 +448,7 @@ function startServer(client) {
if(users.has(token)) { if(users.has(token)) {
log.server("Clear liste demandé par " + users.get(token).username + "#" + users.get(token).discriminator) log.server("Clear liste demandé par " + users.get(token).username)
let player = client.manager.players.get("137291455336022018") let player = client.manager.players.get("137291455336022018")
@ -468,13 +470,13 @@ function startServer(client) {
const { EmbedBuilder } = require("discord.js") const { EmbedBuilder } = require("discord.js")
log.server("Bug report demandé par " + users.get(token).username + "#" + users.get(token).discriminator) log.server("Bug report demandé par " + users.get(token).username)
var embed = null var embed = null
if(report.type == "Bug") { if(report.type == "Bug") {
embed = new EmbedBuilder() embed = new EmbedBuilder()
.setColor(0xff0000) .setColor(0xff0000)
.setTitle('Bug report de ' + users.get(token).username + "#" + users.get(token).discriminator) .setTitle('Bug report de ' + users.get(token).username)
.setDescription('**Version **' + report.version) .setDescription('**Version **' + report.version)
.addFields({name: "Description", value: report.text}) .addFields({name: "Description", value: report.text})
.setTimestamp(); .setTimestamp();
@ -483,7 +485,7 @@ function startServer(client) {
} else { } else {
embed = new EmbedBuilder() embed = new EmbedBuilder()
.setColor(0x0000ff) .setColor(0x0000ff)
.setTitle('Suggestion de ' + users.get(token).username + "#" + users.get(token).discriminator) .setTitle('Suggestion de ' + users.get(token).username)
.setDescription('**Version **' + report.version) .setDescription('**Version **' + report.version)
.addFields({name: "Description", value: report.text}) .addFields({name: "Description", value: report.text})
.setTimestamp(); .setTimestamp();
@ -521,7 +523,7 @@ function startServer(client) {
if(player) { if(player) {
log.server("Supression (n°" + identifier + ") d'un morceau demandé par " + users.get(token).username + "#" + users.get(token).discriminator) log.server("Supression (n°" + identifier + ") d'un morceau demandé par " + users.get(token).username )
player.queue.remove(identifier) player.queue.remove(identifier)
@ -544,7 +546,7 @@ function startServer(client) {
if(player) { if(player) {
log.server("Déplacement (n°" + identifier + ") d'un morceau demandé par " + users.get(token).username + "#" + users.get(token).discriminator) log.server("Déplacement (n°" + identifier + ") d'un morceau demandé par " + users.get(token).username )
let elementToMove = player.queue[identifier]; let elementToMove = player.queue[identifier];
@ -567,7 +569,7 @@ function startServer(client) {
if(users.has(token)) { if(users.has(token)) {
log.server("Retour arrière demandé par " + users.get(token).username + "#" + users.get(token).discriminator) log.server("Retour arrière demandé par " + users.get(token).username)
let player = client.manager.players.get("137291455336022018") let player = client.manager.players.get("137291455336022018")
@ -595,7 +597,7 @@ function startServer(client) {
if(users.has(token)) { if(users.has(token)) {
log.server("Skip demandé par " + users.get(token).username + "#" + users.get(token).discriminator) log.server("Skip demandé par " + users.get(token).username)
let player = client.manager.players.get("137291455336022018") let player = client.manager.players.get("137291455336022018")
@ -626,7 +628,7 @@ function startServer(client) {
let player = client.manager.players.get("137291455336022018") let player = client.manager.players.get("137291455336022018")
log.server("Looping demandé par " + users.get(token).username + "#" + users.get(token).discriminator) log.server("Looping demandé par " + users.get(token).username)
if(player) { if(player) {
@ -653,7 +655,7 @@ function startServer(client) {
if(users.has(token)) { if(users.has(token)) {
log.server("Skip demandé par " + users.get(token).username + "#" + users.get(token).discriminator) log.server("Skip demandé par " + users.get(token).username)
let player = client.manager.players.get("137291455336022018") let player = client.manager.players.get("137291455336022018")
@ -675,7 +677,7 @@ function startServer(client) {
if(users.has(token)) { if(users.has(token)) {
log.server("Restart demandé par " + users.get(token).username + "#" + users.get(token).discriminator) log.server("Restart demandé par " + users.get(token).username)
let player = client.manager.players.get("137291455336022018") let player = client.manager.players.get("137291455336022018")
@ -987,7 +989,7 @@ function startServer(client) {
log.server("Discord Auth : [IDENTITE] : Nouvelle identité - SOCKET_ID : " + socket.id + " - DISCORD_USER : " + response.username + "#" + response.discriminator) log.server("Discord Auth : [IDENTITE] : Nouvelle identité - SOCKET_ID : " + socket.id + " - DISCORD_USER : " + response.username)
const tokens = require(__dirname + path.sep + "tokens.json") const tokens = require(__dirname + path.sep + "tokens.json")