diff --git a/RpgRoller/Api/StateEventEndpoints.cs b/RpgRoller/Api/StateEventEndpoints.cs index 9a6b886..ce1dd74 100644 --- a/RpgRoller/Api/StateEventEndpoints.cs +++ b/RpgRoller/Api/StateEventEndpoints.cs @@ -12,9 +12,7 @@ internal static class StateEventEndpoints var sessionToken = context.GetRequiredSessionToken(); var stateResult = game.GetCampaignStateSnapshot(sessionToken, campaignId); if (!stateResult.Succeeded) - { return stateResult.Error!.Code == "unauthorized" ? TypedResults.Unauthorized() : TypedResults.BadRequest(new ApiError(stateResult.Error.Message, stateResult.Error.Code)); - } context.Response.Headers.CacheControl = "no-cache"; context.Response.Headers.Connection = "keep-alive"; diff --git a/RpgRoller/Components/Pages/HomeControls/AdminHome.razor.cs b/RpgRoller/Components/Pages/HomeControls/AdminHome.razor.cs index e4a6e86..57e8fc0 100644 --- a/RpgRoller/Components/Pages/HomeControls/AdminHome.razor.cs +++ b/RpgRoller/Components/Pages/HomeControls/AdminHome.razor.cs @@ -180,19 +180,19 @@ public partial class AdminHome private IReadOnlyList HeaderMenuItems => [ - new AppHeaderMenuItem + new() { Label = "Play", IsActive = false, OnSelected = OpenPlayAsync }, - new AppHeaderMenuItem + new() { Label = "Campaign Management", IsActive = false, OnSelected = OpenCampaignManagementAsync }, - new AppHeaderMenuItem + new() { Label = "Admin", IsActive = true, diff --git a/RpgRoller/Components/Pages/Workspace.razor.cs b/RpgRoller/Components/Pages/Workspace.razor.cs index 2300c4b..f560652 100644 --- a/RpgRoller/Components/Pages/Workspace.razor.cs +++ b/RpgRoller/Components/Pages/Workspace.razor.cs @@ -139,12 +139,14 @@ public partial class Workspace : IAsyncDisposable }; if (State.IsCurrentUserAdmin) + { items.Add(new() { Label = "Admin", IsActive = State.IsAdminScreen, OnSelected = () => Session.SwitchScreenAsync(ScreenAdmin) }); + } return items; } diff --git a/RpgRoller/Services/DiceRules.cs b/RpgRoller/Services/DiceRules.cs index 3e1de43..1176385 100644 --- a/RpgRoller/Services/DiceRules.cs +++ b/RpgRoller/Services/DiceRules.cs @@ -92,9 +92,7 @@ public static partial class DiceRules var isOpenEnded = match.Groups["openEnded"].Success; if (isOpenEnded && (diceCount != 1 || sides != 100)) - { return ServiceResult.Failure("invalid_expression", "Open-ended Rolemaster rolls must use d100! with an implicit or explicit dice count of 1."); - } var countPrefix = diceCount == 1 ? string.Empty : diceCount.ToString(); var canonical = $"{countPrefix}d{sides}{(isOpenEnded ? "!" : string.Empty)}{FormatModifier(modifier)}";