Lightless-Sync/LightlessClient
8
1
Fork 2
Code Issues 2 Pull Requests 3 Actions Packages Projects Releases 57 Wiki Activity

pair-notifs-ui #58

Merged
choco merged 3 commits from pair-notifs-ui into 1.12.2 2025-10-11 22:05:53 +00:00
Conversation 0 Commits 3 Files Changed 8 +3 -4
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3936cbd439 - Show all commits

5
LightlessSync/Services/PairRequestService.cs
View File

@@ -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}.",

2
LightlessSync/WebAPI/SignalR/ApiController.Functions.Callbacks.cs
View File

@@ -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;