Fix duplication WS Twitch + types

This commit is contained in:
Angels-dev
2025-01-04 17:21:49 +01:00
parent 6e29e7c8e4
commit 5af815d99f
6 changed files with 6524 additions and 4604 deletions

View File

@@ -175,7 +175,7 @@ export default {
.setColor(interaction.guild?.members.me?.displayColor || '#ffc370')
.setTimestamp()
.setFields(fields)
return await interaction.channel?.send({ embeds: [embed] })
return await interaction.followUp({ embeds: [embed] })
})
}
else if (result.status === 'fail') return await interaction.followUp(failMsg(result.data as unknown as FailMsgData))

View File

@@ -1,5 +1,6 @@
import { Events, Client, ActivityType } from 'discord.js'
import { YoutubeiExtractor } from "discord-player-youtubei"
import { SpotifyExtractor } from '@discord-player/extractor'
import { YoutubeiExtractor } from 'discord-player-youtubei'
import { useMainPlayer } from 'discord-player'
import { connect } from 'mongoose'
import WebSocket from 'websocket'
@@ -19,7 +20,7 @@ export default {
console.log(chalk.blue(`[DiscordJS] Connected to Discord ! Logged in as ${client.user?.tag ?? 'unknown'}`))
client.user?.setActivity('some bangers...', { type: ActivityType.Listening })
await useMainPlayer().extractors.loadDefault(ext => ext === 'SpotifyExtractor').then(() => console.log(chalk.blue('[Discord-Player] Spotify extractor loaded.'))).catch(console.error)
await useMainPlayer().extractors.register(SpotifyExtractor, {}).then(() => console.log(chalk.blue('[Discord-Player] Spotify extractor loaded.'))).catch(console.error)
await useMainPlayer().extractors.register(YoutubeiExtractor, {}).then(() => console.log(chalk.blue('[Discord-Player] Youtube extractor loaded.'))).catch(console.error)
let mongo_url = `mongodb://${process.env.MONGOOSE_USER}:${process.env.MONGOOSE_PASSWORD}@${process.env.MONGOOSE_HOST}/${process.env.MONGOOSE_DATABASE}`
@@ -54,9 +55,17 @@ export default {
}, 30000)
// TWITCH EVENTSUB
if (process.env['TWITCH_RUNNING_' + guild.id]) return console.log(chalk.magenta(`[Twitch] {${guild.name}} Already running...`))
console.log(chalk.magenta(`[Twitch] {${guild.name}} Not running, starting...`))
process.env['TWITCH_RUNNING_' + guild.id] = 'true'
let client_id = process.env.TWITCH_APP_ID as string
let client_secret = process.env.TWITCH_APP_SECRET as string
if (!client_id || !client_secret) return console.log(chalk.magenta(`[Twitch] {${guild.name}} App ID or Secret is not defined !`))
let dbData = guildProfile.get('guildTwitch')
if (!dbData?.enabled) return console.log(chalk.magenta(`[Twitch] {${guild.name}} Module is disabled, please activate with \`/database edit guildTwitch.enabled True\` !`))
let twitch = new WebSocket.client().on('connect', async connection => {
console.log(chalk.magenta(`[Twitch] {${guild.name}} EventSub WebSocket Connected !`))
@@ -102,10 +111,7 @@ export default {
})
}).on('connectFailed', error => console.error(chalk.magenta(`[Twitch] {${guild.name}} ` + error)))
let dbData = guildProfile.get('guildTwitch')
if (!dbData?.enabled) return console.log(chalk.magenta(`[Twitch] {${guild.name}} Module is disabled for "${guild?.name}", please activate with \`/database edit guildTwitch.enabled True\` !`))
else if (!client_id || !client_secret) return console.log(chalk.magenta(`[Twitch] {${guild.name}} App ID or Secret is not defined !`))
else twitch.connect('wss://eventsub.wss.twitch.tv/ws')
twitch.connect('wss://eventsub.wss.twitch.tv/ws')
})
}
}

View File

@@ -8,8 +8,8 @@ import 'dotenv/config'
// CUSTOM TYPES
interface CConnection extends Connection {
once: (event: string, listener: (...args: unknown[]) => void) => void
on: (event: string, listener: (...args: unknown[]) => void) => void
once: (event: string, listener: (...args: unknown[]) => void) => this
on: (event: string, listener: (...args: unknown[]) => void) => this
}
interface Command {
name: string

View File

@@ -130,7 +130,7 @@ export async function notification (client_id: string, client_secret: string, ch
.setImage(stream_data.thumbnail_url.replace('{width}', '1920').replace('{height}', '1080'))
.setTimestamp()
let hidden = hyperlink('démarre un live', 'https://www.youtube.com/watch?v=dQw4w9WgXcQ&pp=ygUJcmljayByb2xs')
let message = await liveChannel.send({ content: `Hey ! <@${dbData.liveBroadcasterId}> ${hidden} sur **Twitch**, venez !`, embeds: [embed] })
let message = await liveChannel.send({ content: `Hey @everyone ! <@${dbData.liveBroadcasterId}> ${hidden} sur **Twitch**, venez !`, embeds: [embed] })
dbData.liveMessageId = message.id
guildProfile.set('guildTwitch', dbData)
@@ -167,7 +167,7 @@ export async function notification (client_id: string, client_secret: string, ch
.setAuthor({ name: `⚫ C'EST FINI, LE LIVE A DURÉ ${duration_string} ! 📼`, iconURL: user_profile_image_url })
.setTimestamp()
message.edit({ content: `Re !\n<@${dbData.liveBroadcasterId}> a terminé son live sur **Twitch** !`, embeds: [embed] }).catch(console.error)
message.edit({ content: `Re @everyone !\n<@${dbData.liveBroadcasterId}> a terminé son live sur **Twitch** !`, embeds: [embed] }).catch(console.error)
clearInterval(liveMessageInterval)
}
}