Skip to content

Commit

Permalink
refactor(embeds): 馃懡 use objects for header & footer
Browse files Browse the repository at this point in the history 
discordjs/discord.js#7153
  • Loading branch information
@Lioness100
Lioness100 committed Jan 7, 2022
1 parent 15fb68d commit 4a71a31
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 96 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -45,7 +45,7 @@
"@skyra/jaro-winkler": "^1.0.0",
"colorette": "^2.0.16",
"discord-api-types": "^0.25.2",
"discord.js": "^13.3.1",
"discord.js": "^13.5.0",
"dotenv": "^10.0.0",
"envalid": "^7.2.2",
"fuse.js": "^6.5.0",
Expand Down
11 changes: 7 additions & 4 deletions src/lib/structures/game/Game.ts
View file
Expand Up @@ -108,9 +108,12 @@ export class Game {
: `song ${italic(this.acceptedAnswer === AcceptedAnswer.Both ? 'and' : 'or')} artist`;

const embed = createEmbed(`The game has begun! You have ${inlineCode('30')} seconds to guess the name of the ${answerType} name`)
.setAuthor(`Hosted by ${this.hostUser.tag}`, this.hostUser.displayAvatarURL({ size: 128, dynamic: true }))
.setTitle(`馃幎 Playing the playlist "${this.playlistName}"`)
.setFooter(this.goal ? `Playing to ${this.goal} points` : '');
.setAuthor({ name: `Hosted by ${this.hostUser.tag}`, iconURL: this.hostUser.displayAvatarURL({ size: 128, dynamic: true }) })
.setTitle(`馃幎 Playing the playlist "${this.playlistName}"`);

if (this.goal) {
embed.setFooter({ text: `Playing to ${this.goal} points` });
}

await interaction.reply({ embeds: [embed] });
return this.queue.next();
Expand Down Expand Up @@ -164,7 +167,7 @@ export class Game {
.addField('Time Elapsed', timeElapsed, true)
.addField('Tracks Played', inlineCode(this.queue.tracksPlayed.toString()), true)
.addField('Leaderboard (Top 10)', this.leaderboard.compute())
.setFooter('Nice job! Play again sometime :)');
.setFooter({ text: 'Nice job! Play again sometime :)' });

await this.textChannel.send({ embeds: [embed] });
}
Expand Down
2 changes: 1 addition & 1 deletion src/listeners/audio/trackEnd.ts
View file
Expand Up @@ -45,7 +45,7 @@ export class UserAudioListener extends Listener {
const embed = createEmbed(guesser ? `${guesser} guessed it! 馃帀` : 'Nobody got it! 馃檨', BrandingColors.Secondary)
.setTitle(`That was "${title}" by ${author}`)
.addField('Leaderboard', game.leaderboard.compute())
.setFooter(footerText);
.setFooter({ text: footerText });

await game.textChannel.send({ embeds: [embed] });

Expand Down
135 changes: 45 additions & 90 deletions yarn.lock
View file
Expand Up @@ -728,16 +728,16 @@ __metadata:
languageName: node
linkType: hard

"@discordjs/builders@npm:^0.8.1":
version: 0.8.2
resolution: "@discordjs/builders@npm:0.8.2"
"@discordjs/builders@npm:^0.11.0":
version: 0.11.0
resolution: "@discordjs/builders@npm:0.11.0"
dependencies:
"@sindresorhus/is": ^4.2.0
discord-api-types: ^0.24.0
ow: ^0.27.0
discord-api-types: ^0.26.0
ts-mixer: ^6.0.0
tslib: ^2.3.1
checksum: 6c2f6ee427b0f577ad8b7dd4e4bbaf15c4083385bef983243b9223f68dd7c02715a8fc40aac1b943e667bbba4e262f0c776ae5bc3b0c24bd2faf3eac9c89a58c
zod: ^3.11.6
checksum: 7a25b59bb52d2e3695bca27946a99cf2de95b7edd5be424ea9f4707a465524be21263e25e532e12438e99f9f55fb98b033885c760aeb96424b8c12f663f50760
languageName: node
linkType: hard

Expand All @@ -748,14 +748,10 @@ __metadata:
languageName: node
linkType: hard

"@discordjs/form-data@npm:^3.0.1":
version: 3.0.1
resolution: "@discordjs/form-data@npm:3.0.1"
dependencies:
asynckit: ^0.4.0
combined-stream: ^1.0.8
mime-types: ^2.1.12
checksum: 2b431b1a14f8ac521e1c13567856cef7e61e05aafe2721e03d9e074bb7e5f45c89fc123b126964943edf301ec612d04515dcf068ea9773a2e30a99a844c00603
"@discordjs/collection@npm:^0.4.0":
version: 0.4.0
resolution: "@discordjs/collection@npm:0.4.0"
checksum: fa8fc4246921f3230eb6c5d6d4dc0caf9dd659fcc903175944edf4fb0a9ed9913fdf164733d3f1e644ef469bc79b0d38a526ee620b92169cb40e79b40b0c716b
languageName: node
linkType: hard

Expand Down Expand Up @@ -1298,7 +1294,7 @@ __metadata:
languageName: node
linkType: hard

"@sapphire/async-queue@npm:^1.1.8":
"@sapphire/async-queue@npm:^1.1.9":
version: 1.1.9
resolution: "@sapphire/async-queue@npm:1.1.9"
checksum: 8a4cb79e01948ee9f99f47e9fdfdfd509353d267f9e18bb8fe8e813b5d45f1fb6de08297b4557eb9a76b95bea59abaab67819175238068cc4cbc808d1d183e9d
Expand Down Expand Up @@ -1451,7 +1447,7 @@ __metadata:
languageName: node
linkType: hard

"@sindresorhus/is@npm:^4.0.1, @sindresorhus/is@npm:^4.2.0":
"@sindresorhus/is@npm:^4.2.0":
version: 4.2.0
resolution: "@sindresorhus/is@npm:4.2.0"
checksum: 59040dfb75c2eb6ab76e8c7ac10b7f7f6ba740f0b5ac618a89a8bcdbaf923836a8e998078d59d81f6f13f4b6bbe15bfe1bca962c877edcbe9160d1c100c56fd7
Expand Down Expand Up @@ -1676,7 +1672,7 @@ __metadata:
languageName: node
linkType: hard

"@types/ws@npm:^8.2.0":
"@types/ws@npm:^8.2.2":
version: 8.2.2
resolution: "@types/ws@npm:8.2.2"
dependencies:
Expand Down Expand Up @@ -2202,7 +2198,7 @@ __metadata:
"@typescript-eslint/parser": ^5.8.0
colorette: ^2.0.16
discord-api-types: ^0.25.2
discord.js: ^13.3.1
discord.js: ^13.5.0
dotenv: ^10.0.0
envalid: ^7.2.2
esbuild-jest: ^0.5.0
Expand Down Expand Up @@ -2729,7 +2725,7 @@ __metadata:
languageName: node
linkType: hard

"callsites@npm:^3.0.0, callsites@npm:^3.1.0":
"callsites@npm:^3.0.0":
version: 3.1.0
resolution: "callsites@npm:3.1.0"
checksum: 072d17b6abb459c2ba96598918b55868af677154bec7e73d222ef95a8fdb9bbf7dae96a8421085cdad8cd190d86653b5b6dc55a4484f2e5b2e27d5e0c3fc15b3
Expand Down Expand Up @@ -3474,20 +3470,27 @@ __metadata:
languageName: node
linkType: hard

"discord.js@npm:^13.3.1":
version: 13.3.1
resolution: "discord.js@npm:13.3.1"
"discord-api-types@npm:^0.26.0":
version: 0.26.1
resolution: "discord-api-types@npm:0.26.1"
checksum: e53bfa7589b24108e6b403dbe213da34c4592f72e2b8fde6800dcb6c703065887ecbd644e1cdf694e4c7796954bc51462ced868f26ec45dc1e0dc4fa8d3c723c
languageName: node
linkType: hard

"discord.js@npm:^13.5.0":
version: 13.5.0
resolution: "discord.js@npm:13.5.0"
dependencies:
"@discordjs/builders": ^0.8.1
"@discordjs/collection": ^0.3.2
"@discordjs/form-data": ^3.0.1
"@sapphire/async-queue": ^1.1.8
"@discordjs/builders": ^0.11.0
"@discordjs/collection": ^0.4.0
"@sapphire/async-queue": ^1.1.9
"@types/node-fetch": ^2.5.12
"@types/ws": ^8.2.0
discord-api-types: ^0.24.0
"@types/ws": ^8.2.2
discord-api-types: ^0.26.0
form-data: ^4.0.0
node-fetch: ^2.6.1
ws: ^8.2.3
checksum: 944f03467063bde6be095f6953c9feea252aa37569c6776c59b964956d9643741bb561f1036ee7dedf385954567dce8a3cd3069772c6739de178dea0c4392bfb
ws: ^8.4.0
checksum: 2c4e38b94ef2f19b8d63829cae753fac27e4aba06599871977499f04bb7384f03dbd158562967c624918a183396b592ef9d6c63c3c5e65e76eb4c62f398daaf0
languageName: node
linkType: hard

Expand Down Expand Up @@ -3518,15 +3521,6 @@ __metadata:
languageName: node
linkType: hard

"dot-prop@npm:^6.0.1":
version: 6.0.1
resolution: "dot-prop@npm:6.0.1"
dependencies:
is-obj: ^2.0.0
checksum: 0f47600a4b93e1dc37261da4e6909652c008832a5d3684b5bf9a9a0d3f4c67ea949a86dceed9b72f5733ed8e8e6383cc5958df3bbd0799ee317fd181f2ece700
languageName: node
linkType: hard

"dotenv@npm:10.0.0, dotenv@npm:^10.0.0":
version: 10.0.0
resolution: "dotenv@npm:10.0.0"
Expand Down Expand Up @@ -4496,6 +4490,17 @@ __metadata:
languageName: node
linkType: hard

"form-data@npm:^4.0.0":
version: 4.0.0
resolution: "form-data@npm:4.0.0"
dependencies:
asynckit: ^0.4.0
combined-stream: ^1.0.8
mime-types: ^2.1.12
checksum: 01135bf8675f9d5c61ff18e2e2932f719ca4de964e3be90ef4c36aacfc7b9cb2fceb5eca0b7e0190e3383fe51c5b37f4cb80b62ca06a99aaabfcfd6ac7c9328c
languageName: node
linkType: hard

"fragment-cache@npm:^0.2.1":
version: 0.2.1
resolution: "fragment-cache@npm:0.2.1"
Expand Down Expand Up @@ -6542,13 +6547,6 @@ __metadata:
languageName: node
linkType: hard

"lodash.isequal@npm:^4.5.0":
version: 4.5.0
resolution: "lodash.isequal@npm:4.5.0"
checksum: da27515dc5230eb1140ba65ff8de3613649620e8656b19a6270afe4866b7bd461d9ba2ac8a48dcc57f7adac4ee80e1de9f965d89d4d81a0ad52bb3eec2609644
languageName: node
linkType: hard

"lodash.memoize@npm:4.x":
version: 4.1.2
resolution: "lodash.memoize@npm:4.1.2"
Expand Down Expand Up @@ -7382,20 +7380,6 @@ __metadata:
languageName: node
linkType: hard

"ow@npm:^0.27.0":
version: 0.27.0
resolution: "ow@npm:0.27.0"
dependencies:
"@sindresorhus/is": ^4.0.1
callsites: ^3.1.0
dot-prop: ^6.0.1
lodash.isequal: ^4.5.0
type-fest: ^1.2.1
vali-date: ^1.0.0
checksum: bffd6fa43d004163bab9821fae4d2eceee92d70059ba2a5dca1ad7497cd167554224a7efab3d41476112fbab4714afa99b8866506e8b9bad5d690cf967146332
languageName: node
linkType: hard

"p-finally@npm:^1.0.0":
version: 1.0.0
resolution: "p-finally@npm:1.0.0"
Expand Down Expand Up @@ -9433,13 +9417,6 @@ __metadata:
languageName: node
linkType: hard

"type-fest@npm:^1.2.1":
version: 1.4.0
resolution: "type-fest@npm:1.4.0"
checksum: b011c3388665b097ae6a109a437a04d6f61d81b7357f74cbcb02246f2f5bd72b888ae33631b99871388122ba0a87f4ff1c94078e7119ff22c70e52c0ff828201
languageName: node
linkType: hard

"typedarray-to-buffer@npm:^3.1.5":
version: 3.1.5
resolution: "typedarray-to-buffer@npm:3.1.5"
Expand Down Expand Up @@ -9619,13 +9596,6 @@ __metadata:
languageName: node
linkType: hard

"vali-date@npm:^1.0.0":
version: 1.0.0
resolution: "vali-date@npm:1.0.0"
checksum: 6464369cb77003a966591f2bd17b7c938c480956992e254b3455fd1651a3b7633e23aac8a03b974bbdfbd2357da52b98d46357bb6f292ffd28768a6d3959e61e
languageName: node
linkType: hard

"validate-npm-package-license@npm:^3.0.1":
version: 3.0.4
resolution: "validate-npm-package-license@npm:3.0.4"
Expand Down Expand Up @@ -9866,7 +9836,7 @@ __metadata:
languageName: node
linkType: hard

"ws@npm:^8.2.2":
"ws@npm:^8.2.2, ws@npm:^8.4.0":
version: 8.4.0
resolution: "ws@npm:8.4.0"
peerDependencies:
Expand All @@ -9881,21 +9851,6 @@ __metadata:
languageName: node
linkType: hard

"ws@npm:^8.2.3":
version: 8.3.0
resolution: "ws@npm:8.3.0"
peerDependencies:
bufferutil: ^4.0.1
utf-8-validate: ^5.0.2
peerDependenciesMeta:
bufferutil:
optional: true
utf-8-validate:
optional: true
checksum: 71f6919e3cb2c60ae53e00b13d7782bb77005750641855153a1716c23b7011259fe3a29a432522a3044dc7c579a7e2f5a495bb79ba9f823ce6c2e763300ef99b
languageName: node
linkType: hard

"ws@npm:~7.4.0":
version: 7.4.6
resolution: "ws@npm:7.4.6"
Expand Down

0 comments on commit 4a71a31

Please sign in to comment.