Skip to content

Commit

Permalink
fix: resolve new username discriminators (#7)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThatGuyJacobee
ThatGuyJacobee committed Sep 23, 2023
1 parent faa3e25 commit 1b563c1
Show file tree
Hide file tree
Showing 20 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion commands/music/audiofilter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ module.exports = {
.setTitle(`Audio filter toggled 🎵`)
.setDescription(`The **${filter}** audio filter has been ${queue.filters.ffmpeg.getFiltersEnabled().includes(filter) ? 'Disabled' : 'Enabled'}!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

try {
queue.filters.ffmpeg.toggle(filter);
Expand Down
2 changes: 1 addition & 1 deletion commands/music/back.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = {
.setTitle(`Playing previous song ⏮️`)
.setDescription(`Returning next to the previous song ${previousTracks[0].title} ${previousTracks[0].queryType != 'arbitrary' ? `([Link](${previousTracks[0].url}))` : ''}!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

try {
queue.history.back();
Expand Down
2 changes: 1 addition & 1 deletion commands/music/clearqueue.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module.exports = {
.setTitle(`Queue clear 🧹`)
.setDescription(`The entire music queue has been cleared!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

try {
queue.tracks.clear();
Expand Down
2 changes: 1 addition & 1 deletion commands/music/jumpqueue.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ module.exports = {
.setTitle(`Jumped to song ⏭️`)
.setDescription(`Now playing: ${queuedTracks[trackIndex].title} ${queuedTracks[trackIndex].queryType != 'arbitrary' ? `([Link](${queuedTracks[trackIndex].url}))` : ''}!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

try {
queue.node.jump(trackIndex);
Expand Down
2 changes: 1 addition & 1 deletion commands/music/loop.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ module.exports = {
.setTitle(mode)
.setDescription(`The loop mode has been set to ${modename}!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

try {
queue.setRepeatMode(loopmode);
Expand Down
2 changes: 1 addition & 1 deletion commands/music/nowplaying.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = {
.setTimestamp()

if (queue.currentTrack.requestedBy != null) {
npembed.setFooter({ text: `Requested by: ${interaction.user.tag}` })
npembed.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })
}

var finalComponents = [
Expand Down
2 changes: 1 addition & 1 deletion commands/music/pause.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = {
.setTitle(`Song paused ⏸️`)
.setDescription(`Playback has been **${checkPause ? 'resumed' : 'paused'}**. Currently playing ${queue.currentTrack.title} ${queue.currentTrack.queryType != 'arbitrary' ? `([Link](${queue.currentTrack.url}))` : ''}!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

try {
queue.node.setPaused(!queue.node.isPaused());
Expand Down
18 changes: 9 additions & 9 deletions commands/music/play.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ module.exports = {
.addFields(foundItems)
.setColor(client.config.embedColour)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

interaction.followUp({ embeds: [searchembed], components: [actionmenu] })
}
Expand Down Expand Up @@ -139,7 +139,7 @@ module.exports = {
.setTitle(`Started playback ▶️`)
.setDescription(`Imported the **${search.tracks[0].playlist.title} ([Link](${search.tracks[0].playlist.url})) playlist** with **${search.tracks.length}** songs and started to play the queue!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

interaction.followUp({ embeds: [playlistembed] })
}
Expand All @@ -152,7 +152,7 @@ module.exports = {
.setTitle(`Started playback ▶️`)
.setDescription(`Began playing the song **${search.tracks[0].title}** ${search.tracks[0].queryType != 'arbitrary' ? `([Link](${search.tracks[0].url}))` : ''}!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

interaction.followUp({ embeds: [playsongembed] })
}
Expand All @@ -167,7 +167,7 @@ module.exports = {
.setTitle(`Added to queue ⏱️`)
.setDescription(`Imported the **${search.tracks[0].playlist.title} ([Link](${search.tracks[0].playlist.url})) playlist** with **${search.tracks.length}** songs!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

interaction.followUp({ embeds: [queueplaylistembed] })
}
Expand All @@ -180,7 +180,7 @@ module.exports = {
.setTitle(`Added to queue ⏱️`)
.setDescription(`Began playing the song **${search.tracks[0].title}** ${search.tracks[0].queryType != 'arbitrary' ? `([Link](${search.tracks[0].url}))` : ''}!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

interaction.followUp({ embeds: [queuesongembed] })
}
Expand Down Expand Up @@ -270,7 +270,7 @@ client.on('interactionCreate', async (interaction) => {
.setTitle(`Started playback ▶️`)
.setDescription(`Imported the **${search.tracks[0].playlist.title} ([Link](${search.tracks[0].playlist.url})) playlist** with **${search.tracks.length}** songs and started to play the queue!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

var sourceMessage = interaction.message
sourceMessage.edit({embeds: sourceMessage.embeds, components: []})
Expand All @@ -285,7 +285,7 @@ client.on('interactionCreate', async (interaction) => {
.setTitle(`Started playback ▶️`)
.setDescription(`Began playing the song **${search.tracks[0].title}** ${search.tracks[0].queryType != 'arbitrary' ? `([Link](${search.tracks[0].url}))` : ''}!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

var sourceMessage = interaction.message
sourceMessage.edit({embeds: sourceMessage.embeds, components: []})
Expand All @@ -302,7 +302,7 @@ client.on('interactionCreate', async (interaction) => {
.setTitle(`Added to queue ⏱️`)
.setDescription(`Imported the **${search.tracks[0].playlist.title} ([Link](${search.tracks[0].playlist.url})) playlist** with **${search.tracks.length}** songs!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

var sourceMessage = interaction.message
sourceMessage.edit({embeds: sourceMessage.embeds, components: []})
Expand All @@ -317,7 +317,7 @@ client.on('interactionCreate', async (interaction) => {
.setTitle(`Added to queue ⏱️`)
.setDescription(`Began playing the song **${search.tracks[0].title}** ${search.tracks[0].queryType != 'arbitrary' ? `([Link](${search.tracks[0].url}))` : ''}!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

var sourceMessage = interaction.message
sourceMessage.edit({embeds: sourceMessage.embeds, components: []})
Expand Down
2 changes: 1 addition & 1 deletion commands/music/playnext.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ module.exports = {
.setTitle(`Added to the top of the queue ⏱️`)
.setDescription(`Added song **${search.tracks[0].title}** ${search.tracks[0].queryType != 'arbitrary' ? `([Link](${search.tracks[0].url}))` : ''} to the top of the queue (playing next)!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

interaction.followUp({ embeds: [playsongembed] })
}
Expand Down
20 changes: 10 additions & 10 deletions commands/music/plex.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ module.exports = {
.addFields(foundItems)
.setColor(client.config.embedColour)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

interaction.followUp({ embeds: [searchembed], components: [actionmenu] })
}
Expand Down Expand Up @@ -227,7 +227,7 @@ module.exports = {
.setTitle(`Started playback ▶️`)
.setDescription(`Imported the **${searchRes.MediaContainer.title} playlist** with **${searchRes.MediaContainer.size}** songs and started to play the queue!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

interaction.followUp({ embeds: [playsongembed], files: [coverImage] })
}
Expand All @@ -240,7 +240,7 @@ module.exports = {
.setTitle(`Started playback ▶️`)
.setDescription(`Began playing the song **${newTrack.title}**!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

interaction.followUp({ embeds: [playsongembed], files: [coverImage] })
}
Expand All @@ -255,7 +255,7 @@ module.exports = {
.setTitle(`Added to queue ⏱️`)
.setDescription(`Imported the **${searchRes.MediaContainer.title} playlist** with **${searchRes.MediaContainer.size}** songs!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

interaction.followUp({ embeds: [queuesongembed], files: [coverImage] })
}
Expand All @@ -268,7 +268,7 @@ module.exports = {
.setTitle(`Added to queue ⏱️`)
.setDescription(`Added song **${newTrack.title}** to the queue!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

interaction.followUp({ embeds: [queuesongembed], files: [coverImage] })
}
Expand Down Expand Up @@ -345,7 +345,7 @@ module.exports = {
.addFields(foundItems)
.setColor(client.config.embedColour)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

interaction.followUp({ embeds: [searchembed], components: [actionmenu] })
}
Expand Down Expand Up @@ -500,7 +500,7 @@ client.on('interactionCreate', async (interaction) => {
.setTitle(`Started playback ▶️`)
.setDescription(`Imported the **${searchRes.MediaContainer.title} playlist** with **${searchRes.MediaContainer.size}** songs and started to play the queue!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

var sourceMessage = interaction.message
sourceMessage.edit({embeds: sourceMessage.embeds, components: []})
Expand All @@ -515,7 +515,7 @@ client.on('interactionCreate', async (interaction) => {
.setTitle(`Started playback ▶️`)
.setDescription(`Began playing the song **${songFound.title}**!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

var sourceMessage = interaction.message
sourceMessage.edit({embeds: sourceMessage.embeds, components: []})
Expand All @@ -532,7 +532,7 @@ client.on('interactionCreate', async (interaction) => {
.setTitle(`Added to queue ⏱️`)
.setDescription(`Imported the **${searchRes.MediaContainer.title} playlist** with **${searchRes.MediaContainer.size}** songs!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

var sourceMessage = interaction.message
sourceMessage.edit({embeds: sourceMessage.embeds, components: []})
Expand All @@ -547,7 +547,7 @@ client.on('interactionCreate', async (interaction) => {
.setTitle(`Added to queue ⏱️`)
.setDescription(`Added song **${songFound.title}** to the queue!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

var sourceMessage = interaction.message
sourceMessage.edit({embeds: sourceMessage.embeds, components: []})
Expand Down
4 changes: 2 additions & 2 deletions commands/music/queue.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = {
.setColor(client.config.embedColour)
.setTitle(`Current Music Queue 🎵`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

var curPage = 1;
var i = (curPage * 10) - 10;
Expand Down Expand Up @@ -110,7 +110,7 @@ module.exports = {
}

queueembed.addFields(curTracks)
queueembed.setFooter({ text: `Requested by: ${interaction.user.tag} - Page ${curPage}` })
queueembed.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username} - Page ${curPage}` })
interaction.editReply({ embeds: [queueembed] })
buttonResponse.deferUpdate()
})
Expand Down
4 changes: 2 additions & 2 deletions commands/music/queuehistory.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module.exports = {
//.setDescription(`${musiclist.join('\n')}${queue.previousTracks.length > (pageStart * -1) ? `\n...and ${(queue.previousTracks.length + pageStart)} more track(s)` : ''}`)
//.addField('Now Playing ▶️', `**${currentMusic.title}** | ([Link](${currentMusic.url}))`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

var curPage = 1;
var i = (curPage * 10) - 10;
Expand Down Expand Up @@ -112,7 +112,7 @@ module.exports = {
}

queueembed.addFields(curTracks)
queueembed.setFooter({ text: `Requested by: ${interaction.user.tag} - Page ${curPage}` })
queueembed.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username} - Page ${curPage}` })
interaction.editReply({ embeds: [queueembed] })
buttonResponse.deferUpdate()
})
Expand Down
2 changes: 1 addition & 1 deletion commands/music/remove.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ module.exports = {
.setTitle(`Song removed ❌`)
.setDescription(`Removed track ${queuedTracks[removeamount-1].title} ${queuedTracks[removeamount-1].queryType != 'arbitrary' ? `([Link](${queuedTracks[removeamount-1].url}))` : ''} from the queue!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

try {
queue.removeTrack(removeamount-1)
Expand Down
2 changes: 1 addition & 1 deletion commands/music/seek.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module.exports = {
.setTitle(`Seek song ↪️`)
.setDescription(`Seeked the current song to ${ms(removeamount)}! Currently playing ${queue.currentTrack.title} ${queue.currentTrack.queryType != 'arbitrary' ? `([Link](${queue.currentTrack.url}))` : ''}.`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

try {
queue.node.seek(removeamount);
Expand Down
2 changes: 1 addition & 1 deletion commands/music/shuffle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module.exports = {
.setTitle(`Queue shuffle 🔀`)
.setDescription(`The entire music queue has been shuffled!`)
.setTimestamp()
.setFooter({ text: `Requested by: ${interaction.user.tag}` })
.setFooter({ text: `Requested by: ${interaction.user.discriminator != 0 ? interaction.user.tag : interaction.user.username}` })

try {
queue.tracks.shuffle();
Expand Down
Loading

0 comments on commit 1b563c1

Please sign in to comment.