diff --git a/LightlessSync/Services/PairRequestService.cs b/LightlessSync/Services/PairRequestService.cs index 9d87244..92294e2 100644 --- a/LightlessSync/Services/PairRequestService.cs +++ b/LightlessSync/Services/PairRequestService.cs @@ -187,7 +187,7 @@ public sealed class PairRequestService : DisposableMediatorSubscriberBase return _requests.RemoveAll(r => now - r.ReceivedAt > Expiration) > 0; } - public void AcceptPairRequest(string hashedCid) + public void AcceptPairRequest(string hashedCid, string displayName) { _ = Task.Run(async () => { @@ -196,8 +196,7 @@ public sealed class PairRequestService : DisposableMediatorSubscriberBase await _apiController.Value.TryPairWithContentId(hashedCid).ConfigureAwait(false); RemoveRequest(hashedCid); - var display = ResolveDisplayName(hashedCid); - var displayText = string.IsNullOrEmpty(display) ? hashedCid : display; + var displayText = string.IsNullOrEmpty(displayName) ? hashedCid : displayName; Mediator.Publish(new NotificationMessage( "Pair request accepted", $"Sent a pair request back to {displayText}.", diff --git a/LightlessSync/WebAPI/SignalR/ApiController.Functions.Callbacks.cs b/LightlessSync/WebAPI/SignalR/ApiController.Functions.Callbacks.cs index e3c1fbc..090539b 100644 --- a/LightlessSync/WebAPI/SignalR/ApiController.Functions.Callbacks.cs +++ b/LightlessSync/WebAPI/SignalR/ApiController.Functions.Callbacks.cs @@ -116,7 +116,7 @@ public partial class ApiController _lightlessNotificationService.ShowPairRequestNotification( senderName, request.HashedCid, - onAccept: () => _pairRequestService.AcceptPairRequest(request.HashedCid), + onAccept: () => _pairRequestService.AcceptPairRequest(request.HashedCid, senderName), onDecline: () => _pairRequestService.DeclinePairRequest(request.HashedCid)); return Task.CompletedTask;