aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/checks.yml4
-rw-r--r--.vscode/settings.json2
-rw-r--r--src/commands/dev/test.ts2
-rw-r--r--src/commands/moulberry-bush/report.ts5
-rw-r--r--src/commands/utilities/suicide.ts9
-rw-r--r--src/lib/extensions/discord-akairo/BushClientUtil.ts10
-rw-r--r--src/listeners/custom/bushBan.ts2
-rw-r--r--src/listeners/custom/bushKick.ts2
-rw-r--r--src/listeners/custom/bushMute.ts2
-rw-r--r--src/listeners/custom/bushPunishRole.ts2
-rw-r--r--src/listeners/custom/bushPunishRoleRemove.ts2
-rw-r--r--src/listeners/custom/bushPurge.ts2
-rw-r--r--src/listeners/custom/bushUnban.ts2
-rw-r--r--src/listeners/custom/bushUnmute.ts2
-rw-r--r--src/listeners/custom/bushUpdateModlog.ts5
-rw-r--r--src/listeners/custom/bushUpdateSettings.ts5
-rw-r--r--src/listeners/custom/bushWarn.ts2
17 files changed, 35 insertions, 25 deletions
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index bbaa22f..8bd2200 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -16,7 +16,7 @@ jobs:
- name: Yarn Cache
uses: c-hive/gha-yarn-cache@v2
- name: Install Dependencies
- run: yarn install --frozen-lockfile
+ run: yarn install --immutable --immutable-cache
- name: Create Fake Ignored files
run: |
cp src/config/example-options.ts src/config/options.ts
@@ -42,7 +42,7 @@ jobs:
- name: Yarn Cache
uses: c-hive/gha-yarn-cache@v2
- name: Install Dependencies
- run: yarn install --frozen-lockfile
+ run: yarn install --immutable --immutable-cache
- name: Configure Git
run: |
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 6413fdc..bf53657 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -28,7 +28,7 @@
"editor.wordWrap": "on",
"editor.tabSize": 2,
"prettier.configPath": "package.json",
- "prettier.prettierPath": ".yarn/sdks/prettier/index.js",
+ "prettier.prettierPath": "node_modules/prettier",
"prettier.withNodeModules": true,
"prettier.useEditorConfig": false,
// "typescript.tsdk": ".yarn/sdks/typescript/lib",
diff --git a/src/commands/dev/test.ts b/src/commands/dev/test.ts
index 5120a34..83dd592 100644
--- a/src/commands/dev/test.ts
+++ b/src/commands/dev/test.ts
@@ -62,7 +62,7 @@ export default class TestCommand extends BushCommand {
} else if (['embed', 'button embed'].includes(args?.feature?.toLowerCase())) {
const embed = new MessageEmbed()
.addField('Field Name', 'Field Content')
- .setAuthor('Author', 'https://www.w3schools.com/w3css/img_snowtops.jpg', 'https://google.com/')
+ .setAuthor({ name: 'Author', iconURL: 'https://www.w3schools.com/w3css/img_snowtops.jpg', url: 'https://google.com/' })
.setColor(message.member?.displayColor ?? util.colors.default)
.setDescription('Description')
.setFooter('Footer', message.author.avatarURL() ?? undefined)
diff --git a/src/commands/moulberry-bush/report.ts b/src/commands/moulberry-bush/report.ts
index 2888051..d5e9731 100644
--- a/src/commands/moulberry-bush/report.ts
+++ b/src/commands/moulberry-bush/report.ts
@@ -79,7 +79,10 @@ export default class ReportCommand extends BushCommand {
const reportEmbed = new MessageEmbed()
.setFooter(`Reporter ID: ${message.author.id} Reported ID: ${member.user.id}`)
.setTimestamp()
- .setAuthor(`Report From: ${message.author.tag}`, message.author.avatarURL({ dynamic: true }) ?? undefined)
+ .setAuthor({
+ name: `Report From: ${message.author.tag}`,
+ iconURL: message.author.avatarURL({ dynamic: true }) ?? undefined
+ })
.setTitle('New Report')
.setColor(util.colors.red)
.setDescription(evidence)
diff --git a/src/commands/utilities/suicide.ts b/src/commands/utilities/suicide.ts
index beb7309..359f914 100644
--- a/src/commands/utilities/suicide.ts
+++ b/src/commands/utilities/suicide.ts
@@ -23,10 +23,11 @@ export default class TemplateCommand extends BushCommand {
const suicideEmbed = new MessageEmbed()
.setTitle('Mental Health Resources')
.setColor(util.colors.red)
- .setAuthor(
- 'Remember, You Matter <3',
- 'https://media.discordapp.net/attachments/770256340639416320/854689949193076737/Medical_31-60_974.jpg?width=523&height=523'
- )
+ .setAuthor({
+ name: 'Remember, You Matter <3',
+ iconURL:
+ 'https://media.discordapp.net/attachments/770256340639416320/854689949193076737/Medical_31-60_974.jpg?width=523&height=523'
+ })
.addField(
'**National Suicide Prevention Hotline (U.S.):**',
[
diff --git a/src/lib/extensions/discord-akairo/BushClientUtil.ts b/src/lib/extensions/discord-akairo/BushClientUtil.ts
index 8f1e67a..aa64562 100644
--- a/src/lib/extensions/discord-akairo/BushClientUtil.ts
+++ b/src/lib/extensions/discord-akairo/BushClientUtil.ts
@@ -205,11 +205,11 @@ export class BushClientUtil extends ClientUtil {
}
let embed = new MessageEmbed().setTimestamp();
if (author)
- embed = embed.setAuthor(
- author.username,
- author.displayAvatarURL({ dynamic: true }),
- `https://discord.com/users/${author.id}`
- );
+ embed = embed.setAuthor({
+ name: author.username,
+ iconURL: author.displayAvatarURL({ dynamic: true }),
+ url: `https://discord.com/users/${author.id}`
+ });
if (color) embed = embed.setColor(color);
return embed;
}
diff --git a/src/listeners/custom/bushBan.ts b/src/listeners/custom/bushBan.ts
index b92a54b..062c2c7 100644
--- a/src/listeners/custom/bushBan.ts
+++ b/src/listeners/custom/bushBan.ts
@@ -19,7 +19,7 @@ export default class BushBanListener extends BushListener {
.setColor(util.colors.discord.RED)
.setTimestamp()
.setFooter(`CaseID: ${caseID}`)
- .setAuthor(user.tag, user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined)
+ .setAuthor({ name: user.tag, iconURL: user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined })
.addField('**Action**', `${duration ? 'Temp Ban' : 'Perm Ban'}`)
.addField('**User**', `${user} (${user.tag})`)
.addField('**Moderator**', `${moderator} (${moderator.tag})`)
diff --git a/src/listeners/custom/bushKick.ts b/src/listeners/custom/bushKick.ts
index db478d0..66f92e5 100644
--- a/src/listeners/custom/bushKick.ts
+++ b/src/listeners/custom/bushKick.ts
@@ -19,7 +19,7 @@ export default class BushKickListener extends BushListener {
.setColor(util.colors.discord.RED)
.setTimestamp()
.setFooter(`CaseID: ${caseID}`)
- .setAuthor(user.tag, user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined)
+ .setAuthor({ name: user.tag, iconURL: user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined })
.addField('**Action**', `${'Kick'}`)
.addField('**User**', `${user} (${user.tag})`)
.addField('**Moderator**', `${moderator} (${moderator.tag})`)
diff --git a/src/listeners/custom/bushMute.ts b/src/listeners/custom/bushMute.ts
index dcc6db9..ed40370 100644
--- a/src/listeners/custom/bushMute.ts
+++ b/src/listeners/custom/bushMute.ts
@@ -19,7 +19,7 @@ export default class BushMuteListener extends BushListener {
.setColor(util.colors.discord.ORANGE)
.setTimestamp()
.setFooter(`CaseID: ${caseID}`)
- .setAuthor(user.tag, user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined)
+ .setAuthor({ name: user.tag, iconURL: user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined })
.addField('**Action**', `${duration ? 'Temp Mute' : 'Perm Mute'}`)
.addField('**User**', `${user} (${user.tag})`)
.addField('**Moderator**', `${moderator} (${moderator.tag})`)
diff --git a/src/listeners/custom/bushPunishRole.ts b/src/listeners/custom/bushPunishRole.ts
index 05124a1..6a5f13c 100644
--- a/src/listeners/custom/bushPunishRole.ts
+++ b/src/listeners/custom/bushPunishRole.ts
@@ -19,7 +19,7 @@ export default class BushPunishRoleListener extends BushListener {
.setColor(util.colors.discord.YELLOW)
.setTimestamp()
.setFooter(`CaseID: ${caseID}`)
- .setAuthor(user.tag, user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined)
+ .setAuthor({ name: user.tag, iconURL: user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined })
.addField('**Action**', `${duration ? 'Temp Punishment Role' : 'Perm Punishment Role'}`)
.addField('**User**', `${user} (${user.tag})`)
.addField('**Moderator**', `${moderator} (${moderator.tag})`)
diff --git a/src/listeners/custom/bushPunishRoleRemove.ts b/src/listeners/custom/bushPunishRoleRemove.ts
index 239ea20..26073cc 100644
--- a/src/listeners/custom/bushPunishRoleRemove.ts
+++ b/src/listeners/custom/bushPunishRoleRemove.ts
@@ -19,7 +19,7 @@ export default class BushPunishRoleRemoveListener extends BushListener {
.setColor(util.colors.discord.GREEN)
.setTimestamp()
.setFooter(`CaseID: ${caseID}`)
- .setAuthor(user.tag, user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined)
+ .setAuthor({ name: user.tag, iconURL: user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined })
.addField('**Action**', `${'Remove Punishment Role'}`)
.addField('**Role**', `${role}`)
.addField('**User**', `${user} (${user.tag})`)
diff --git a/src/listeners/custom/bushPurge.ts b/src/listeners/custom/bushPurge.ts
index 567a9e7..81b3867 100644
--- a/src/listeners/custom/bushPurge.ts
+++ b/src/listeners/custom/bushPurge.ts
@@ -27,7 +27,7 @@ export default class BushPurgeListener extends BushListener {
.setColor(util.colors.discord.DARK_PURPLE)
.setTimestamp()
.setFooter(`${messages.size.toLocaleString()} Messages`)
- .setAuthor(moderator.tag, moderator.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined)
+ .setAuthor({ name: moderator.tag, iconURL: moderator.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined })
.addField('**Action**', `${'Purge'}`)
.addField('**Moderator**', `${moderator} (${moderator.tag})`)
.addField('**Channel**', `<#${channel.id}> (${channel.name})`)
diff --git a/src/listeners/custom/bushUnban.ts b/src/listeners/custom/bushUnban.ts
index b67f4f7..713f04c 100644
--- a/src/listeners/custom/bushUnban.ts
+++ b/src/listeners/custom/bushUnban.ts
@@ -19,7 +19,7 @@ export default class BushUnbanListener extends BushListener {
.setColor(util.colors.discord.GREEN)
.setTimestamp()
.setFooter(`CaseID: ${caseID}`)
- .setAuthor(user.tag, user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined)
+ .setAuthor({ name: user.tag, iconURL: user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined })
.addField('**Action**', `${'Unban'}`)
.addField('**User**', `${user} (${user.tag})`)
.addField('**Moderator**', `${moderator} (${moderator.tag})`)
diff --git a/src/listeners/custom/bushUnmute.ts b/src/listeners/custom/bushUnmute.ts
index fe6a947..46a5fd3 100644
--- a/src/listeners/custom/bushUnmute.ts
+++ b/src/listeners/custom/bushUnmute.ts
@@ -19,7 +19,7 @@ export default class BushUnmuteListener extends BushListener {
.setColor(util.colors.discord.GREEN)
.setTimestamp()
.setFooter(`CaseID: ${caseID}`)
- .setAuthor(user.tag, user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined)
+ .setAuthor({ name: user.tag, iconURL: user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined })
.addField('**Action**', `${'Unmute'}`)
.addField('**User**', `${user} (${user.tag})`)
.addField('**Moderator**', `${moderator} (${moderator.tag})`)
diff --git a/src/listeners/custom/bushUpdateModlog.ts b/src/listeners/custom/bushUpdateModlog.ts
index 6a03325..fa82dba 100644
--- a/src/listeners/custom/bushUpdateModlog.ts
+++ b/src/listeners/custom/bushUpdateModlog.ts
@@ -17,7 +17,10 @@ export default class BushUpdateModlogListener extends BushListener {
const logEmbed = new MessageEmbed()
.setColor(util.colors.discord.BLURPLE)
.setTimestamp()
- .setAuthor(moderator.user.tag, moderator.user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined)
+ .setAuthor({
+ name: moderator.user.tag,
+ iconURL: moderator.user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined
+ })
.addField('**Action**', `${'Update Modlog'}`)
.addField('**Moderator**', `${moderator} (${moderator.user.tag})`)
.addField('**ModLog Changed**', modlogID)
diff --git a/src/listeners/custom/bushUpdateSettings.ts b/src/listeners/custom/bushUpdateSettings.ts
index d34e8e2..c350bde 100644
--- a/src/listeners/custom/bushUpdateSettings.ts
+++ b/src/listeners/custom/bushUpdateSettings.ts
@@ -17,7 +17,10 @@ export default class BushUpdateSettingsListener extends BushListener {
const logEmbed = new MessageEmbed().setColor(util.colors.discord.BLURPLE).setTimestamp();
if (moderator)
- logEmbed.setAuthor(moderator.user.tag, moderator.user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined);
+ logEmbed.setAuthor({
+ name: moderator.user.tag,
+ iconURL: moderator.user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined
+ });
logEmbed.addField('**Action**', `${'Update Settings'}`);
if (moderator) logEmbed.addField('**Moderator**', `${moderator} (${moderator.user.tag})`);
logEmbed
diff --git a/src/listeners/custom/bushWarn.ts b/src/listeners/custom/bushWarn.ts
index fcae8ca..e137473 100644
--- a/src/listeners/custom/bushWarn.ts
+++ b/src/listeners/custom/bushWarn.ts
@@ -19,7 +19,7 @@ export default class BushWarnListener extends BushListener {
.setColor(util.colors.discord.YELLOW)
.setTimestamp()
.setFooter(`CaseID: ${caseID}`)
- .setAuthor(user.tag, user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined)
+ .setAuthor({ name: user.tag, iconURL: user.avatarURL({ dynamic: true, format: 'png', size: 4096 }) ?? undefined })
.addField('**Action**', `${'Warn'}`)
.addField('**User**', `${user} (${user.tag})`)
.addField('**Moderator**', `${moderator} (${moderator.tag})`)
generated by cgit (git 2.46.0) at 2024-11-24 05:57:30 +0000