remove unncessary sha1 dictionary, use new notification management
This commit is contained in:
@@ -129,7 +129,7 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
|
|||||||
var msg = !string.IsNullOrEmpty(note)
|
var msg = !string.IsNullOrEmpty(note)
|
||||||
? $"{note} ({pair.UserData.AliasOrUID}) is now online"
|
? $"{note} ({pair.UserData.AliasOrUID}) is now online"
|
||||||
: $"{pair.UserData.AliasOrUID} is now online";
|
: $"{pair.UserData.AliasOrUID} is now online";
|
||||||
Mediator.Publish(new NotificationMessage("User online", msg, NotificationType.Info, 5000));
|
Mediator.Publish(new NotificationMessage("User online", msg, NotificationType.Info, TimeSpan.FromSeconds(5)));
|
||||||
}
|
}
|
||||||
|
|
||||||
pair.CreateCachedPlayer(dto);
|
pair.CreateCachedPlayer(dto);
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ public record RemoveWatchedGameObjectHandler(GameObjectHandler Handler) : Messag
|
|||||||
public record HaltScanMessage(string Source) : MessageBase;
|
public record HaltScanMessage(string Source) : MessageBase;
|
||||||
public record ResumeScanMessage(string Source) : MessageBase;
|
public record ResumeScanMessage(string Source) : MessageBase;
|
||||||
public record NotificationMessage
|
public record NotificationMessage
|
||||||
(string Title, string Message, NotificationType Type, uint TimeShownOnScreen = 3000) : MessageBase;
|
(string Title, string Message, NotificationType Type, TimeSpan? TimeShownOnScreen = null) : MessageBase;
|
||||||
public record CreateCacheForObjectMessage(GameObjectHandler ObjectToCreateFor) : MessageBase;
|
public record CreateCacheForObjectMessage(GameObjectHandler ObjectToCreateFor) : MessageBase;
|
||||||
public record ClearCacheForObjectMessage(GameObjectHandler ObjectToCreateFor) : MessageBase;
|
public record ClearCacheForObjectMessage(GameObjectHandler ObjectToCreateFor) : MessageBase;
|
||||||
public record CharacterDataCreatedMessage(CharacterData CharacterData) : SameThreadMessage;
|
public record CharacterDataCreatedMessage(CharacterData CharacterData) : SameThreadMessage;
|
||||||
|
|||||||
@@ -108,12 +108,13 @@ public class NotificationService : DisposableMediatorSubscriberBase
|
|||||||
|
|
||||||
private void ShowToast(NotificationMessage msg)
|
private void ShowToast(NotificationMessage msg)
|
||||||
{
|
{
|
||||||
var notification = new Notification{
|
_notificationManager.AddNotification(new Dalamud.Interface.ImGuiNotification.Notification()
|
||||||
|
{
|
||||||
Content = msg.Message ?? string.Empty,
|
Content = msg.Message ?? string.Empty,
|
||||||
Title = "[LoporritSync] " + msg.Title,
|
Title = msg.Title,
|
||||||
Type = msg.Type,
|
Type = msg.Type,
|
||||||
InitialDuration = TimeSpan.FromMilliseconds(msg.TimeShownOnScreen)
|
Minimized = false,
|
||||||
};
|
InitialDuration = msg.TimeShownOnScreen ?? TimeSpan.FromSeconds(3)
|
||||||
_notificationManager.AddNotification(notification);
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -56,7 +56,7 @@ public class PluginWarningNotificationService
|
|||||||
{
|
{
|
||||||
_mediator.Publish(new NotificationMessage("Missing plugins for " + playerName,
|
_mediator.Publish(new NotificationMessage("Missing plugins for " + playerName,
|
||||||
$"Received data for {playerName} that contained information for plugins you have not installed. Install {string.Join(", ", missingPluginsForData)} to experience their character fully.",
|
$"Received data for {playerName} that contained information for plugins you have not installed. Install {string.Join(", ", missingPluginsForData)} to experience their character fully.",
|
||||||
NotificationType.Warning, 10000));
|
NotificationType.Warning, TimeSpan.FromSeconds(10)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -95,11 +95,11 @@ public partial class ApiController
|
|||||||
switch (messageSeverity)
|
switch (messageSeverity)
|
||||||
{
|
{
|
||||||
case MessageSeverity.Error:
|
case MessageSeverity.Error:
|
||||||
Mediator.Publish(new NotificationMessage("Warning from " + _serverManager.CurrentServer!.ServerName, message, NotificationType.Error, 7500));
|
Mediator.Publish(new NotificationMessage("Warning from " + _serverManager.CurrentServer!.ServerName, message, NotificationType.Error, TimeSpan.FromSeconds(7.5)));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MessageSeverity.Warning:
|
case MessageSeverity.Warning:
|
||||||
Mediator.Publish(new NotificationMessage("Warning from " + _serverManager.CurrentServer!.ServerName, message, NotificationType.Warning, 7500));
|
Mediator.Publish(new NotificationMessage("Warning from " + _serverManager.CurrentServer!.ServerName, message, NotificationType.Warning, TimeSpan.FromSeconds(7.5)));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MessageSeverity.Information:
|
case MessageSeverity.Information:
|
||||||
@@ -108,7 +108,7 @@ public partial class ApiController
|
|||||||
_doNotNotifyOnNextInfo = false;
|
_doNotNotifyOnNextInfo = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
Mediator.Publish(new NotificationMessage("Info from " + _serverManager.CurrentServer!.ServerName, message, NotificationType.Info, 5000));
|
Mediator.Publish(new NotificationMessage("Info from " + _serverManager.CurrentServer!.ServerName, message, NotificationType.Info, TimeSpan.FromSeconds(5)));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -194,7 +194,7 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM
|
|||||||
$"Your client is outdated ({currentClientVer.Major}.{currentClientVer.Minor}.{currentClientVer.Build}), current is: " +
|
$"Your client is outdated ({currentClientVer.Major}.{currentClientVer.Minor}.{currentClientVer.Build}), current is: " +
|
||||||
$"{_connectionDto.CurrentClientVersion.Major}.{_connectionDto.CurrentClientVersion.Minor}.{_connectionDto.CurrentClientVersion.Build}. " +
|
$"{_connectionDto.CurrentClientVersion.Major}.{_connectionDto.CurrentClientVersion.Minor}.{_connectionDto.CurrentClientVersion.Build}. " +
|
||||||
$"Please keep your Loporrit client up-to-date.",
|
$"Please keep your Loporrit client up-to-date.",
|
||||||
NotificationType.Warning));
|
NotificationType.Warning, TimeSpan.FromSeconds(15)));
|
||||||
}
|
}
|
||||||
|
|
||||||
await LoadIninitialPairs().ConfigureAwait(false);
|
await LoadIninitialPairs().ConfigureAwait(false);
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public class ForeverRetryPolicy : IRetryPolicy
|
|||||||
{
|
{
|
||||||
if (!_sentDisconnected)
|
if (!_sentDisconnected)
|
||||||
{
|
{
|
||||||
_mediator.Publish(new NotificationMessage("Connection lost", "Connection lost to server", NotificationType.Warning, 5000));
|
_mediator.Publish(new NotificationMessage("Connection lost", "Connection lost to server", NotificationType.Warning, TimeSpan.FromSeconds(10)));
|
||||||
_mediator.Publish(new DisconnectedMessage());
|
_mediator.Publish(new DisconnectedMessage());
|
||||||
}
|
}
|
||||||
_sentDisconnected = true;
|
_sentDisconnected = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user