Skip to content
Merged

Deploy #1672

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
4 changes: 2 additions & 2 deletions apps/frontend/shared/state/settings.svelte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import { professionCooldowns } from '@/data/professions/cooldowns';
import { Language } from '@/enums/language';
import { sharedState } from '@/shared/state/shared.svelte';
import { getNumberKeyedEntries } from '@/utils/get-number-keyed-entries';
import getTransmogClassMask from '@/utils/get-transmog-class-mask';
import { hashObject } from '@/utils/hash-object.svelte';
import type { Expansion } from '@/types';
import type { Task } from '@/types/tasks';

import { browserState } from './browser.svelte';
import type { Settings } from '../stores/settings/types';
import getTransmogClassMask from '@/utils/get-transmog-class-mask';
import type { Task } from '@/types/tasks';

const languageToSubdomain: Record<Language, string> = {
[Language.deDE]: 'de',
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/shared/stores/data/static/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ export class DataStatic {
) {
const data: StaticDataProfessionAbilityInfo[] = [];

for (const ability of category.abilities) {
for (const ability of category?.abilities || []) {
data.push(
new StaticDataProfessionAbilityInfo(
professionId,
Expand Down Expand Up @@ -259,7 +259,7 @@ export class DataStatic {
}
}

for (const childCategory of category.children) {
for (const childCategory of category?.children || []) {
this.recurseProfession(childCategory, professionId, subProfessionId, spellToItem);
}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/user-home/state/lazy/vendors.svelte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class LazyVendorsProcessor {

public process() {
const snapshot = this._snapshot;
const vendorState = $state.snapshot(browserState.current).vendors;
const vendorState = $state.snapshot(browserState.current.vendors);

if (!this._createdFarmData) {
this._createdFarmData = true;
Expand Down
28 changes: 14 additions & 14 deletions apps/frontend/utils/get-transmog-class-mask.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,48 +3,48 @@ import { settingsState } from '@/shared/state/settings.svelte';

export default function getTransmogClassMask(): number {
let classMask = 0;
const settingsData = settingsState.value;
const transmogSettings = settingsState.value.transmog;

if (settingsData.transmog.showMage) {
if (transmogSettings.showMage) {
classMask |= PlayableClassMask.Mage;
}
if (settingsData.transmog.showPriest) {
if (transmogSettings.showPriest) {
classMask |= PlayableClassMask.Priest;
}
if (settingsData.transmog.showWarlock) {
if (transmogSettings.showWarlock) {
classMask |= PlayableClassMask.Warlock;
}

if (settingsData.transmog.showDemonHunter) {
if (transmogSettings.showDemonHunter) {
classMask |= PlayableClassMask.DemonHunter;
}
if (settingsData.transmog.showDruid) {
if (transmogSettings.showDruid) {
classMask |= PlayableClassMask.Druid;
}
if (settingsData.transmog.showMonk) {
if (transmogSettings.showMonk) {
classMask |= PlayableClassMask.Monk;
}
if (settingsData.transmog.showRogue) {
if (transmogSettings.showRogue) {
classMask |= PlayableClassMask.Rogue;
}

if (settingsData.transmog.showEvoker) {
if (transmogSettings.showEvoker) {
classMask |= PlayableClassMask.Evoker;
}
if (settingsData.transmog.showHunter) {
if (transmogSettings.showHunter) {
classMask |= PlayableClassMask.Hunter;
}
if (settingsData.transmog.showShaman) {
if (transmogSettings.showShaman) {
classMask |= PlayableClassMask.Shaman;
}

if (settingsData.transmog.showDeathKnight) {
if (transmogSettings.showDeathKnight) {
classMask |= PlayableClassMask.DeathKnight;
}
if (settingsData.transmog.showPaladin) {
if (transmogSettings.showPaladin) {
classMask |= PlayableClassMask.Paladin;
}
if (settingsData.transmog.showWarrior) {
if (transmogSettings.showWarrior) {
classMask |= PlayableClassMask.Warrior;
}

Expand Down
2 changes: 1 addition & 1 deletion apps/web/Controllers/API/CachedDataController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public async Task<IActionResult> CachedJson([FromRoute] string type, [FromRoute]
if (hash != redisHash)
{
_logger.LogWarning("Invalid content hash: {hash}", hash);
return RedirectToAction("CachedData", new { type, languageCode = language.ToString(), hash = redisHash });
return RedirectToAction("CachedJson", new { type, languageCode = language.ToString(), hash = redisHash });
}

return Content(await db.StringGetAsync($"cache:{key}:data"), "application/json");
Expand Down
Loading