diff --git a/apps/frontend/auctions/components/results/ResultsRow.svelte b/apps/frontend/auctions/components/results/ResultsRow.svelte index 7ddf23575..c2a9b297b 100644 --- a/apps/frontend/auctions/components/results/ResultsRow.svelte +++ b/apps/frontend/auctions/components/results/ResultsRow.svelte @@ -52,7 +52,7 @@ ret.icon = `item/${itemId}`; ret.itemLevel = parseInt(parts[2]) || item?.itemLevel || 1; - ret.name = `{${groupKey}}`; + ret.name = `{item:${itemId}}`; } else if (groupKey.startsWith('pet:')) { const pet = wowthingData.static.petById.get(parseInt(groupKey.split(':')[1])); ret.icon = `npc/${pet.creatureId}`; diff --git a/apps/frontend/components/achievements/CriteriaTree.svelte b/apps/frontend/components/achievements/CriteriaTree.svelte index bff990fac..efdcc83da 100644 --- a/apps/frontend/components/achievements/CriteriaTree.svelte +++ b/apps/frontend/components/achievements/CriteriaTree.svelte @@ -120,8 +120,9 @@ linkType = 'achievement'; linkId = criteria.asset; - const earned = userState.achievements.achievementEarnedById.has(criteria.asset); + const earned = userState.achievements.achievementEarnedById.get(criteria.asset); if (earned) { + have = true; linkParams['who'] = 'You'; linkParams['when'] = earned.toString() + '000'; } diff --git a/apps/frontend/data/holidays.ts b/apps/frontend/data/holidays.ts index 8d2652eb5..dcfb2fd5e 100644 --- a/apps/frontend/data/holidays.ts +++ b/apps/frontend/data/holidays.ts @@ -109,7 +109,7 @@ export const fancyHolidays: FancyHoliday[] = [ }, { holiday: Holiday.ChildrensWeek, - shortName: 'Children', + shortName: '👶', everything: 'childrens-week', }, { diff --git a/apps/frontend/user-home/state/lazy/transmog.svelte.ts b/apps/frontend/user-home/state/lazy/transmog.svelte.ts index 4accfa5fa..a6523d00a 100644 --- a/apps/frontend/user-home/state/lazy/transmog.svelte.ts +++ b/apps/frontend/user-home/state/lazy/transmog.svelte.ts @@ -66,10 +66,17 @@ export function doTransmog(): LazyTransmog { const hasSource = overrideHas || hasAppearanceBySource.has(itemId * 1000 + modifier); const hasAppearance = hasSource || overrideHas || hasAppearanceById.has(appearanceId); + const hasCompletionist = completionistMode ? hasSource : hasAppearance; slotData[actualSlot] ||= [false, []]; - slotData[actualSlot][0] ||= completionistMode ? hasSource : hasAppearance; - slotData[actualSlot][1].push([hasAppearance, hasSource, itemId, modifier, appearanceId]); + slotData[actualSlot][0] ||= hasCompletionist; + slotData[actualSlot][1].push([ + hasAppearance, + hasCompletionist, + itemId, + modifier, + appearanceId, + ]); }; const completionistMode = settingsState.value.transmog.completionistMode; @@ -218,8 +225,7 @@ export function doTransmog(): LazyTransmog { if ( item.classMask > 0 && transmogSet.classMask > 0 && - (item.classMask & transmogSet.classMask) !== - transmogSet.classMask + (item.classMask & transmogSet.classMask) === 0 ) { continue; } diff --git a/apps/web/Controllers/ApiController.cs b/apps/web/Controllers/ApiController.cs index 047fc80f4..1f6ab03f5 100644 --- a/apps/web/Controllers/ApiController.cs +++ b/apps/web/Controllers/ApiController.cs @@ -450,7 +450,10 @@ await _cacheService.CreateOrUpdateTransmogCacheAsync( // Reputations var reputations = new Dictionary(); - foreach (var account in accounts.Where(account => account.AddonData?.Reputations != null).OrderByDescending(account => account.AddonData.ReputationsScannedAt)) + var repAccounts = accounts + .Where(account => account.AddonData?.Reputations != null) + .OrderBy(account => account.AddonData.ReputationsScannedAt); + foreach (var account in repAccounts) { foreach ((int factionId, int value) in account.AddonData.Reputations) { diff --git a/apps/web/Models/Api/User/ApiUserCharacter.cs b/apps/web/Models/Api/User/ApiUserCharacter.cs index a40ff613a..493e3924f 100644 --- a/apps/web/Models/Api/User/ApiUserCharacter.cs +++ b/apps/web/Models/Api/User/ApiUserCharacter.cs @@ -51,7 +51,7 @@ public class ApiUserCharacter public ApiUserCharacterMythicPlus MythicPlus { get; } public Dictionary MythicPlusAddon { get; } public Dictionary> MythicPlusSeasons { get; set; } - public Dictionary Paragons { get; } + public Dictionary Paragons { get; } public Dictionary> PatronOrders { get; set; } public Dictionary> Professions { get; } public Dictionary> ProfessionCooldowns { get; set; } @@ -157,7 +157,7 @@ public ApiUserCharacter( RawSpecializations = character.Specializations?.Specializations; Configuration = new ApiUserCharacterConfiguration(character.Configuration); - Paragons = character.Reputations?.Paragons ?? new Dictionary(); + Paragons = character.AddonData?.Paragons ?? new Dictionary(); RawItems = items; // Bags = bagItems