Updated nuget packages

GrillBot · Feb 25, 2024 · ac56329 · ac56329
1 parent 693c8c7
commit ac56329
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 45 deletions.
diff --git a/src/GrillBot.App/Actions/Api/V1/UserMeasures/CreateUserMeasuresWarning.cs b/src/GrillBot.App/Actions/Api/V1/UserMeasures/CreateUserMeasuresWarning.cs
@@ -38,6 +38,6 @@ private async Task ProcessAsync(CreateUserMeasuresWarningParams parameters)
         var moderatorId = ApiContext.GetUserId().ToString();
         var payload = new MemberWarningPayload(DateTime.UtcNow, parameters.Message, parameters.GuildId, moderatorId, parameters.UserId);
 
-        await RabbitMQ.PublishAsync(MemberWarningPayload.QueueName, payload);
+        await RabbitMQ.PublishAsync(payload);
     }
 }
diff --git a/src/GrillBot.App/Actions/RabbitMQPublisherAction.cs b/src/GrillBot.App/Actions/RabbitMQPublisherAction.cs
@@ -1,5 +1,6 @@
 using GrillBot.Common.Models;
 using GrillBot.Core.Infrastructure.Actions;
+using GrillBot.Core.RabbitMQ;
 using GrillBot.Core.RabbitMQ.Publisher;
 
 namespace GrillBot.App.Actions;
@@ -15,10 +16,7 @@ public RabbitMQPublisherAction(ApiRequestContext apiContext, IRabbitMQPublisher
 
     public override async Task<ApiResult> ProcessAsync()
     {
-        var queueName = (string)Parameters[0]!;
-        var payload = Parameters[1];
-
-        await Publisher.PublishAsync(queueName, payload);
+        await Publisher.PublishAsync((IPayload)Parameters[0]!);
         return ApiResult.Ok();
     }
 }
diff --git a/src/GrillBot.App/Controllers/PointsController.cs b/src/GrillBot.App/Controllers/PointsController.cs
@@ -120,10 +120,7 @@ public async Task<IActionResult> ServiceTransferPointsAsync(ulong guildId, ulong
     [Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme, Roles = "Admin")]
     [ProducesResponseType(StatusCodes.Status200OK)]
     public async Task<IActionResult> DeleteTransactionAsync(string guildId, string messageId, string? reactionId)
-    {
-        var payload = new DeleteTransactionsPayload(guildId, messageId, reactionId);
-        return await ProcessAsync<RabbitMQPublisherAction>(DeleteTransactionsPayload.QueueName, payload);
-    }
+        => await ProcessAsync<RabbitMQPublisherAction>(new DeleteTransactionsPayload(guildId, messageId, reactionId));
 
     /// <summary>
     /// Gets paginated list of users.

diff --git a/src/GrillBot.App/Managers/Points/PointsManager.cs b/src/GrillBot.App/Managers/Points/PointsManager.cs
@@ -1,4 +1,4 @@
-using GrillBot.Common.Extensions.RabbitMQ;
+using GrillBot.Core.RabbitMQ;
 using GrillBot.Core.RabbitMQ.Publisher;
 
 namespace GrillBot.App.Managers.Points;
@@ -35,7 +35,8 @@ public PointsManager(PointsSynchronizationManager synchronizationManager, Points
 
     #region Push
 
-    public Task PushPayloadAsync<TPayload>(TPayload payload) => _rabbitPublisher.PushAsync(payload);
+    public Task PushPayloadAsync<TPayload>(TPayload payload) where TPayload : IPayload
+        => _rabbitPublisher.PublishAsync(payload);
 
     #endregion
 }
diff --git a/src/GrillBot.App/Managers/Points/PointsSynchronizationManager.cs b/src/GrillBot.App/Managers/Points/PointsSynchronizationManager.cs
@@ -1,5 +1,4 @@
 using GrillBot.Common.Extensions.Discord;
-using GrillBot.Common.Extensions.RabbitMQ;
 using GrillBot.Core.RabbitMQ.Publisher;
 using GrillBot.Database.Enums;
 using PointsModels = GrillBot.Core.Services.PointsService.Models;
@@ -51,6 +50,6 @@ public async Task PushAsync(IGuild guild, IEnumerable<IUser> users, IEnumerable<
         }
 
         var payload = new PointsModels.Events.SynchronizationPayload(guild.Id.ToString(), channelInfos, userInfos);
-        await _rabbitPublisher.PushAsync(payload);
+        await _rabbitPublisher.PublishAsync(payload);
     }
 }
diff --git a/src/GrillBot.App/Managers/UnverifyRabbitMQManager.cs b/src/GrillBot.App/Managers/UnverifyRabbitMQManager.cs
@@ -15,10 +15,7 @@ public UnverifyRabbitMQManager(IRabbitMQPublisher rabbitMQ)
     }
 
     public Task SendModifyAsync(long logSetId, DateTime newEnd)
-    {
-        var payload = new UnverifyModifyPayload(logSetId, newEnd);
-        return RabbitMQ.PublishAsync(UnverifyModifyPayload.QueueName, payload);
-    }
+        => RabbitMQ.PublishAsync(new UnverifyModifyPayload(logSetId, newEnd));
 
     public async Task SendUnverifyAsync(UnverifyUserProfile profile, UnverifyLog unverifyLog)
     {
@@ -32,6 +29,6 @@ public async Task SendUnverifyAsync(UnverifyUserProfile profile, UnverifyLog unv
             unverifyLog.Id
         );
 
-        await RabbitMQ.PublishAsync(UnverifyPayload.QueueName, payload);
+        await RabbitMQ.PublishAsync(payload);
     }
 }
diff --git a/src/GrillBot.Common/Extensions/RabbitMQ/RabbitMQPublisherExtensions.cs b/src/GrillBot.Common/Extensions/RabbitMQ/RabbitMQPublisherExtensions.cs
diff --git a/src/GrillBot.Common/GrillBot.Common.csproj b/src/GrillBot.Common/GrillBot.Common.csproj
@@ -19,8 +19,8 @@
 	<ItemGroup>
 		<PackageReference Include="CircularBuffer" Version="1.4.0" />
 		<PackageReference Include="Discord.Net" Version="3.13.1" />
-		<PackageReference Include="GrillBot.Core.RabbitMQ" Version="1.0.4" />
-		<PackageReference Include="GrillBot.Core.Services" Version="1.6.4" />
+		<PackageReference Include="GrillBot.Core.RabbitMQ" Version="1.0.5" />
+		<PackageReference Include="GrillBot.Core.Services" Version="1.6.5" />
 		<PackageReference Include="Humanizer.Core.cs" Version="2.14.1" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
 		<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />