Skip to content

Deploy #1751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
madcowfred merged 10 commits into from
May 11, 2026
Merged

Deploy #1751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4106a24
Add Midnight>Player vs Player fake achievement section
Apr 29, 2026
f676ac1
Fix home progress spacing
May 10, 2026
092be96
Remove empty chore sets from task tooltips
May 10, 2026
1eece67
Fix vendor options not showing ALL when it should
May 10, 2026
21da4db
Show in progress count for delves progress
May 10, 2026
e63d702
Random lint
May 10, 2026
6268402
.NET 10 first pass
May 10, 2026
245b526
Update other C# packages
May 10, 2026
6daf601
Fix redis weirdness with expirations
May 10, 2026
6e19996
Return the lowest rep tier as a fallback
May 11, 2026
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/backend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build

WORKDIR /app
COPY . .
Expand All @@ -7,7 +7,7 @@ WORKDIR /app/apps/backend
RUN dotnet publish -c Release -o out


FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime

#RUN apk add --no-cache icu-libs

Expand Down
36 changes: 18 additions & 18 deletions apps/backend/Wowthing.Backend.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk.Worker">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<UserSecretsId>dotnet-Wowthing.Backend-08E9B79A-EF3A-409C-B7C6-BDB114990FD2</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CsvHelper" Version="33.0.1" />
<PackageReference Include="Imageflow.AllPlatforms" Version="0.13.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="9.0.5" />
<PackageReference Include="CsvHelper" Version="33.1.0" />
<PackageReference Include="Imageflow.AllPlatforms" Version="0.15.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="10.0.7" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.7" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="10.0.7" />
<PackageReference Include="morelinq" Version="4.4.0" />
<PackageReference Include="Polly" Version="8.5.2" />
<PackageReference Include="Polly" Version="8.6.6" />
<PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
<PackageReference Include="Sentry" Version="5.8.0" />
<PackageReference Include="Sentry.Profiling" Version="5.8.0" />
<PackageReference Include="Serilog" Version="4.3.0" />
<PackageReference Include="Sentry" Version="6.5.0" />
<PackageReference Include="Sentry.Profiling" Version="6.5.0" />
<PackageReference Include="Serilog" Version="4.3.1" />
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="10.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="10.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageReference Include="SharpAbp.Abp.OpenTelemetry.Exporter.Prometheus.HttpListener" Version="4.2.1" />
<PackageReference Include="StackExchange.Redis" Version="2.8.37" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.5" />
<PackageReference Include="YamlDotNet" Version="16.3.0" />
<PackageReference Include="SharpAbp.Abp.OpenTelemetry.Exporter.Prometheus.HttpListener" Version="4.7.2" />
<PackageReference Include="StackExchange.Redis" Version="2.12.14" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="10.0.7" />
<PackageReference Include="YamlDotNet" Version="17.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion apps/backend/development.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0
FROM mcr.microsoft.com/dotnet/sdk:10.0

WORKDIR /app/apps/backend

Expand Down
4 changes: 2 additions & 2 deletions apps/benchmark/Wowthing.Benchmark.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
<PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion apps/discord/Wowthing.Discord.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Discord.Net" Version="3.13.0" />
<PackageReference Include="Discord.Net" Version="3.19.1" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions apps/frontend/components/home/table/row/HomeTableRowProgress.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
<style lang="scss">
td {
--width: 2rem;

word-spacing: -0.2ch;
}
</style>

Expand Down Expand Up @@ -43,6 +45,8 @@
>
{#if data.have > 0 && data.have === data.total}
<IconifyWrapper icon={uiIcons.starFull} />
{:else if data.inProgress}
{data.have}+{data.inProgress} / {data.total}
{:else}
{data.have} / {data.total}
{/if}
Expand Down
9 changes: 8 additions & 1 deletion apps/frontend/components/progress/ProgressTableBody.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,15 @@
class={progressData.missingRequired
? 'status-fail'
: getPercentClass((progressData.have / progressData.total) * 100)}
>{progressData.have} / {progressData.total}</span
>
{#if progressData.inProgress}
{progressData.have}+{progressData.inProgress}
{:else}
{progressData.have}
{/if}
/
{progressData.total}
</span>
</td>
{:else if progressData?.have === -1 && progressData?.total >= 0}
<td class="status-fail">---</td>
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/components/tooltips/progress/TooltipProgress.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@

{#if showCurrencies?.length > 0 && !(showCurrencies.length === 1 && showCurrencies[0] === 0)}
<div class="bottom">
{#each showCurrencies as currencyId}
{#each showCurrencies as currencyId (currencyId)}
<span>
{#if currencyId > 1000000}
<WowthingImage name="item/{currencyId - 1000000}" size={20} border={1} />
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/components/tooltips/task/TooltipTaskRow.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
<h4>{character?.name || `Unknown Character #${characterId}`}</h4>
<h5>{task?.name || `Unknown Task "${taskName}"`}</h5>

{#each choreSets as choreSet (choreSet)}
{#each choreSets.filter((s) => s.length > 0) as choreSet (choreSet)}
<table class="table-striped">
<tbody>
{#each choreSet as charTaskChore (charTaskChore)}
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/components/vendors/VendorsOptions.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

if (byThing.length === 0) {
byThing = ['---'];
} else if (byThing.length === 6) {
} else if (byThing.length === 7) {
byThing = ['ALL'];
}

Expand Down
29 changes: 29 additions & 0 deletions apps/frontend/data/achievements.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,35 @@ export const extraCategories: ExtraAchievementCategory[] = [
61380, // Glory of the Midnight Raider
],
},
{
targetSlug: 'player-vs-player/world',
nameType: 1,
onlyAchievementIds: true,
achievementIds: [
61446, // Slayer's Mastery
61464, // Spark in the Night
61465, // Spark in the Night
61447, // Partake in the Rise
61448, // Frequent the Rise
61449, // Customary Rise
61265, // Spectral Capture
61266, // Spectral Stocker
61234, // Hunt in the Night
61238, // Midnight Bounty
61231, // Midnight Loot
61232, // Midnight Treasures
61230, // Remains in the Rise
61227, // Entering the Void
61228, // Embracing the Void
61229, // Dedication in the Void
61225, // Investigating the Rise
61226, // Uprising
61221, // Tour of Duty: Eversong Woods
61222, // Tour of Duty: Zul'Aman
61223, // Tour of Duty: Harandar
61224, // Tour of Duty: Voidstorm
],
},
null,
{ targetSlug: 'expansion-features/prey', nameType: 2 },
{ targetSlug: 'expansion-features/ritual-sites', nameType: 2 },
Expand Down
13 changes: 11 additions & 2 deletions apps/frontend/utils/find-reputation-tier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { StaticDataReputationTier } from '@/shared/stores/static/types';

export default function findReputationTier(
tiers: StaticDataReputationTier,
characterRep: number,
characterRep: number
): ReputationTier | undefined {
for (let i = tiers.minValues.length - 1; i >= 0; i--) {
const finalTier = i === tiers.minValues.length - 1;
Expand Down Expand Up @@ -37,8 +37,17 @@ export default function findReputationTier(
tiers.minValues.length - i,
maxValue,
value,
percent,
percent
);
}
}

console.warn('invalid value for findReputationTier', tiers.id, characterRep);
return new ReputationTier(
tiers.names[0],
1,
tiers.minValues[1] - tiers.minValues[0],
tiers.minValues[0],
'0.0'
);
}
28 changes: 22 additions & 6 deletions apps/frontend/utils/get-progress.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ export default function getProgress(
group: ManualDataProgressGroup,
countAccountWide = true
): ProgressInfo {
let have: number = 0;
let have = 0;
let inProgress = 0;
let missingRequired = false;
let showCurrency = 0;
let total = 0;
Expand Down Expand Up @@ -193,11 +194,24 @@ export default function getProgress(
}

let haveThis = false;
if (
(group.type === 'quest' && checkCharacterQuestIds(character.id, data.ids)) ||
(group.type === 'accountQuest' && checkAccountQuestIds(data.ids))
) {
haveThis = true;
if (group.type === 'quest' || group.type === 'accountQuest') {
haveThis =
(group.type === 'quest' &&
checkCharacterQuestIds(character.id, data.ids)) ||
(group.type === 'accountQuest' && checkAccountQuestIds(data.ids));

if (group.name === 'Delves') {
const progressQuest = userState.quests.characterById
.get(character.id)
?.progressQuestByKey?.get(`q${data.ids[0]}`);
if (
progressQuest &&
progressQuest.objectives[0] &&
progressQuest.objectives[0].have === progressQuest.objectives[0].need
) {
inProgress++;
}
}

if (group.name === 'Brewfest Intro Quests') {
showCurrency = 1037829; // Cyphers of the First Ones
Expand Down Expand Up @@ -504,6 +518,7 @@ export default function getProgress(
have,
haveIndexes,
icon,
inProgress,
missingRequired,
nameOverride,
showCurrency,
Expand Down Expand Up @@ -549,6 +564,7 @@ export interface ProgressInfo {
have: number;
haveIndexes: number[];
icon: string;
inProgress: number;
missingRequired: boolean;
nameOverride: Record<number, string>;
showCurrency: number;
Expand Down
2 changes: 1 addition & 1 deletion apps/luaparser/Wowthing.LuaParser.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
16 changes: 8 additions & 8 deletions apps/tool/Wowthing.Tool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand All @@ -12,19 +12,19 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="bebop" Version="3.1.3" />
<PackageReference Include="bebop-tools" Version="3.1.3">
<PackageReference Include="bebop" Version="3.2.3" />
<PackageReference Include="bebop-tools" Version="3.2.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="CsvHelper" Version="33.0.1" />
<PackageReference Include="CsvHelper" Version="33.1.0" />
<PackageReference Include="morelinq" Version="4.4.0" />
<PackageReference Include="Serilog" Version="4.3.0" />
<PackageReference Include="Serilog" Version="4.3.1" />
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="StackExchange.Redis" Version="2.8.37" />
<PackageReference Include="YamlDotNet" Version="16.3.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageReference Include="StackExchange.Redis" Version="2.12.14" />
<PackageReference Include="YamlDotNet" Version="17.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions apps/web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ COPY apps/frontend/ .
RUN npm run build


FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build-web
FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build-web

WORKDIR /app
COPY apps/web/ ./apps/web/
Expand All @@ -23,7 +23,7 @@ WORKDIR /app/apps/web
RUN dotnet publish -c Release -o out


FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine AS runtime

WORKDIR /app
COPY --from=build-web /app/apps/web/out ./
Expand Down
18 changes: 9 additions & 9 deletions apps/web/Wowthing.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

<PropertyGroup>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AspNet.Security.OAuth.BattleNet" Version="9.4.0" />
<PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="9.0.8" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="9.0.5" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="9.0.5" />
<PackageReference Include="AspNet.Security.OAuth.BattleNet" Version="10.0.0" />
<PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="10.0.11" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="10.0.7" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="10.0.7" />
<PackageReference Include="prometheus-net" Version="8.2.1" />
<PackageReference Include="prometheus-net.AspNetCore" Version="8.2.1" />
<PackageReference Include="StackExchange.Redis" Version="2.8.37" />
<PackageReference Include="StackExchange.Redis" Version="2.12.14" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/development.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0
FROM mcr.microsoft.com/dotnet/sdk:10.0

WORKDIR /app/apps/web

Expand Down
Loading
Loading