From f389bed4e1a803deb937ce753a30a6eb747f9b31 Mon Sep 17 00:00:00 2001 From: rootdarkarchon Date: Sat, 4 Feb 2023 02:07:51 +0100 Subject: [PATCH] do not publish notify from server on reconnect --- MareSynchronos/MareSynchronos.csproj | 2 +- MareSynchronos/WebAPI/ApiController.Functions.Callbacks.cs | 5 +++++ MareSynchronos/WebAPI/ApiController.cs | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj index fc213d9..5a7a726 100644 --- a/MareSynchronos/MareSynchronos.csproj +++ b/MareSynchronos/MareSynchronos.csproj @@ -3,7 +3,7 @@ - 0.7.16 + 0.7.17 https://github.com/Penumbra-Sync/client diff --git a/MareSynchronos/WebAPI/ApiController.Functions.Callbacks.cs b/MareSynchronos/WebAPI/ApiController.Functions.Callbacks.cs index 32067cb..b9c6ca2 100644 --- a/MareSynchronos/WebAPI/ApiController.Functions.Callbacks.cs +++ b/MareSynchronos/WebAPI/ApiController.Functions.Callbacks.cs @@ -261,6 +261,11 @@ public partial class ApiController Mediator.Publish(new NotificationMessage("Warning from " + _serverManager.CurrentServer!.ServerName, message, NotificationType.Warning, 7500)); break; case MessageSeverity.Information: + if (_doNotNotifiyOnNextInfo) + { + _doNotNotifiyOnNextInfo = false; + break; + } Mediator.Publish(new NotificationMessage("Info from " + _serverManager.CurrentServer!.ServerName, message, NotificationType.Info, 5000)); break; } diff --git a/MareSynchronos/WebAPI/ApiController.cs b/MareSynchronos/WebAPI/ApiController.cs index 39d4dea..ec48cef 100644 --- a/MareSynchronos/WebAPI/ApiController.cs +++ b/MareSynchronos/WebAPI/ApiController.cs @@ -32,6 +32,7 @@ public partial class ApiController : MediatorSubscriberBase, IDisposable, IMareH private CancellationTokenSource? _uploadCancellationTokenSource = new(); private CancellationTokenSource? _healthCheckTokenSource = new(); + private bool _doNotNotifiyOnNextInfo = false; private ConnectionDto? _connectionDto; public ServerInfo ServerInfo => _connectionDto?.ServerInfo ?? new ServerInfo(); @@ -347,6 +348,7 @@ public partial class ApiController : MediatorSubscriberBase, IDisposable, IMareH private Task MareHubOnReconnecting(Exception? arg) { + _doNotNotifiyOnNextInfo = true; _healthCheckTokenSource?.Cancel(); ServerState = ServerState.Reconnecting; Mediator.Publish(new NotificationMessage("Connection lost", "Connection lost to " + _serverManager.CurrentServer!.ServerName, NotificationType.Warning, 5000));