diff --git a/.github/workflows/combine-dependabot-prs.yml b/.github/workflows/combine-dependabot-prs.yml index 5672bf8..6840a52 100644 --- a/.github/workflows/combine-dependabot-prs.yml +++ b/.github/workflows/combine-dependabot-prs.yml @@ -116,7 +116,7 @@ jobs: core.setFailed('Failed to create combined branch - maybe a branch by that name already exists?'); return; } - + let combinedPRs = []; let mergeFailedPRs = []; for(const { branch, prString } of branchesAndPRStrings) { @@ -134,7 +134,7 @@ jobs: mergeFailedPRs.push(prString); } } - + console.log('Creating combined PR'); const combinedPRsString = combinedPRs.join('\n'); let body = '✅ This PR was created by the Combine Dependabot PRs action by combining the following PRs:\n' + combinedPRsString; diff --git a/README.md b/README.md index 4f864b0..17295f1 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This is a repository for V3 revision that has been transitioned and rewritten fr This revision took **4 months** (Late September to Mid December) working on and off to do literally everything that needed a rewrite so badly that it cannot be done in V2. -**Q:** So what are the changes if it almost looks the same as V2? +**Q:** So what are the changes if it almost looks the same as V2? **A:** Here's the bullet points of the changes so far; - Reworked some of the files - Commands and events are now classes diff --git a/src/events/guildMemberAdd.ts b/src/events/guildMemberAdd.ts index 94b8dc8..77d39c7 100644 --- a/src/events/guildMemberAdd.ts +++ b/src/events/guildMemberAdd.ts @@ -1,7 +1,7 @@ import Discord from 'discord.js'; import TClient from '../client.js'; export default class GuildMemberAdd { - static async run(client:TClient, member:Discord.GuildMember){ + static async run(client:TClient, member:Discord.GuildMember){ if (member.partial || member.guild?.id != client.config.dcServer.id) return; const index = member.guild.memberCount; const suffix = (index=>{ diff --git a/src/helpers/FormatPlayer.ts b/src/helpers/FormatPlayer.ts index dcd4b49..c475bf2 100644 --- a/src/helpers/FormatPlayer.ts +++ b/src/helpers/FormatPlayer.ts @@ -15,7 +15,7 @@ export default class FormatPlayer { Days = Math.floor(Hours/24); Hours = Hours-Days*24; } - + return (Days > 0 ? Days+' d ':'')+(Hours > 0 ? Hours+' h ':'')+(Minutes > 0 ? Minutes+' m':'') } static decoratePlayerIcons(player:FSPlayer) {