From 3dc5f793d42fe09e0a8ceb10dbddeefc697af7d5 Mon Sep 17 00:00:00 2001 From: Braeden Sowinski Date: Thu, 8 Jun 2023 16:50:50 -0700 Subject: [PATCH] better leaderboard --- commands/leaderboard.js | 8 +-- package.json | 2 +- typescript | 114 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 119 insertions(+), 5 deletions(-) diff --git a/commands/leaderboard.js b/commands/leaderboard.js index 2894ba6..09a61ee 100644 --- a/commands/leaderboard.js +++ b/commands/leaderboard.js @@ -98,11 +98,13 @@ module.exports = { category == 'worst_deathstreak' ? `${leaderboard[i].worstDeathStreak} Deathstreak` : category == 'longest_kill' ? `${leaderboard[i].longestKill}m` : category == 'money' ? `$${(leaderboard[i].user.guilds[GuildDB.serverID].balance).toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2})}` : - category == 'time_played' ? `Total: ${client.secondsToDhms(leaderboard[i].totalSessionTime)}\nLast Session: ${leaderboard[i].lastSessionTime}` : 'N/A Error'; + category == 'time_played' ? `**Total:** ${client.secondsToDhms(leaderboard[i].totalSessionTime)}\n> **Last Session:** ${leaderboard[i].lastSessionTime}` : 'N/A Error'; if (category == 'money') des += `**${i+1}.** <@${leaderboard[i].user.userID}> - **${stats}**\n` - else if (category == 'time_played') des += `**${i+1}.** <@${leaderboard[i].discordID}> - **${stats}**\n` - else leaderboardEmbed.addFields({ name: `**${i+1}. ${leaderboard[i].gamertag}**`, value: `**${stats}**`, inline: true }); + else if (category == 'time_played') { + tag = leaderboard[i].discordID != "" ? `<@${leaderboard[i].discordID}>` : leaderboard[i].gamertag; + des += `**${i+1}.** ${tag}\n> ${stats}\n\n`; + } else leaderboardEmbed.addFields({ name: `**${i+1}. ${leaderboard[i].gamertag}**`, value: `**${stats}**`, inline: true }); } if (category == 'money' || category == 'time_played') leaderboardEmbed.setDescription(des); diff --git a/package.json b/package.json index c5ef3ec..17b2c96 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dayz-armbands", - "version": "6.13.3", + "version": "6.13.4", "description": "A General Purpose Discord Bot for DayZ Servers.", "main": "index.js", "nodemonConfig": { diff --git a/typescript b/typescript index 54d19f4..343f52a 100644 --- a/typescript +++ b/typescript @@ -341,4 +341,116 @@ Mar 17 13:43:06 fal dbus-daemon[1640]: [session uid=1000 pid=1640] Successfully lines 149-184  ESCESCOOBB Mar 17 14:26:15 fal audit[1035830]: AVC apparmor="DENIED" operation="ptrace" class="ptrace" profile="snap.discord.discord" pid=1035830 comm="Ut> lines 150-185  ESCESCOOBB Mar 17 14:26:15 fal audit[1035830]: AVC apparmor="DENIED" operation="ptrace" class="ptrace" profile="snap.discord.discord" pid=1035830 comm="Ut> lines 151-186  ESCESCOOBB Mar 17 14:26:15 fal audit[1035830]: AVC apparmor="DENIED" operation="ptrace" class="ptrace" profile="snap.discord.discord" pid=1035830 comm="Ut> -lines 152- \ No newline at end of file +lines 152-187  ESCESCOOBB Mar 17 14:26:15 fal audit[1035830]: AVC apparmor="DENIED" operation="ptrace" class="ptrace" profile="snap.discord.discord" pid=1035830 comm="Ut> +lines 153-188  ESCESCOOBB Mar 17 14:26:15 fal audit[1035830]: AVC apparmor="DENIED" operation="ptrace" class="ptrace" profile="snap.discord.discord" pid=1035830 comm="Ut> +lines 154-189  ESCESCOOBB Mar 17 14:26:15 fal audit[1035830]: AVC apparmor="DENIED" operation="ptrace" class="ptrace" profile="snap.discord.discord" pid=1035830 comm="Ut> +lines 155-190  ESCESCOOBB Mar 17 14:26:15 fal audit[1035830]: AVC apparmor="DENIED" operation="ptrace" class="ptrace" profile="snap.discord.discord" pid=1035830 comm="Ut> +lines 156-191 [?1l> +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ clkearear +[?2004l [?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ git add . +[?2004l [?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ git commi t -0m m "forecce lastConnection dat e to not be nil +[?2004l [?2004h> "\ +[?2004l [main eb6db40] force lastConnection date to not be nil + 2 files changed, 346 insertions(+) + create mode 100644 typescript +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ git add .push origin main +[?2004l Enumerating objects: 8, done. +Counting objects: 12% (1/8) Counting objects: 25% (2/8) Counting objects: 37% (3/8) Counting objects: 50% (4/8) Counting objects: 62% (5/8) Counting objects: 75% (6/8) Counting objects: 87% (7/8) Counting objects: 100% (8/8) Counting objects: 100% (8/8), done. +Delta compression using up to 8 threads +Compressing objects: 20% (1/5) Compressing objects: 40% (2/5) Compressing objects: 60% (3/5) Compressing objects: 80% (4/5) Compressing objects: 100% (5/5) Compressing objects: 100% (5/5), done. +Writing objects: 20% (1/5) Writing objects: 40% (2/5) Writing objects: 60% (3/5) Writing objects: 80% (4/5) Writing objects: 100% (5/5) Writing objects: 100% (5/5), 4.79 KiB | 1.20 MiB/s, done. +Total 5 (delta 3), reused 0 (delta 0), pack-reused 0 +remote: Resolving deltas: 0% (0/3) remote: Resolving deltas: 33% (1/3) remote: Resolving deltas: 66% (2/3) remote: Resolving deltas: 100% (3/3) remote: Resolving deltas: 100% (3/3), completed with 3 local objects. +To github.com:SowinskiBraeden/dayz-reforger.git + 981102f..eb6db40 main -> main +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ git push origin maincommit -m "force lastConnection date to not be nil + " ]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ add . +  +[?2004l [?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ git add .push origin maincommit -m "force lastConnection date to not be nil + " " +[?2004l [main 90314ce] force lastConnection date to not be nil + 1 file changed, 2 insertions(+), 2 deletions(-) +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ git push origin main +[?2004l Enumerating objects: 7, done. +Counting objects: 14% (1/7) Counting objects: 28% (2/7) Counting objects: 42% (3/7) Counting objects: 57% (4/7) Counting objects: 71% (5/7) Counting objects: 85% (6/7) Counting objects: 100% (7/7) Counting objects: 100% (7/7), done. +Delta compression using up to 8 threads +Compressing objects: 25% (1/4) Compressing objects: 50% (2/4) Compressing objects: 75% (3/4) Compressing objects: 100% (4/4) Compressing objects: 100% (4/4), done. +Writing objects: 25% (1/4) Writing objects: 50% (2/4) Writing objects: 75% (3/4) Writing objects: 100% (4/4) Writing objects: 100% (4/4), 615 bytes | 615.00 KiB/s, done. +Total 4 (delta 3), reused 0 (delta 0), pack-reused 0 +remote: Resolving deltas: 0% (0/3) remote: Resolving deltas: 33% (1/3) remote: Resolving deltas: 66% (2/3) remote: Resolving deltas: 100% (3/3) remote: Resolving deltas: 100% (3/3), completed with 3 local objects. +To github.com:SowinskiBraeden/dayz-reforger.git + eb6db40..90314ce main -> main +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ track_test.js LilB;BLbBearsha +[?2004l track_test.js: command not found +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ track_test.js LiLBearsha[1@n[1@o[1@d[1@ [1@e[1@ +[?2004l Calculating... +LiLBearsha's current positional data: +LiLBearsha has moved 1m @90° South East +From last Position: 4415.5 / 10848.7 at Last Time: 18:16:11 EST +To Latest Position: 4416 / 10848.2 at Latest Time: 18:16:36 EST +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ node node track_test.js LiLBearsha +[?2004l Calculating... +LiLBearsha's current positional data: +LiLBearsha has moved 1m @0° South West +From last Position: 4634.4 / 10441.1 at Last Time: 18:44:08 EST +To Latest Position: 4633.8 / 10440.8 at Latest Time: 18:44:35 EST +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ node track_test.js LiLBearsha xCookie666x +[?2004l Calculating... +xCookie666x's current positional data: +xCookie666x has moved 4m @0° South West +From last Position: 1334.2 / 14451.5 at Last Time: 18:43:52 EST +To Latest Position: 1330.7 / 14451.3 at Latest Time: 18:43:57 EST +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ node track_test.js xCookie666xJahnman SQWEQWE +[?2004l Player not found +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ node track_test.js Jahman SWEhoxCookie666xLiLBearshaxCookie666xnode track_test.js xCookie666x +[?2004l [?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ node track_test.js xCookie666xLiLBearshagit push origin maintrack_test.js LiLBearsha[5@node xCookie666xxCookie666x"jaJahman SWE" +[?2004l Calculating... +Jahman SWE's current positional data: +Jahman SWE has moved 29m @35° North East +From last Position: 8098.8 / 12713.5 at Last Time: 18:39:40 EST +To Latest Position: 8123.2 / 12730.9 at Latest Time: 18:41:11 EST +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ node track_test.js "Jahman SWE"hotdog5558619 +[?2004l Calculating... +hotdog5558619's current positional data: +hotdog5558619 has moved 0m @0° N/A +From last Position: 2036.2 / 7304.1 at Last Time: 18:36:11 EST +To Latest Position: 2036.2 / 7304.1 at Latest Time: 18:41:11 EST +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ clear +[?2004l [?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ clearnode track_test.js hotdog5558619"Jahman SWE"xCookie666xLiLBearshagit push origin maintrack_test.js LiLBearsha[5@node  +[?2004l Calculating... +LiLBearsha's current positional data: +LiLBearsha has moved 1m @0° South West +From last Position: 4634.4 / 10441.1 at Last Time: 18:47:03 EST +To Latest Position: 4633.8 / 10440.8 at Latest Time: 18:47:30 EST +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ node track_test.js LiLBearsha +[?2004l Calculating... +LiLBearsha's current positional data: +LiLBearsha has moved 1m @0° South West +From last Position: 4634.4 / 10441.1 at Last Time: 18:47:03 EST +To Latest Position: 4633.8 / 10440.8 at Latest Time: 18:47:30 EST +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ node track_test.js LiLBearsha +[?2004l Calculating... +LiLBearsha's current positional data: +LiLBearsha has moved 1m @0° South West +From last Position: 4634.4 / 10441.1 at Last Time: 18:47:03 EST +To Latest Position: 4633.8 / 10440.8 at Latest Time: 18:47:30 EST +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ node track_test.js LiLBearsha +[?2004l Calculating... +LiLBearsha's current positional data: +LiLBearsha has moved 1m @0° South West +From last Position: 4634.4 / 10441.1 at Last Time: 18:47:03 EST +To Latest Position: 4633.8 / 10440.8 at Latest Time: 18:47:30 EST +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ node track_test.js LiLBearsha +[?2004l Calculating... +LiLBearsha's current positional data: +LiLBearsha has moved 1m @0° South West +From last Position: 4634.4 / 10441.1 at Last Time: 18:47:03 EST +To Latest Position: 4633.8 / 10440.8 at Latest Time: 18:47:30 EST +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ node track_test.js LiLBearsha +[?2004l Calculating... +LiLBearsha's current positional data: +LiLBearsha has moved 1m @0° South West +From last Position: 4634.4 / 10441.1 at Last Time: 18:47:03 EST +To Latest Position: 4633.8 / 10440.8 at Latest Time: 18:47:30 EST +[?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:~/Desktop/Projects/dayz-reforger (main) $ clear +[?2004l [?2004h]0;flami@fal: ~/Desktop/Projects/dayz-reforgerflami@fal:[01;3 \ No newline at end of file