From 2ceb4825c45876a4a75c410557d14cd8beb76222 Mon Sep 17 00:00:00 2001 From: Rory& Date: Mon, 3 Feb 2025 19:08:38 +0100 Subject: Various cleanup, rewrite history viewer --- MatrixUtils.Web/Classes/RMUStorageWrapper.cs | 13 +++++++++++-- .../RoomCreationTemplates/DefaultRoomCreationTemplate.cs | 1 - 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'MatrixUtils.Web/Classes') diff --git a/MatrixUtils.Web/Classes/RMUStorageWrapper.cs b/MatrixUtils.Web/Classes/RMUStorageWrapper.cs index 45028ba..337c7e4 100644 --- a/MatrixUtils.Web/Classes/RMUStorageWrapper.cs +++ b/MatrixUtils.Web/Classes/RMUStorageWrapper.cs @@ -47,12 +47,21 @@ public class RMUStorageWrapper(ILogger logger, TieredStorageS return null; } - return await homeserverProviderService.GetAuthenticatedWithToken(token.Homeserver, token.AccessToken, token.Proxy); + return await GetSession(token); } public async Task GetSession(UserAuth userAuth) { logger.LogTrace("Getting session."); - return await homeserverProviderService.GetAuthenticatedWithToken(userAuth.Homeserver, userAuth.AccessToken, userAuth.Proxy); + AuthenticatedHomeserverGeneric hs; + try { + hs = await homeserverProviderService.GetAuthenticatedWithToken(userAuth.Homeserver, userAuth.AccessToken, userAuth.Proxy); + } + catch (Exception e) { + logger.LogError("Failed to get info for {0} via {1}: {2}", userAuth.UserId, userAuth.Homeserver, e); + logger.LogError("Continuing with server-less session"); + hs = await homeserverProviderService.GetAuthenticatedWithToken(userAuth.Homeserver, userAuth.AccessToken, userAuth.Proxy, useGeneric: true, enableServer: false); + } + return hs; } public async Task GetCurrentSessionOrNavigate() { diff --git a/MatrixUtils.Web/Classes/RoomCreationTemplates/DefaultRoomCreationTemplate.cs b/MatrixUtils.Web/Classes/RoomCreationTemplates/DefaultRoomCreationTemplate.cs index 75d9e16..7078308 100644 --- a/MatrixUtils.Web/Classes/RoomCreationTemplates/DefaultRoomCreationTemplate.cs +++ b/MatrixUtils.Web/Classes/RoomCreationTemplates/DefaultRoomCreationTemplate.cs @@ -1,6 +1,5 @@ using System.Text.Json.Nodes; using LibMatrix; -using LibMatrix.EventTypes.Spec.State; using LibMatrix.EventTypes.Spec.State.RoomInfo; using LibMatrix.Responses; -- cgit 1.5.1