fixed merge conflicts

code/Infrastructure/Verticals/DownloadClient/Deluge/DelugeService.cs

@@ -35,10 +35,10 @@ public class DelugeService : DownloadService, IDelugeService
         IStriker striker,
         INotificationPublisher notifier,
         IDryRunInterceptor dryRunInterceptor,
-        IHardlinkFileService hardlinkFileService
+        IHardLinkFileService hardLinkFileService
     ) : base(
         logger, queueCleanerConfig, contentBlockerConfig, downloadCleanerConfig, cache,
-        filenameEvaluator, striker, notifier, dryRunInterceptor, hardlinkFileService
+        filenameEvaluator, striker, notifier, dryRunInterceptor, hardLinkFileService
     )
     {
         config.Value.Validate();
@@ -252,7 +252,7 @@ public class DelugeService : DownloadService, IDelugeService
                 continue;
             }
 
-            await _dryRunInterceptor.InterceptAsync(DeleteDownload, download.Hash);
+            await _dryRunInterceptor.InterceptAsync(DeleteDownloadAsync, download.Hash);
 
             _logger.LogInformation(
                 "download cleaned | {reason} reached | {name}",

code/Infrastructure/Verticals/DownloadClient/DownloadService.cs

@@ -32,7 +32,7 @@ public abstract class DownloadService : IDownloadService
     protected readonly MemoryCacheEntryOptions _cacheOptions;
     protected readonly INotificationPublisher _notifier;
     protected readonly IDryRunInterceptor _dryRunInterceptor;
-    protected readonly IHardlinkFileService _hardlinkFileService;
+    protected readonly IHardLinkFileService _hardLinkFileService;
 
     protected DownloadService(
         ILogger<DownloadService> logger,
@@ -44,7 +44,7 @@ public abstract class DownloadService : IDownloadService
         IStriker striker,
         INotificationPublisher notifier,
         IDryRunInterceptor dryRunInterceptor,
-        IHardlinkFileService hardlinkFileService
+        IHardLinkFileService hardLinkFileService
     )
     {
         _logger = logger;
@@ -56,7 +56,7 @@ public abstract class DownloadService : IDownloadService
         _striker = striker;
         _notifier = notifier;
         _dryRunInterceptor = dryRunInterceptor;
-        _hardlinkFileService = hardlinkFileService;
+        _hardLinkFileService = hardLinkFileService;
         _cacheOptions = new MemoryCacheEntryOptions()
             .SetSlidingExpiration(StaticConfiguration.TriggerValue + Constants.CacheLimitBuffer);
     }

code/Infrastructure/Verticals/DownloadClient/DummyDownloadService.cs

@@ -26,10 +26,10 @@ public class DummyDownloadService : DownloadService
         IStriker striker,
         NotificationPublisher notifier,
         IDryRunInterceptor dryRunInterceptor,
-        IHardlinkFileService hardlinkFileService
+        IHardLinkFileService hardLinkFileService
     ) : base(
         logger, queueCleanerConfig, contentBlockerConfig, downloadCleanerConfig,
-        cache, filenameEvaluator, striker, notifier, dryRunInterceptor, hardlinkFileService
+        cache, filenameEvaluator, striker, notifier, dryRunInterceptor, hardLinkFileService
     )
     {
     }

code/Infrastructure/Verticals/DownloadClient/QBittorrent/QBitService.cs

@@ -38,10 +38,10 @@ public class QBitService : DownloadService, IQBitService
         IStriker striker,
         INotificationPublisher notifier,
         IDryRunInterceptor dryRunInterceptor,
-        IHardlinkFileService hardlinkFileService
+        IHardLinkFileService hardLinkFileService
     ) : base(
         logger, queueCleanerConfig, contentBlockerConfig, downloadCleanerConfig, cache,
-        filenameEvaluator, striker, notifier, dryRunInterceptor, hardlinkFileService
+        filenameEvaluator, striker, notifier, dryRunInterceptor, hardLinkFileService
     )
     {
         _config = config.Value;
@@ -286,7 +286,7 @@ public class QBitService : DownloadService, IQBitService
                 continue;
             }
 
-            await _dryRunInterceptor.InterceptAsync(DeleteDownload, download.Hash);
+            await _dryRunInterceptor.InterceptAsync(DeleteDownloadAsync, download.Hash);
 
             _logger.LogInformation(
                 "download cleaned | {reason} reached | {name}",
@@ -404,7 +404,7 @@ public class QBitService : DownloadService, IQBitService
                 continue;
             }
             
-            await ((QBitService)Proxy).ChangeCategory(download.Hash, _downloadCleanerConfig.NoHardLinksCategory);
+            await _dryRunInterceptor.InterceptAsync(ChangeCategory, download.Hash, _downloadCleanerConfig.NoHardLinksCategory);
             
             _logger.LogInformation("category changed for {name}", download.Name);
             

code/Infrastructure/Verticals/DownloadClient/Transmission/TransmissionService.cs

@@ -40,10 +40,10 @@ public class TransmissionService : DownloadService, ITransmissionService
         IStriker striker,
         INotificationPublisher notifier,
         IDryRunInterceptor dryRunInterceptor,
-        IHardlinkFileService hardlinkFileService
+        IHardLinkFileService hardLinkFileService
     ) : base(
         logger, queueCleanerConfig, contentBlockerConfig, downloadCleanerConfig, cache,
-        filenameEvaluator, striker, notifier, dryRunInterceptor, hardlinkFileService
+        filenameEvaluator, striker, notifier, dryRunInterceptor, hardLinkFileService
     )
     {
         _config = config.Value;

code/Infrastructure/Verticals/Notifications/INotificationPublisher.cs

@@ -9,4 +9,6 @@ public interface INotificationPublisher
     Task NotifyQueueItemDeleted(bool removeFromClient, DeleteReason reason);
     
     Task NotifyDownloadCleaned(double ratio, TimeSpan seedingTime, string categoryName, CleanReason reason);
+
+    Task NotifyCategoryChanged(string oldCategory, string newCategory);
 }

code/Infrastructure/Verticals/Notifications/NotificationPublisher.cs

@@ -48,10 +48,10 @@ public class NotificationPublisher : INotificationPublisher
             switch (strikeType)
             {
                 case StrikeType.Stalled:
-                    await _dryRunInterceptor.InterceptAsync(Notify<StalledStrikeNotification>, notification.Adapt<StalledStrikeNotification>());
+                    await NotifyInternal(notification.Adapt<StalledStrikeNotification>());
                     break;
                 case StrikeType.ImportFailed:
-                    await _dryRunInterceptor.InterceptAsync(Notify<FailedImportStrikeNotification>, notification.Adapt<FailedImportStrikeNotification>());
+                    await NotifyInternal(notification.Adapt<FailedImportStrikeNotification>());
                     break;
             }
         }
@@ -79,7 +79,7 @@ public class NotificationPublisher : INotificationPublisher
             Fields = [new() { Title = "Removed from download client?", Text = removeFromClient ? "Yes" : "No" }]
         };
         
-        await _dryRunInterceptor.InterceptAsync(Notify<QueueItemDeletedNotification>, notification);
+        await NotifyInternal(notification);
     }
 
     public virtual async Task NotifyDownloadCleaned(double ratio, TimeSpan seedingTime, string categoryName, CleanReason reason)
@@ -98,15 +98,9 @@ public class NotificationPublisher : INotificationPublisher
             Level = NotificationLevel.Important
         };
 
-        await _dryRunInterceptor.InterceptAsync(Notify<DownloadCleanedNotification>, notification);
+        await NotifyInternal(notification);
     }
-
-    [DryRunSafeguard]
-    private Task Notify<T>(T message) where T: notnull
-    {
-        return _messageBus.Publish(message);
-    }
-
+    
     [DryRunSafeguard]
     public virtual async Task NotifyCategoryChanged(string oldCategory, string newCategory)
     {
@@ -126,6 +120,17 @@ public class NotificationPublisher : INotificationPublisher
         await _messageBus.Publish(notification);
     }
     
+    private Task NotifyInternal<T>(T message) where T: notnull
+    {
+        return _dryRunInterceptor.InterceptAsync(Notify<T>, message);
+    }
+
+    [DryRunSafeguard]
+    private Task Notify<T>(T message) where T: notnull
+    {
+        return _messageBus.Publish(message);
+    }
+    
     private static Uri GetImageFromContext(QueueRecord record, InstanceType instanceType) =>
         instanceType switch
         {