messaging changes

sphexator · Jan 3, 2025 · 6e5c711 · 6e5c711
1 parent a561d78
commit 6e5c711
Show file tree

Hide file tree

Showing 26 changed files with 74 additions and 69 deletions.
diff --git a/Hanekawa.Application/Contracts/Discord/Common/Ban.cs b/Hanekawa.Application/Contracts/Discord/Common/Ban.cs
@@ -3,7 +3,7 @@
 
 namespace Hanekawa.Application.Contracts.Discord.Common;
 
-public record Ban : ISqs
+public record Ban : IMessageSqs
 {
 	public ulong GuildId { get; init; }
 	public ulong UserId { get; init; }

diff --git a/Hanekawa.Application/Contracts/Discord/Common/Kick.cs b/Hanekawa.Application/Contracts/Discord/Common/Kick.cs
@@ -3,7 +3,7 @@
 
 namespace Hanekawa.Application.Contracts.Discord.Common;
 
-public class Kick : ISqs
+public class Kick : IMessageSqs
 {
 	public ulong GuildId { get; init; }
 	public ulong UserId { get; init; }

diff --git a/Hanekawa.Application/Contracts/Discord/Common/Mute.cs b/Hanekawa.Application/Contracts/Discord/Common/Mute.cs
@@ -3,7 +3,7 @@
 
 namespace Hanekawa.Application.Contracts.Discord.Common;
 
-public class Mute : ISqs
+public class Mute : IMessageSqs
 {
 	public ulong GuildId { get; init; }
 	public ulong UserId { get; init; }

diff --git a/Hanekawa.Application/Contracts/Discord/Common/Prune.cs b/Hanekawa.Application/Contracts/Discord/Common/Prune.cs
@@ -3,7 +3,7 @@
 
 namespace Hanekawa.Application.Contracts.Discord.Common;
 
-public class Prune : ISqs
+public class Prune : IMessageSqs
 {
 	public ulong GuildId { get; init; }
 	public ulong UserId { get; init; }

diff --git a/Hanekawa.Application/Contracts/Discord/Common/Unban.cs b/Hanekawa.Application/Contracts/Discord/Common/Unban.cs
@@ -3,7 +3,7 @@
 
 namespace Hanekawa.Application.Contracts.Discord.Common;
 
-public class Unban : ISqs
+public class Unban : IMessageSqs
 {
 	public ulong GuildId { get; init; }
 	public ulong UserId { get; init; }

diff --git a/Hanekawa.Application/Contracts/Discord/Common/Unmute.cs b/Hanekawa.Application/Contracts/Discord/Common/Unmute.cs
@@ -3,7 +3,7 @@
 
 namespace Hanekawa.Application.Contracts.Discord.Common;
 
-public class Unmute : ISqs
+public class Unmute : IMessageSqs
 {
 	public ulong GuildId { get; init; }
 	public ulong UserId { get; init; }

diff --git a/Hanekawa.Application/Contracts/Discord/Services/BotLeave.cs b/Hanekawa.Application/Contracts/Discord/Services/BotLeave.cs
@@ -2,4 +2,4 @@
 
 namespace Hanekawa.Application.Contracts.Discord.Services;
 
-public record BotLeave(ulong GuildId) : ISqs<bool>;
+public record BotLeave(ulong GuildId) : INotificationSqs;
diff --git a/Hanekawa.Application/Contracts/Discord/Services/MessageDeleted.cs b/Hanekawa.Application/Contracts/Discord/Services/MessageDeleted.cs
@@ -3,4 +3,4 @@
 namespace Hanekawa.Application.Contracts.Discord.Services;
 
 public record MessageDeleted
-    (ulong GuildId, ulong ChannelId, ulong AuthorId, ulong MessageId, string MessageContent) : ISqs<bool>;
+    (ulong GuildId, ulong ChannelId, ulong AuthorId, ulong MessageId, string MessageContent) : INotificationSqs;
diff --git a/Hanekawa.Application/Contracts/Discord/Services/MessageReceived.cs b/Hanekawa.Application/Contracts/Discord/Services/MessageReceived.cs
@@ -3,5 +3,5 @@
 
 namespace Hanekawa.Application.Contracts.Discord.Services;
 
-public record MessageReceived(ulong GuildId, ulong ChannelId, DiscordMember Member, 
-    ulong MessageId, string? Message, DateTimeOffset CreatedAt) : ISqs<bool>;
+public record MessageReceived(ulong GuildId, ulong ChannelId, DiscordMember Member,
+    ulong MessageId, string? Message, DateTimeOffset CreatedAt) : INotificationSqs;
diff --git a/Hanekawa.Application/Contracts/Discord/Services/MessagesDeleted.cs b/Hanekawa.Application/Contracts/Discord/Services/MessagesDeleted.cs
@@ -2,5 +2,5 @@
 
 namespace Hanekawa.Application.Contracts.Discord.Services;
 
-public record MessagesDeleted(ulong GuildId, ulong ChannelId, ulong[] AuthorId, 
-    ulong[] MessageIds, string[] MessageContents) : ISqs<bool>;
+public record MessagesDeleted(ulong GuildId, ulong ChannelId, ulong[] AuthorId,
+    ulong[] MessageIds, string[] MessageContents) : INotificationSqs;
diff --git a/Hanekawa.Application/Contracts/Discord/Services/ReactionAdd.cs b/Hanekawa.Application/Contracts/Discord/Services/ReactionAdd.cs
@@ -2,4 +2,4 @@
 
 namespace Hanekawa.Application.Contracts.Discord.Services;
 
-public record ReactionAdd(ulong GuildId, ulong ChannelId, ulong MessageId, ulong UserId, string? Emoji) : ISqs<bool>;
+public record ReactionAdd(ulong GuildId, ulong ChannelId, ulong MessageId, ulong UserId, string? Emoji) : INotificationSqs;
diff --git a/Hanekawa.Application/Contracts/Discord/Services/ReactionCleared.cs b/Hanekawa.Application/Contracts/Discord/Services/ReactionCleared.cs
@@ -2,4 +2,4 @@
 
 namespace Hanekawa.Application.Contracts.Discord.Services;
 
-public record ReactionCleared(ulong GuildId, ulong ChannelId, ulong MessageId) : ISqs<bool>;
+public record ReactionCleared(ulong GuildId, ulong ChannelId, ulong MessageId) : INotificationSqs;
diff --git a/Hanekawa.Application/Contracts/Discord/Services/ReactionRemove.cs b/Hanekawa.Application/Contracts/Discord/Services/ReactionRemove.cs
@@ -2,4 +2,4 @@
 
 namespace Hanekawa.Application.Contracts.Discord.Services;
 
-public record ReactionRemove(ulong GuildId, ulong ChannelId, ulong MessageId, ulong UserId, string? Emoji) : ISqs<bool>;
+public record ReactionRemove(ulong GuildId, ulong ChannelId, ulong MessageId, ulong UserId, string? Emoji) : INotificationSqs;
diff --git a/Hanekawa.Application/Contracts/Discord/Services/UserBanned.cs b/Hanekawa.Application/Contracts/Discord/Services/UserBanned.cs
@@ -1,6 +1,9 @@
-using Hanekawa.Entities.Discord;
-using MediatR;
+using Hanekawa.Application.Interfaces;
+using Hanekawa.Entities.Discord;
 
 namespace Hanekawa.Application.Contracts.Discord.Services;
 
-public record UserBanned(DiscordMember Member) : IRequest<bool>, IRequest;
+public record UserBanned(DiscordMember Member) : INotificationSqs
+{
+    public ulong GuildId { get; init; }
+}
diff --git a/Hanekawa.Application/Contracts/Discord/Services/UserJoin.cs b/Hanekawa.Application/Contracts/Discord/Services/UserJoin.cs
@@ -2,5 +2,5 @@
 
 namespace Hanekawa.Application.Contracts.Discord.Services;
 
-public record UserJoin(ulong GuildId, ulong UserId, string Username, 
-    string AvatarUrl, DateTimeOffset CreatedAt) : ISqs<bool>;
+public record UserJoin(ulong GuildId, ulong UserId, string Username,
+    string AvatarUrl, DateTimeOffset CreatedAt) : INotificationSqs;
diff --git a/Hanekawa.Application/Contracts/Discord/Services/UserLeave.cs b/Hanekawa.Application/Contracts/Discord/Services/UserLeave.cs
@@ -2,4 +2,4 @@
 
 namespace Hanekawa.Application.Contracts.Discord.Services;
 
-public record UserLeave(ulong GuildId, ulong UserId) : ISqs<bool>;
+public record UserLeave(ulong GuildId, ulong UserId) : INotificationSqs;
diff --git a/Hanekawa.Application/Contracts/Discord/Services/UserUnbanned.cs b/Hanekawa.Application/Contracts/Discord/Services/UserUnbanned.cs
@@ -1,6 +1,9 @@
-using Hanekawa.Entities.Discord;
-using MediatR;
+using Hanekawa.Application.Interfaces;
+using Hanekawa.Entities.Discord;
 
 namespace Hanekawa.Application.Contracts.Discord.Services;
 
-public record UserUnbanned(DiscordMember Member) : IRequest<bool>;
+public record UserUnbanned(DiscordMember Member) : INotificationSqs
+{
+    public ulong GuildId { get; init; }
+}
diff --git a/Hanekawa.Application/Contracts/Discord/Services/VoiceStateUpdate.cs b/Hanekawa.Application/Contracts/Discord/Services/VoiceStateUpdate.cs
@@ -2,4 +2,4 @@
 
 namespace Hanekawa.Application.Contracts.Discord.Services;
 
-public record VoiceStateUpdate(ulong GuildId, ulong UserId, ulong? ChannelId, string? SessionId) : ISqs<bool>;
+public record VoiceStateUpdate(ulong GuildId, ulong UserId, ulong? ChannelId, string? SessionId) : IMessageSqs<bool>;
diff --git a/Hanekawa.Application/Handlers/Services/Levels/MessageReceivedExperienceHandler.cs b/Hanekawa.Application/Handlers/Services/Levels/MessageReceivedExperienceHandler.cs
@@ -6,22 +6,21 @@
 
 namespace Hanekawa.Application.Handlers.Services.Levels;
 
-public class MessageReceivedExperienceHandler: IRequestHandler<MessageReceived, bool>
+public class MessageReceivedExperienceHandler: INotificationHandler<MessageReceived>
 {
     private readonly IConfiguration _configuration;
     private readonly ILevelService _levelService;
-    
+
     public MessageReceivedExperienceHandler(ILevelService levelService, IConfiguration configuration)
     {
         _levelService = levelService;
         _configuration = configuration;
     }
-    
-    public async Task<bool> Handle(MessageReceived request, CancellationToken cancellationToken)
+
+    public async Task Handle(MessageReceived request, CancellationToken cancellationToken)
     {
         await _levelService.AddExperienceAsync(request.Member,
             Random.Shared.Next(Convert.ToInt32(_configuration["expLower"]),
                 Convert.ToInt32(_configuration["expUpper"])));
-        return true;
     }
 }
diff --git a/Hanekawa.Application/Handlers/Services/Logs/UserBannedHandler.cs b/Hanekawa.Application/Handlers/Services/Logs/UserBannedHandler.cs
@@ -8,7 +8,7 @@
 
 namespace Hanekawa.Application.Handlers.Services.Logs;
 
-public class UserBannedHandler : IRequestHandler<UserBanned, bool>
+public class UserBannedHandler : INotificationHandler<UserBanned>
 {
     private readonly IBot _bot;
     private readonly IDbContext _db;
@@ -19,19 +19,19 @@ public UserBannedHandler(IBot bot, IDbContext db)
         _db = db;
     }
 
-    public async Task<bool> Handle(UserBanned request, CancellationToken cancellationToken)
+    public async Task Handle(UserBanned request, CancellationToken cancellationToken)
     {
         var cfg = await _db.GuildConfigs.Include(x => x.LogConfig)
             .FirstOrDefaultAsync(x => x.GuildId == request.Member.Guild.GuildId, cancellationToken: cancellationToken);
-        if (cfg is { LogConfig.ModLogChannelId: null }) return false;
+        if (cfg is { LogConfig.ModLogChannelId: null }) return;
         var channel = _bot.GetChannel(request.Member.Guild.GuildId, cfg!.LogConfig.ModLogChannelId.Value);
         if (channel is null)
         {
             cfg.LogConfig.ModLogChannelId = null;
-            await _db.SaveChangesAsync();
-            return false;
+            await _db.SaveChangesAsync(cancellationToken);
+            return;
         }
-        
+
         await _bot.SendMessageAsync(channel.Value, new Embed
         {
             Title = $"User Banned | Case ID: {request.Member.Id} | ${request.Member.Guild.GuildId}",
@@ -43,6 +43,6 @@ public async Task<bool> Handle(UserBanned request, CancellationToken cancellatio
                 new EmbedField("Reason", "No reason provided", false)
             ]
         });
-        return true;
+        return;
     }
 }
diff --git a/Hanekawa.Application/Handlers/Services/Logs/UserJoinedHandler.cs b/Hanekawa.Application/Handlers/Services/Logs/UserJoinedHandler.cs
@@ -4,9 +4,9 @@
 
 namespace Hanekawa.Application.Handlers.Services.Logs;
 
-public class UserJoinedHandler : IRequestHandler<UserJoin, bool>
+public class UserJoinedHandler : INotificationHandler<UserJoin>
 {
-    public Task<bool> Handle(UserJoin request, CancellationToken cancellationToken)
+    public Task Handle(UserJoin request, CancellationToken cancellationToken)
     {
         throw new NotImplementedException();
     }

diff --git a/Hanekawa.Application/Handlers/Services/Logs/UserLeftHandler.cs b/Hanekawa.Application/Handlers/Services/Logs/UserLeftHandler.cs
@@ -4,9 +4,9 @@
 
 namespace Hanekawa.Application.Handlers.Services.Logs;
 
-public class UserLeftHandler : IRequestHandler<UserLeave, bool>
+public class UserLeftHandler : INotificationHandler<UserLeave>
 {
-    public Task<bool> Handle(UserLeave request, CancellationToken cancellationToken)
+    public Task Handle(UserLeave request, CancellationToken cancellationToken)
     {
         throw new NotImplementedException();
     }

diff --git a/Hanekawa.Application/Handlers/Services/Logs/UserUnbannedHandler.cs b/Hanekawa.Application/Handlers/Services/Logs/UserUnbannedHandler.cs
@@ -8,7 +8,7 @@
 
 namespace Hanekawa.Application.Handlers.Services.Logs;
 
-public class UserUnbannedHandler : IRequestHandler<UserUnbanned, bool>
+public class UserUnbannedHandler : INotificationHandler<UserUnbanned>
 {
     private readonly IBot _bot;
     private readonly IDbContext _db;
@@ -18,20 +18,20 @@ public UserUnbannedHandler(IBot bot, IDbContext db)
         _bot = bot;
         _db = db;
     }
-    
-    public async Task<bool> Handle(UserUnbanned request, CancellationToken cancellationToken)
+
+    public async Task Handle(UserUnbanned request, CancellationToken cancellationToken)
     {
         var cfg = await _db.GuildConfigs.Include(x => x.LogConfig)
             .FirstOrDefaultAsync(x => x.GuildId == request.Member.Guild.GuildId, cancellationToken: cancellationToken);
-        if (cfg is { LogConfig.ModLogChannelId: null }) return false;
+        if (cfg is { LogConfig.ModLogChannelId: null }) return;
         var channel = _bot.GetChannel(request.Member.Guild.GuildId, cfg.LogConfig.ModLogChannelId.Value);
         if (channel is null)
         {
             cfg.LogConfig.ModLogChannelId = null;
-            await _db.SaveChangesAsync();
-            return false;
+            await _db.SaveChangesAsync(cancellationToken);
+            return;
         }
-        
+
         await _bot.SendMessageAsync(channel.Value, new Embed
         {
             Title = $"User Banned | Case ID: {request.Member.Id} | ${request.Member.Guild.GuildId}",
@@ -43,6 +43,6 @@ public async Task<bool> Handle(UserUnbanned request, CancellationToken cancellat
                 new EmbedField("Reason", "No reason provided", false)
             ]
         });
-        return true;
+        return;
     }
 }
diff --git a/Hanekawa.Application/Interfaces/INotificationSqs.cs b/Hanekawa.Application/Interfaces/INotificationSqs.cs
@@ -0,0 +1,9 @@
+using MediatR;
+
+namespace Hanekawa.Application.Interfaces;
+
+public interface IMetric { ulong GuildId { get; init; } }
+public interface INotificationSqs : IMetric, INotification;
+
+public interface IMessageSqs : IMetric, IRequest;
+public interface IMessageSqs<out T> : IMetric, IRequest<T>;
diff --git a/Hanekawa.Application/Interfaces/ISqs.cs b/Hanekawa.Application/Interfaces/ISqs.cs
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		namespace Hanekawa.Application.Contracts.Discord.Services;

		public record BotLeave(ulong GuildId) : ISqs<bool>;
		public record BotLeave(ulong GuildId) : INotificationSqs;