rest of the eventargs implemented

GreemDev · GreemDev · commit 16da40463ea9 · 2019-03-20T22:43:26.000-05:00
diff --git a/src/Data/Objects/EventArgs/JoinedGuildEventArgs.cs b/src/Data/Objects/EventArgs/JoinedGuildEventArgs.cs
@@ -0,0 +1,22 @@
+using Discord;
+using Discord.WebSocket;
+using Volte.Discord;
+using Volte.Services;
+
+namespace Volte.Data.Objects.EventArgs
+{
+    public class JoinedGuildEventArgs
+    {
+        private DatabaseService _db = VolteBot.GetRequiredService<DatabaseService>();
+        public IGuild Guild { get; }
+        public DiscordServer Config { get; }
+        public DiscordSocketClient Client { get; }
+
+        public JoinedGuildEventArgs(SocketGuild guild)
+        {
+            Guild = guild;
+            Config = _db.GetConfig(guild);
+            Client = VolteBot.Client;
+        }
+    }
+}
diff --git a/src/Data/Objects/EventArgs/LeftGuildEventArgs.cs b/src/Data/Objects/EventArgs/LeftGuildEventArgs.cs
@@ -0,0 +1,22 @@
+using Discord;
+using Discord.WebSocket;
+using Volte.Discord;
+using Volte.Services;
+
+namespace Volte.Data.Objects.EventArgs
+{
+    public class LeftGuildEventArgs
+    {
+        private DatabaseService _db = VolteBot.GetRequiredService<DatabaseService>();
+        public IGuild Guild { get; }
+        public DiscordServer Config { get; }
+        public DiscordSocketClient Client { get; }
+
+        public LeftGuildEventArgs(SocketGuild guild)
+        {
+            Guild = guild;
+            Config = _db.GetConfig(guild);
+            Client = VolteBot.Client;
+        }
+    }
+}
diff --git a/src/Data/Objects/EventArgs/LogEventArgs.cs b/src/Data/Objects/EventArgs/LogEventArgs.cs
@@ -0,0 +1,21 @@
+using System.Threading.Tasks.Dataflow;
+using Discord;
+
+namespace Volte.Data.Objects.EventArgs
+{
+    public class LogEventArgs
+    {
+        public string Message { get; }
+        public string Source { get; }
+        public LogSeverity Severity { get; }
+        public (LogMessage Internal, global::Discord.LogMessage Discord) LogMessage { get; }
+
+        public LogEventArgs(global::Discord.LogMessage message)
+        {
+            Message = message.Message;
+            Source = message.Source;
+            Severity = message.Severity;
+            LogMessage = (Objects.LogMessage.FromDiscordLogMessage(message), message);
+        }
+    }
+}
diff --git a/src/Data/Objects/EventArgs/ReactionAddedEventArgs.cs b/src/Data/Objects/EventArgs/ReactionAddedEventArgs.cs
@@ -0,0 +1,29 @@
+using Discord;
+using Discord.WebSocket;
+using Volte.Discord;
+using Volte.Services;
+
+namespace Volte.Data.Objects.EventArgs
+{
+    public class ReactionAddedEventArgs
+    {
+        private DatabaseService _db = VolteBot.GetRequiredService<DatabaseService>();
+        public IUserMessage Message { get; }
+        public ISocketMessageChannel Channel { get; }
+        public IGuild Guild { get; }
+        public SocketReaction Reaction { get; }
+        public DiscordServer Config { get; }
+        public DiscordSocketClient Client { get; }
+
+        public ReactionAddedEventArgs(Cacheable<IUserMessage, ulong> message, ISocketMessageChannel channel,
+            SocketReaction reaction)
+        {
+            Message = message.Value;
+            Channel = channel;
+            Reaction = reaction;
+            Guild = (channel as ITextChannel)?.Guild;
+            Config = _db.GetConfig(Guild);
+            Client = VolteBot.Client;
+        }
+    }
+}
diff --git a/src/Discord/VolteHandler.cs b/src/Discord/VolteHandler.cs
@@ -66,10 +66,11 @@ public async Task InitAsync()
             sw.Stop();
             await _logger.Log(LogSeverity.Info, LogSource.Volte,
                 $"Loaded {loaded.Count} modules and {loaded.Sum(m => m.Commands.Count)} commands loaded in {sw.ElapsedMilliseconds}ms.");
-            _client.Log += _logger.Log;
-            _client.JoinedGuild += _guild.OnJoinAsync;
-            _client.LeftGuild += _guild.OnLeaveAsync;
-            _client.ReactionAdded += _verification.CheckReactionAsync;
+            _client.Log += async (m) => await _logger.Log(new LogEventArgs(m));
+            _client.JoinedGuild += async (guild) => await _guild.OnJoinAsync(new JoinedGuildEventArgs(guild));
+            _client.LeftGuild += async (guild) => await _guild.OnLeaveAsync(new LeftGuildEventArgs(guild));
+            _client.ReactionAdded += async (m, c, r) =>
+                await _verification.CheckReactionAsync(new ReactionAddedEventArgs(m, c, r));
             _client.UserJoined += async (user) =>
             {
                 var args = new UserJoinedEventArgs(user);
@@ -81,7 +82,7 @@ await _logger.Log(LogSeverity.Info, LogSource.Volte,
             _client.UserLeft += async (user) => await _defaultWelcome.LeaveAsync(new UserLeftEventArgs(user));
             _client.UserJoined += async (user) => await _autorole.ApplyRoleAsync(new UserJoinedEventArgs(user));
             _client.Ready += async () => await _event.OnReady(new ReadyEventArgs(_client));
-            _client.MessageReceived += async s =>
+            _client.MessageReceived += async (s) =>
             {
                 if (!(s is IUserMessage msg)) return;
                 if (msg.Author.IsBot) return;
@@ -91,17 +92,15 @@ await _logger.Log(LogSeverity.Info, LogSource.Volte,
                     return;
                 }
 
-                var args = new MessageReceivedEventArgs(s);
-
-                await _blacklist.CheckMessageAsync(args);
-                await _antilink.CheckMessageAsync(args);
-                await _pingchecks.CheckMessageAsync(args);
-                await HandleMessageAsync(args);
+                await HandleMessageAsync(new MessageReceivedEventArgs(s));
             };
         }
 
         private async Task HandleMessageAsync(MessageReceivedEventArgs args)
         {
+            await _blacklist.CheckMessageAsync(args);
+            await _antilink.CheckMessageAsync(args);
+            await _pingchecks.CheckMessageAsync(args);
             var prefixes = new[] {args.Config.CommandPrefix, $"<@{args.Context.Client.CurrentUser.Id}> "};
             if (CommandUtilities.HasAnyPrefix(args.Message.Content, prefixes, StringComparison.OrdinalIgnoreCase, out _,
                 out var cmd))
diff --git a/src/Services/GuildService.cs b/src/Services/GuildService.cs
@@ -6,6 +6,7 @@
 using Discord.WebSocket;
 using Volte.Data;
 using Volte.Data.Objects;
+using Volte.Data.Objects.EventArgs;
 using Volte.Discord;
 using Volte.Extensions;
 
@@ -21,21 +22,21 @@ public GuildService(LoggingService loggingService)
             _logger = loggingService;
         }
 
-        public async Task OnJoinAsync(IGuild guild)
+        public async Task OnJoinAsync(JoinedGuildEventArgs args)
         {
-            if (Config.BlacklistedOwners.Contains(guild.OwnerId))
+            if (Config.BlacklistedOwners.Contains(args.Guild.OwnerId))
             {
                 await _logger.Log(LogSeverity.Warning, LogSource.Volte,
-                    $"Left guild \"{guild.Name}\" owned by blacklisted owner {await guild.GetOwnerAsync()}.");
-                await guild.LeaveAsync();
+                    $"Left guild \"{args.Guild.Name}\" owned by blacklisted owner {await args.Guild.GetOwnerAsync()}.");
+                await args.Guild.LeaveAsync();
                 return;
             }
 
-            var owner = await guild.GetOwnerAsync();
+            var owner = await args.Guild.GetOwnerAsync();
 
             var embed = new EmbedBuilder()
                 .WithTitle("Hey there!")
-                .WithAuthor(await guild.GetOwnerAsync())
+                .WithAuthor(await args.Guild.GetOwnerAsync())
                 .WithColor(Config.SuccessColor)
                 .WithDescription("Thanks for inviting me! Here's some basic instructions on how to set me up.")
                 .AddField("Set your admin role", "$adminrole {roleName}", true)
@@ -51,7 +52,7 @@ await _logger.Log(LogSeverity.Warning, LogSource.Volte,
             }
             catch (HttpException ignored) when (ignored.DiscordCode.Equals(50007))
             {
-                var c = (await guild.GetTextChannelsAsync()).FirstOrDefault();
+                var c = (await args.Guild.GetTextChannelsAsync()).FirstOrDefault();
                 if (c != null) await embed.SendToAsync(c);
             }
 
@@ -68,15 +69,15 @@ await logger.Log(LogSeverity.Error, LogSource.Service,
                 }
 
                 var channel = VolteBot.Client.GetGuild(joinLeave.GuildId).GetTextChannel(joinLeave.ChannelId);
-                var users = (await guild.GetUsersAsync()).Where(u => !u.IsBot).ToList();
-                var bots = (await guild.GetUsersAsync()).Where(u => u.IsBot).ToList();
+                var users = (await args.Guild.GetUsersAsync()).Where(u => !u.IsBot).ToList();
+                var bots = (await args.Guild.GetUsersAsync()).Where(u => u.IsBot).ToList();
 
                 var e = new EmbedBuilder()
                     .WithAuthor(owner)
                     .WithTitle("Joined Guild")
-                    .AddField("Name", guild.Name, true)
-                    .AddField("ID", guild.Id, true)
-                    .WithThumbnailUrl(guild.IconUrl)
+                    .AddField("Name", args.Guild.Name, true)
+                    .AddField("ID", args.Guild.Id, true)
+                    .WithThumbnailUrl(args.Guild.IconUrl)
                     .WithCurrentTimestamp()
                     .AddField("Users", users.Count, true)
                     .AddField("Bots", bots.Count, true);
@@ -97,7 +98,7 @@ await logger.Log(LogSeverity.Error, LogSource.Service,
             }
         }
 
-        public async Task OnLeaveAsync(SocketGuild guild)
+        public async Task OnLeaveAsync(LeftGuildEventArgs args)
         {
             if (Config.JoinLeaveLog.Enabled)
             {
@@ -115,11 +116,11 @@ await logger.Log(LogSeverity.Error, LogSource.Service,
                 try
                 {
                     var e = new EmbedBuilder()
-                        .WithAuthor(guild.Owner)
+                        .WithAuthor(await args.Guild.GetOwnerAsync())
                         .WithTitle("Left Guild")
-                        .AddField("Name", guild.Name, true)
-                        .AddField("ID", guild.Id, true)
-                        .WithThumbnailUrl(guild.IconUrl)
+                        .AddField("Name", args.Guild.Name, true)
+                        .AddField("ID", args.Guild.Id, true)
+                        .WithThumbnailUrl(args.Guild.IconUrl)
                         .WithColor(0xFF0000)
                         .SendToAsync(channel);
                 }
diff --git a/src/Services/LoggingService.cs b/src/Services/LoggingService.cs
@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using Discord;
 using Volte.Data.Objects;
+using Volte.Data.Objects.EventArgs;
 using Volte.Extensions;
 using Console = Colorful.Console;
 using Color = System.Drawing.Color;
@@ -15,11 +16,10 @@ public sealed class LoggingService
     {
         private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
 
-        internal async Task Log(LogMessage msg)
+        internal async Task Log(LogEventArgs args)
         {
-            if (msg.Message.Contains("handler is blocking")) return;
-            var m = Data.Objects.LogMessage.FromDiscordLogMessage(msg);
-            await Log(m.Severity, m.Source, m.Message, m.Exception);
+            await Log(args.LogMessage.Internal.Severity, args.LogMessage.Internal.Source,
+                args.LogMessage.Internal.Message, args.LogMessage.Internal.Exception);
         }
 
         internal async Task PrintVersion()
diff --git a/src/Services/VerificationService.cs b/src/Services/VerificationService.cs
@@ -1,6 +1,7 @@
 ﻿using System.Threading.Tasks;
 using Discord;
 using Discord.WebSocket;
+using Volte.Data.Objects.EventArgs;
 
 namespace Volte.Services
 {
@@ -17,17 +18,16 @@ public VerificationService(DatabaseService databaseService,
             _emoji = emojiService;
         }
 
-        public async Task CheckReactionAsync(Cacheable<IUserMessage, ulong> message, ISocketMessageChannel channel,
-            SocketReaction reaction)
+        public async Task CheckReactionAsync(ReactionAddedEventArgs args)
         {
-            if (channel is IDMChannel) return;
-            if (!(reaction.User.Value is IGuildUser u) || !(channel is IGuildChannel c)) return;
+            if (args.Channel is IDMChannel) return;
+            if (!(args.Reaction.User.Value is IGuildUser u) || !(args.Channel is IGuildChannel c)) return;
             var config = _db.GetConfig(c.Guild);
-            if (!config.VerificationOptions.Enabled || !reaction.User.IsSpecified) return;
+            if (!config.VerificationOptions.Enabled || !args.Reaction.User.IsSpecified) return;
             if (u.IsBot) return;
-            if (message.Id.Equals(config.VerificationOptions.MessageId))
+            if (args.Message.Id.Equals(config.VerificationOptions.MessageId))
             {
-                if (reaction.Emote.Name.Equals(_emoji.BALLOT_BOX_WITH_CHECK))
+                if (args.Reaction.Emote.Name.Equals(_emoji.BALLOT_BOX_WITH_CHECK))
                 {
                     var role = c.Guild.GetRole(config.VerificationOptions.RoleId);
                     if (role is null) return;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.Threading.Tasks;`
`2`	`2`	`using Discord;`
`3`	`3`	`using Discord.WebSocket;`
	`4`	`+using Volte.Data.Objects.EventArgs;`
`4`	`5`
`5`	`6`	`namespace Volte.Services`
`6`	`7`	`{`
`@@ -17,17 +18,16 @@ public VerificationService(DatabaseService databaseService,`
`17`	`18`	`_emoji = emojiService;`
`18`	`19`	`}`
`19`	`20`
`20`		`- public async Task CheckReactionAsync(Cacheable<IUserMessage, ulong> message, ISocketMessageChannel channel,`
`21`		`- SocketReaction reaction)`
	`21`	`+ public async Task CheckReactionAsync(ReactionAddedEventArgs args)`
`22`	`22`	`{`
`23`		`- if (channel is IDMChannel) return;`
`24`		`- if (!(reaction.User.Value is IGuildUser u) \|\| !(channel is IGuildChannel c)) return;`
	`23`	`+ if (args.Channel is IDMChannel) return;`
	`24`	`+ if (!(args.Reaction.User.Value is IGuildUser u) \|\| !(args.Channel is IGuildChannel c)) return;`
`25`	`25`	`var config = _db.GetConfig(c.Guild);`
`26`		`- if (!config.VerificationOptions.Enabled \|\| !reaction.User.IsSpecified) return;`
	`26`	`+ if (!config.VerificationOptions.Enabled \|\| !args.Reaction.User.IsSpecified) return;`
`27`	`27`	`if (u.IsBot) return;`
`28`		`- if (message.Id.Equals(config.VerificationOptions.MessageId))`
	`28`	`+ if (args.Message.Id.Equals(config.VerificationOptions.MessageId))`
`29`	`29`	`{`
`30`		`- if (reaction.Emote.Name.Equals(_emoji.BALLOT_BOX_WITH_CHECK))`
	`30`	`+ if (args.Reaction.Emote.Name.Equals(_emoji.BALLOT_BOX_WITH_CHECK))`
`31`	`31`	`{`
`32`	`32`	`var role = c.Guild.GetRole(config.VerificationOptions.RoleId);`
`33`	`33`	`if (role is null) return;`