Code Cleanup
This commit is contained in:
@@ -12,9 +12,7 @@ internal static class StateEventEndpoints
|
|||||||
var sessionToken = context.GetRequiredSessionToken();
|
var sessionToken = context.GetRequiredSessionToken();
|
||||||
var stateResult = game.GetCampaignStateSnapshot(sessionToken, campaignId);
|
var stateResult = game.GetCampaignStateSnapshot(sessionToken, campaignId);
|
||||||
if (!stateResult.Succeeded)
|
if (!stateResult.Succeeded)
|
||||||
{
|
|
||||||
return stateResult.Error!.Code == "unauthorized" ? TypedResults.Unauthorized() : TypedResults.BadRequest(new ApiError(stateResult.Error.Message, stateResult.Error.Code));
|
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.CacheControl = "no-cache";
|
||||||
context.Response.Headers.Connection = "keep-alive";
|
context.Response.Headers.Connection = "keep-alive";
|
||||||
|
|||||||
@@ -180,19 +180,19 @@ public partial class AdminHome
|
|||||||
|
|
||||||
private IReadOnlyList<AppHeaderMenuItem> HeaderMenuItems =>
|
private IReadOnlyList<AppHeaderMenuItem> HeaderMenuItems =>
|
||||||
[
|
[
|
||||||
new AppHeaderMenuItem
|
new()
|
||||||
{
|
{
|
||||||
Label = "Play",
|
Label = "Play",
|
||||||
IsActive = false,
|
IsActive = false,
|
||||||
OnSelected = OpenPlayAsync
|
OnSelected = OpenPlayAsync
|
||||||
},
|
},
|
||||||
new AppHeaderMenuItem
|
new()
|
||||||
{
|
{
|
||||||
Label = "Campaign Management",
|
Label = "Campaign Management",
|
||||||
IsActive = false,
|
IsActive = false,
|
||||||
OnSelected = OpenCampaignManagementAsync
|
OnSelected = OpenCampaignManagementAsync
|
||||||
},
|
},
|
||||||
new AppHeaderMenuItem
|
new()
|
||||||
{
|
{
|
||||||
Label = "Admin",
|
Label = "Admin",
|
||||||
IsActive = true,
|
IsActive = true,
|
||||||
|
|||||||
@@ -139,12 +139,14 @@ public partial class Workspace : IAsyncDisposable
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (State.IsCurrentUserAdmin)
|
if (State.IsCurrentUserAdmin)
|
||||||
|
{
|
||||||
items.Add(new()
|
items.Add(new()
|
||||||
{
|
{
|
||||||
Label = "Admin",
|
Label = "Admin",
|
||||||
IsActive = State.IsAdminScreen,
|
IsActive = State.IsAdminScreen,
|
||||||
OnSelected = () => Session.SwitchScreenAsync(ScreenAdmin)
|
OnSelected = () => Session.SwitchScreenAsync(ScreenAdmin)
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return items;
|
return items;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,9 +92,7 @@ public static partial class DiceRules
|
|||||||
|
|
||||||
var isOpenEnded = match.Groups["openEnded"].Success;
|
var isOpenEnded = match.Groups["openEnded"].Success;
|
||||||
if (isOpenEnded && (diceCount != 1 || sides != 100))
|
if (isOpenEnded && (diceCount != 1 || sides != 100))
|
||||||
{
|
|
||||||
return ServiceResult<DiceExpression>.Failure("invalid_expression", "Open-ended Rolemaster rolls must use d100! with an implicit or explicit dice count of 1.");
|
return ServiceResult<DiceExpression>.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 countPrefix = diceCount == 1 ? string.Empty : diceCount.ToString();
|
||||||
var canonical = $"{countPrefix}d{sides}{(isOpenEnded ? "!" : string.Empty)}{FormatModifier(modifier)}";
|
var canonical = $"{countPrefix}d{sides}{(isOpenEnded ? "!" : string.Empty)}{FormatModifier(modifier)}";
|
||||||
|
|||||||
Reference in New Issue
Block a user