From 3868edb4f04f27f6a8ef6e5bec5fddc36c4b4328 Mon Sep 17 00:00:00 2001 From: Willow Date: Fri, 23 Jun 2023 19:36:04 +0200 Subject: [PATCH 1/4] fix(crafted): prevent duplicate weapon spam --- Felicity/DiscordCommands/Interactions/CraftingCommands.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Felicity/DiscordCommands/Interactions/CraftingCommands.cs b/Felicity/DiscordCommands/Interactions/CraftingCommands.cs index 79f9ce9..9772622 100644 --- a/Felicity/DiscordCommands/Interactions/CraftingCommands.cs +++ b/Felicity/DiscordCommands/Interactions/CraftingCommands.cs @@ -1,4 +1,4 @@ -using System.Text; +using System.Text; using Discord; using Discord.Interactions; using DotNetBungieAPI.Extensions; @@ -116,7 +116,7 @@ public async Task Crafted() //$"\n> {FormattedWeaponLevel(highestWeaponLevel, itemList.Count > 1)} [{manifestRecord.DisplayProperties.Name}]({MiscUtils.GetLightGgLink(manifestRecord.Hash)})"); $"\n> {FormattedWeaponLevel(highestWeaponLevel, itemList.Count > 1)} - {manifestRecord.DisplayProperties.Name}"); - if (itemList.Count > 1 && !embed.Description.Contains("* = ")) + if (itemList.Count > 1 && !embed.Description.Contains("`*` = ")) embed.Description += "\n\n`*` = Multiple crafted weapons are in your inventory, only the highest level is returned."; } From d34511f032e1b77d3575c631fe9c18ba03519265 Mon Sep 17 00:00:00 2001 From: Willow Date: Fri, 23 Jun 2023 19:36:20 +0200 Subject: [PATCH 2/4] fix(recipes): prevent empty page generation --- .../DiscordCommands/Interactions/CraftingCommands.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Felicity/DiscordCommands/Interactions/CraftingCommands.cs b/Felicity/DiscordCommands/Interactions/CraftingCommands.cs index 9772622..7556583 100644 --- a/Felicity/DiscordCommands/Interactions/CraftingCommands.cs +++ b/Felicity/DiscordCommands/Interactions/CraftingCommands.cs @@ -1,4 +1,4 @@ -using System.Text; +using System.Text; using Discord; using Discord.Interactions; using DotNetBungieAPI.Extensions; @@ -259,7 +259,15 @@ public async Task Recipes( } if (page.Fields.Count == 0) - page.Description += "\n\nYou have completed all available patterns."; + { + if (pageList.Count == 0) + { + page.Description += "\n\nYou have completed all available patterns."; + pageList.Add(page); + } + + continue; + } pageList.Add(page); } From 5a2b35e41de3b31604d9fb154bb7d0333dd3b156 Mon Sep 17 00:00:00 2001 From: Willow Date: Fri, 23 Jun 2023 19:36:29 +0200 Subject: [PATCH 3/4] fix(discord): added ghost server --- Felicity/Services/Hosted/DiscordStartupService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Felicity/Services/Hosted/DiscordStartupService.cs b/Felicity/Services/Hosted/DiscordStartupService.cs index a425380..f776e94 100644 --- a/Felicity/Services/Hosted/DiscordStartupService.cs +++ b/Felicity/Services/Hosted/DiscordStartupService.cs @@ -130,7 +130,8 @@ private static async Task OnLeftGuild(SocketGuild arg) var buggedServers = new List { 260978723455631373, - 1068135541360578590 + 1068135541360578590, + 719161295232040961 }; if (buggedServers.Contains(arg.Id)) From 07bd01b7b97482fbca1983b6d4d65b31495497c2 Mon Sep 17 00:00:00 2001 From: Willow Date: Fri, 23 Jun 2023 19:38:06 +0200 Subject: [PATCH 4/4] ci(changelog): use ci-cz --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index b5d49d7..251be4c 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v2 - name: Run Changelog CI - uses: saadmk11/changelog-ci@v1.1.1 + uses: MoonieGZ/changelog-ci-cz@v1.0.1 with: changelog_filename: CHANGELOG.md config_file: .github/changelog-ci-config.yml