Skip to content
Merged

Deploy #1749

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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}`;
Expand Down
3 changes: 2 additions & 1 deletion apps/frontend/components/achievements/CriteriaTree.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/data/holidays.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export const fancyHolidays: FancyHoliday[] = [
},
{
holiday: Holiday.ChildrensWeek,
shortName: 'Children',
shortName: '👶',
everything: 'childrens-week',
},
{
Expand Down
14 changes: 10 additions & 4 deletions apps/frontend/user-home/state/lazy/transmog.svelte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
5 changes: 4 additions & 1 deletion apps/web/Controllers/ApiController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,10 @@ await _cacheService.CreateOrUpdateTransmogCacheAsync(

// Reputations
var reputations = new Dictionary<int, int>();
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)
{
Expand Down
4 changes: 2 additions & 2 deletions apps/web/Models/Api/User/ApiUserCharacter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class ApiUserCharacter
public ApiUserCharacterMythicPlus MythicPlus { get; }
public Dictionary<int, ApiUserCharacterAddonDataMythicPlus> MythicPlusAddon { get; }
public Dictionary<int, Dictionary<int, PlayerCharacterAddonDataMythicPlusMap>> MythicPlusSeasons { get; set; }
public Dictionary<int, PlayerCharacterReputationsParagon> Paragons { get; }
public Dictionary<int, PlayerCharacterAddonDataParagon> Paragons { get; }
public Dictionary<int, List<PlayerCharacterAddonDataPatronOrder>> PatronOrders { get; set; }
public Dictionary<int, Dictionary<int, PlayerCharacterProfessionTier>> Professions { get; }
public Dictionary<string, List<int>> ProfessionCooldowns { get; set; }
Expand Down Expand Up @@ -157,7 +157,7 @@ public ApiUserCharacter(
RawSpecializations = character.Specializations?.Specializations;

Configuration = new ApiUserCharacterConfiguration(character.Configuration);
Paragons = character.Reputations?.Paragons ?? new Dictionary<int, PlayerCharacterReputationsParagon>();
Paragons = character.AddonData?.Paragons ?? new Dictionary<int, PlayerCharacterAddonDataParagon>();

RawItems = items;
// Bags = bagItems
Expand Down
Loading