diff --git a/package.json b/package.json index ca077336..b27e6206 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "@sentry/node": "^7.17.2", "@sentry/tracing": "^7.17.2", "@sinclair/typebox": "0.32.34", - "@the-draupnir-project/interface-manager": "2.4.1", + "@the-draupnir-project/interface-manager": "2.5.0", "@the-draupnir-project/matrix-basic-types": "^0.2.0", "await-lock": "^2.2.2", "better-sqlite3": "^9.4.3", diff --git a/src/safemode/RecoveryOptions.tsx b/src/safemode/RecoveryOptions.tsx index 07e10f93..d0452f14 100644 --- a/src/safemode/RecoveryOptions.tsx +++ b/src/safemode/RecoveryOptions.tsx @@ -26,17 +26,22 @@ export function renderRecoveryOptions(cause: SafeModeCause): DocumentNode { } return ( - Recovery options are available for this failure mode: -
    - {recoveryOptions.map((option) => ( -
  1. {option.description}
  2. - ))} -
- To use a recovery option, click on one of the reactions ( - {recoveryOptions - .map((_, index) => MatrixReactionHandler.numberToEmoji(index + 1)) - .join(", ")} - ), or use the recover command: !draupnir recover 1. +

+ Recovery options are available for this failure mode: +

    + {recoveryOptions.map((option) => ( +
  1. {option.description}
  2. + ))} +
+

+
+

+ To use a recovery option, click on one of the reactions ( + {recoveryOptions + .map((_, index) => MatrixReactionHandler.numberToEmoji(index + 1)) + .join(", ")} + ), or use the recover command: !draupnir recover 1. +

); } diff --git a/src/safemode/commands/StatusCommand.tsx b/src/safemode/commands/StatusCommand.tsx index bae25de4..7457bca8 100644 --- a/src/safemode/commands/StatusCommand.tsx +++ b/src/safemode/commands/StatusCommand.tsx @@ -38,9 +38,11 @@ function renderSafeModeCauseError(error: ResultError): DocumentNode { if (error instanceof ActionException) { return ( - Draupnir is in safe mode because Draupnir failed to start. +

Draupnir is in safe mode because Draupnir failed to start.

- {error.mostRelevantElaboration} + + {error.mostRelevantElaboration} + Details can be found by providing the reference{" "} {error.uuid} to an administrator. @@ -53,7 +55,9 @@ function renderSafeModeCauseError(error: ResultError): DocumentNode { Draupnir is in safe mode because Draupnir failed to start.
- {error.mostRelevantElaboration} + + {error.mostRelevantElaboration} +
{error.toReadableString()}
@@ -86,12 +90,12 @@ export function renderSafeModeStatusInfo( ): DocumentNode { return ( - ⚠️ Draupnir is in safe mode ⚠️ -
+

+ ⚠️ Draupnir is in safe mode ⚠️ +

{renderSafeModeCause(info.safeModeCause)} -
{renderRecoveryOptions(info.safeModeCause)} -
+
{StandardPersistentConfigRenderer.renderAdaptorStatus(info.configStatus)} Version: {info.version} diff --git a/yarn.lock b/yarn.lock index 37d24b73..bfa36dbe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -256,10 +256,10 @@ resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e" integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA== -"@the-draupnir-project/interface-manager@2.4.1": - version "2.4.1" - resolved "https://registry.yarnpkg.com/@the-draupnir-project/interface-manager/-/interface-manager-2.4.1.tgz#fc93eac495cf89fee0c87786b405a2fbae826b49" - integrity sha512-7L9QzsH/BAgdPSoNaB78ENJKAqbD4sqA0J7LmAUDiM7ygLS1yVrrI2VRN9aCdguVcbuD//fnOCJhSlfL2vr6YQ== +"@the-draupnir-project/interface-manager@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@the-draupnir-project/interface-manager/-/interface-manager-2.5.0.tgz#5a41cbbb62d890fb2d539483d046750ef36d4944" + integrity sha512-J7h19l5uejb7eniOL8Uz+ByvLrIfiFQNrPJON7nJRGpnQ2oqZIEqic5f186zSWwEOlE2KhNFAz6bfOiQJDm5qg== dependencies: "@gnuxie/super-cool-stream" "^0.2.1" "@gnuxie/typescript-result" "^1.0.0"