Merge pull request #64 from InfinityGhost/nullable

InfinityGhost · web-flow · commit 3abba19acd1d · 2022-03-31T21:56:52.000-04:00
Resolve nullability issues
diff --git a/TabletBot.Discord/Commands/CommandModule.cs b/TabletBot.Discord/Commands/CommandModule.cs
@@ -9,15 +9,15 @@ namespace TabletBot.Discord.Commands
     public class CommandModule : ModuleBase
     {
         protected override Task<IUserMessage> ReplyAsync(
-            string message = null,
+            string? message = null,
             bool isTTS = false,
-            Embed embed = null,
-            RequestOptions options = null,
-            AllowedMentions allowedMentions = null,
-            MessageReference messageReference = null,
-            MessageComponent components = null,
-            ISticker[] stickers = null,
-            Embed[] embeds = null
+            Embed? embed = null,
+            RequestOptions? options = null,
+            AllowedMentions? allowedMentions = null,
+            MessageReference? messageReference = null,
+            MessageComponent? components = null,
+            ISticker[]? stickers = null,
+            Embed[]? embeds = null
         )
         {
             messageReference ??= Context.Message.ToReference();
diff --git a/TabletBot.Discord/Embeds/GitHubEmbeds.cs b/TabletBot.Discord/Embeds/GitHubEmbeds.cs
@@ -26,13 +26,13 @@ public static Embed GetPullRequestEmbed(PullRequest pr)
         {
             var embed = new EmbedBuilder
             {
-                Title = string.Format("{0} #{1}", pr.Title, pr.Number),
+                Title = $"{pr.Title} #{pr.Number}",
                 Timestamp = pr.UpdatedAt,
                 Url = pr.HtmlUrl,
                 Footer = new EmbedFooterBuilder
                 {
-                    Text = string.Format("{0} opened this pull request on {1}", pr.User?.Login, pr.CreatedAt),
-                    IconUrl = pr.User.AvatarUrl
+                    Text = $"{pr.User?.Login} opened this pull request on {pr.CreatedAt}",
+                    IconUrl = pr.User?.AvatarUrl
                 },
                 Description = pr.Body ?? string.Empty
             };
diff --git a/TabletBot.Discord/Embeds/SnippetEmbeds.cs b/TabletBot.Discord/Embeds/SnippetEmbeds.cs
@@ -8,9 +8,9 @@ namespace TabletBot.Discord.Embeds
 {
     public static class SnippetEmbeds
     {
-        public static bool GetSnippetEmbed(Settings settings, string prefix, out EmbedBuilder embed)
+        public static bool GetSnippetEmbed(Settings settings, string? prefix, out EmbedBuilder embed)
         {
-            if (settings.Snippets.FirstOrDefault(s => s.Snippet == prefix) is SnippetStore snippet)
+            if (settings.Snippets.FirstOrDefault(s => s.Snippet == prefix!) is SnippetStore snippet)
             {
                 embed = new EmbedBuilder
                 {
diff --git a/TabletBot.Discord/Extensions.cs b/TabletBot.Discord/Extensions.cs
@@ -42,7 +42,7 @@ public static IServiceCollection AddSlashCommandModule<T>(this IServiceCollectio
         public static T FirstOfType<TSource, T>(this IEnumerable<TSource> enumerable)
             where T : class, TSource
         {
-            return enumerable.First(i => i is T) as T;
+            return (T)enumerable.First(i => i is T)!;
         }
 
         public static IEnumerable<Type> OfType<T>(this IEnumerable<Type> types)
diff --git a/TabletBot.Discord/SlashCommands/Extensions.cs b/TabletBot.Discord/SlashCommands/Extensions.cs
@@ -5,10 +5,10 @@ namespace TabletBot.Discord.SlashCommands
 {
     internal static class Extensions
     {
-        public static T GetValue<T>(this SocketSlashCommand command, string option, T fallback = default(T))
+        public static T? GetValue<T>(this SocketSlashCommand command, string option, T? fallback = default)
         {
-            var value = command.Data.Options?.FirstOrDefault(o => o.Name == option)?.Value;
-            return value is T ? (T)value : fallback;
+            var obj = command.Data.Options?.FirstOrDefault(o => o.Name == option)?.Value;
+            return obj is T value ? value : fallback;
         }
     }
 }
diff --git a/TabletBot.Discord/SlashCommands/ModerationSlashCommands.cs b/TabletBot.Discord/SlashCommands/ModerationSlashCommands.cs
@@ -170,7 +170,7 @@ private async Task Delete(SocketSlashCommand command)
             var amount = (int)command.GetValue<long>("amount", 1);
 
             var messages = await command.Channel.GetMessagesAsync(amount).FlattenAsync();
-            await (command.Channel as ITextChannel).DeleteMessagesAsync(messages);
+            await (command.Channel as ITextChannel)!.DeleteMessagesAsync(messages);
             await command.FollowupAsync($"Deleted {amount} messages.");
         }
 
@@ -198,7 +198,7 @@ private async Task Ban(SocketSlashCommand command)
             var userId = command.GetValue<ulong>("user");
             var reason = command.GetValue<string>("reason");
 
-            var user = await (command.Channel as IGuildChannel).GetUserAsync(userId);
+            var user = await (command.Channel as IGuildChannel)!.GetUserAsync(userId);
 
             if (user is IGuildUser)
             {
diff --git a/TabletBot.Discord/SlashCommands/SlashCommand.cs b/TabletBot.Discord/SlashCommands/SlashCommand.cs
@@ -8,21 +8,20 @@ namespace TabletBot.Discord.SlashCommands
 {
     public class SlashCommand
     {
-        public string Name { set; get; }
-        public SlashCommandBuilder Builder { set; get; }
-        public Func<SocketSlashCommand, Task> Handler { set; get; }
+        public string Name { set; get; } = string.Empty;
+        public SlashCommandBuilder? Builder { set; get; }
+        public Func<SocketSlashCommand, Task> Handler { set; get; } = _ => Task.CompletedTask;
         public GuildPermissions? MinimumPermissions { set; get; }
         public bool Ephemeral { set; get; }
 
-        public SlashCommandProperties Build() => Builder.Build();
+        public SlashCommandProperties Build() => Builder!.Build();
 
         public async Task Invoke(SocketSlashCommand command)
         {
             await command.DeferAsync(Ephemeral);
-            if (MinimumPermissions is GuildPermissions permissions)
+            if (MinimumPermissions != null)
             {
-                var user = command.User as IGuildUser;
-                if (HasCorrectPermissions(user))
+                if (command.User as IGuildUser is IGuildUser user && HasCorrectPermissions(user))
                 {
                     await Handler(command);
                 }
@@ -39,7 +38,7 @@ public async Task Invoke(SocketSlashCommand command)
 
         private bool HasCorrectPermissions(IGuildUser user)
         {
-            var guildPermissions = MinimumPermissions.Value;
+            var guildPermissions = MinimumPermissions!.Value;
             var userPermissions = user.GuildPermissions;
 
             return userPermissions.Administrator ||
diff --git a/TabletBot.Discord/SlashCommands/SlashCommandModule.cs b/TabletBot.Discord/SlashCommands/SlashCommandModule.cs
@@ -8,7 +8,7 @@ namespace TabletBot.Discord.SlashCommands
 {
     public abstract class SlashCommandModule
     {
-        public event Func<SlashCommandModule, Task> Update;
+        public event Func<SlashCommandModule, Task>? Update;
 
         public void OnUpdate() => Update?.Invoke(this);
 
@@ -23,7 +23,7 @@ public async Task HandleInteraction(SocketInteraction interaction)
             }
         }
 
-        public IList<SlashCommand> CommandHandlers { set; get; }
+        public IList<SlashCommand> CommandHandlers { set; get; } = Array.Empty<SlashCommand>();
 
         protected abstract IEnumerable<SlashCommand> GetSlashCommands();
 
diff --git a/TabletBot.Discord/SlashCommands/SnippetSlashCommands.cs b/TabletBot.Discord/SlashCommands/SnippetSlashCommands.cs
@@ -153,7 +153,7 @@ private async Task SetSnippet(SocketSlashCommand command)
         {
             var snippet = command.GetValue<string>("snippet");
             var title = command.GetValue<string>("title");
-            var content = command.GetValue<string>("content").Replace(@"\n", Environment.NewLine);
+            var content = command.GetValue<string>("content")?.Replace(@"\n", Environment.NewLine);
 
             if (Snippets.FirstOrDefault(s => s.Snippet == snippet) is SnippetStore store)
             {
diff --git a/TabletBot.Discord/SlashCommands/UserSlashCommands.cs b/TabletBot.Discord/SlashCommands/UserSlashCommands.cs
@@ -38,6 +38,9 @@ private async Task SetTablet(SocketSlashCommand command)
         {
             var tablet = command.GetValue<string>("tablet");
             var user = command.User as IGuildUser;
+
+            if (user is not IGuildUser)
+                return;
             
             if (tablet != null)
             {
diff --git a/TabletBot.Discord/Watchers/ReactionRoles/RoleReactionWatcher.cs b/TabletBot.Discord/Watchers/ReactionRoles/RoleReactionWatcher.cs
@@ -23,23 +23,23 @@ public RoleReactionWatcher(Settings settings, DiscordSocketClient discordSocketC
         public async Task ReactionAdded(Cacheable<IUserMessage, ulong> message, Cacheable<IMessageChannel, ulong> channel, SocketReaction reaction)
         {
             var textChannel = await channel.GetOrDownloadAsync() as ITextChannel;
-            await HandleReactionAdded(textChannel, reaction);
+            await HandleReactionAdded(textChannel!, reaction);
         }
 
         public async Task ReactionRemoved(Cacheable<IUserMessage, ulong> message, Cacheable<IMessageChannel, ulong> channel, SocketReaction reaction)
         {
             var textChannel = await channel.GetOrDownloadAsync() as ITextChannel;
-            await HandleReactionRemoved(textChannel, reaction);
+            await HandleReactionRemoved(textChannel!, reaction);
         }
 
         private async Task HandleReactionAdded(ITextChannel channel, SocketReaction reaction)
         {
             try
             {
-                if (IsTracked(reaction, _discordSocketClient, out var reactionRole))
+                if (GetTrackedRole(reaction, _discordSocketClient) is RoleManagementMessageStore reactionRole)
                 {
                     var guild = await _discordSocketClient.Rest.GetGuildAsync(channel.GuildId);
-                    var role = guild.Roles.FirstOrDefault(r => r.Id == reactionRole.RoleId);
+                    var role = guild.Roles.FirstOrDefault(r => r.Id == reactionRole!.RoleId);
                     var user = await guild.GetUserAsync(reaction.UserId);
                     await user.AddRoleAsync(role);
                 }
@@ -56,10 +56,10 @@ private async Task HandleReactionRemoved(ITextChannel channel, SocketReaction re
         {
             try
             {
-                if (IsTracked(reaction, _discordSocketClient, out var reactionRole))
+                if (GetTrackedRole(reaction, _discordSocketClient) is RoleManagementMessageStore reactionRole)
                 {
                     var guild = await _discordSocketClient.Rest.GetGuildAsync(channel.GuildId);
-                    var role = guild.Roles.FirstOrDefault(r => r.Id == reactionRole.RoleId);
+                    var role = guild.Roles.FirstOrDefault(r => r.Id == reactionRole!.RoleId);
                     var user = await guild.GetUserAsync(reaction.UserId);
                     await user.RemoveRoleAsync(role);
                 }
@@ -82,24 +82,20 @@ public Task Deleted(Cacheable<IMessage, ulong> message, Cacheable<IMessageChanne
             return Task.CompletedTask;
         }
 
-        public bool IsTracked(
+        private RoleManagementMessageStore? GetTrackedRole(
             SocketReaction reaction,
-            DiscordSocketClient client,
-            out RoleManagementMessageStore reactionRole
+            BaseSocketClient client
         )
         {
             if (reaction.UserId == client.CurrentUser.Id)
-            {
-                reactionRole = default;
-                return false;
-            }
+                return default;
 
             var query = from reactRole in _settings.ReactiveRoles
                 where reactRole.MessageId == reaction.MessageId
                 where reactRole.EmoteName == reaction.Emote.ToString()
                 select reactRole;
-            reactionRole = query.FirstOrDefault();
-            return reactionRole != null;
+
+            return query.FirstOrDefault();
         }
     }
 }
diff --git a/TabletBot.Discord/Watchers/Spam/SpamWatcherItem.cs b/TabletBot.Discord/Watchers/Spam/SpamWatcherItem.cs
diff --git a/TabletBot/Program.cs b/TabletBot/Program.cs
@@ -58,7 +58,7 @@ private static async Task Main(string[] args)
             DiscordClient = new DiscordSocketClient(config);
             var gitHubClient = await AuthenticateGitHub(githubToken);
 
-            var serviceCollection = BotServiceCollection.Build(Settings, DiscordClient, gitHubClient);
+            var serviceCollection = BotServiceCollection.Build(Settings, DiscordClient, gitHubClient!);
             var serviceProvider = serviceCollection.BuildServiceProvider();
 
             Bot = serviceProvider.GetRequiredService<Bot>();

Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,13 @@ public static Embed GetPullRequestEmbed(PullRequest pr)`
`26`	`26`	`{`
`27`	`27`	`var embed = new EmbedBuilder`
`28`	`28`	`{`
`29`		`- Title = string.Format("{0} #{1}", pr.Title, pr.Number),`
	`29`	`+ Title = $"{pr.Title} #{pr.Number}",`
`30`	`30`	`Timestamp = pr.UpdatedAt,`
`31`	`31`	`Url = pr.HtmlUrl,`
`32`	`32`	`Footer = new EmbedFooterBuilder`
`33`	`33`	`{`
`34`		`- Text = string.Format("{0} opened this pull request on {1}", pr.User?.Login, pr.CreatedAt),`
`35`		`- IconUrl = pr.User.AvatarUrl`
	`34`	`+ Text = $"{pr.User?.Login} opened this pull request on {pr.CreatedAt}",`
	`35`	`+ IconUrl = pr.User?.AvatarUrl`
`36`	`36`	`},`
`37`	`37`	`Description = pr.Body ?? string.Empty`
`38`	`38`	`};`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ namespace TabletBot.Discord.Embeds`
`8`	`8`	`{`
`9`	`9`	`public static class SnippetEmbeds`
`10`	`10`	`{`
`11`		`- public static bool GetSnippetEmbed(Settings settings, string prefix, out EmbedBuilder embed)`
	`11`	`+ public static bool GetSnippetEmbed(Settings settings, string? prefix, out EmbedBuilder embed)`
`12`	`12`	`{`
`13`		`- if (settings.Snippets.FirstOrDefault(s => s.Snippet == prefix) is SnippetStore snippet)`
	`13`	`+ if (settings.Snippets.FirstOrDefault(s => s.Snippet == prefix!) is SnippetStore snippet)`
`14`	`14`	`{`
`15`	`15`	`embed = new EmbedBuilder`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static IServiceCollection AddSlashCommandModule<T>(this IServiceCollectio`
`42`	`42`	`public static T FirstOfType<TSource, T>(this IEnumerable<TSource> enumerable)`
`43`	`43`	`where T : class, TSource`
`44`	`44`	`{`
`45`		`- return enumerable.First(i => i is T) as T;`
	`45`	`+ return (T)enumerable.First(i => i is T)!;`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public static IEnumerable<Type> OfType<T>(this IEnumerable<Type> types)`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,10 @@ namespace TabletBot.Discord.SlashCommands`
`5`	`5`	`{`
`6`	`6`	`internal static class Extensions`
`7`	`7`	`{`
`8`		`- public static T GetValue<T>(this SocketSlashCommand command, string option, T fallback = default(T))`
	`8`	`+ public static T? GetValue<T>(this SocketSlashCommand command, string option, T? fallback = default)`
`9`	`9`	`{`
`10`		`- var value = command.Data.Options?.FirstOrDefault(o => o.Name == option)?.Value;`
`11`		`- return value is T ? (T)value : fallback;`
	`10`	`+ var obj = command.Data.Options?.FirstOrDefault(o => o.Name == option)?.Value;`
	`11`	`+ return obj is T value ? value : fallback;`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ private async Task Delete(SocketSlashCommand command)`
`170`	`170`	`var amount = (int)command.GetValue<long>("amount", 1);`
`171`	`171`
`172`	`172`	`var messages = await command.Channel.GetMessagesAsync(amount).FlattenAsync();`
`173`		`- await (command.Channel as ITextChannel).DeleteMessagesAsync(messages);`
	`173`	`+ await (command.Channel as ITextChannel)!.DeleteMessagesAsync(messages);`
`174`	`174`	`await command.FollowupAsync($"Deleted {amount} messages.");`
`175`	`175`	`}`
`176`	`176`
`@@ -198,7 +198,7 @@ private async Task Ban(SocketSlashCommand command)`
`198`	`198`	`var userId = command.GetValue<ulong>("user");`
`199`	`199`	`var reason = command.GetValue<string>("reason");`
`200`	`200`
`201`		`- var user = await (command.Channel as IGuildChannel).GetUserAsync(userId);`
	`201`	`+ var user = await (command.Channel as IGuildChannel)!.GetUserAsync(userId);`
`202`	`202`
`203`	`203`	`if (user is IGuildUser)`
`204`	`204`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,21 +8,20 @@ namespace TabletBot.Discord.SlashCommands`
`8`	`8`	`{`
`9`	`9`	`public class SlashCommand`
`10`	`10`	`{`
`11`		`- public string Name { set; get; }`
`12`		`- public SlashCommandBuilder Builder { set; get; }`
`13`		`- public Func<SocketSlashCommand, Task> Handler { set; get; }`
	`11`	`+ public string Name { set; get; } = string.Empty;`
	`12`	`+ public SlashCommandBuilder? Builder { set; get; }`
	`13`	`+ public Func<SocketSlashCommand, Task> Handler { set; get; } = _ => Task.CompletedTask;`
`14`	`14`	`public GuildPermissions? MinimumPermissions { set; get; }`
`15`	`15`	`public bool Ephemeral { set; get; }`
`16`	`16`
`17`		`- public SlashCommandProperties Build() => Builder.Build();`
	`17`	`+ public SlashCommandProperties Build() => Builder!.Build();`
`18`	`18`
`19`	`19`	`public async Task Invoke(SocketSlashCommand command)`
`20`	`20`	`{`
`21`	`21`	`await command.DeferAsync(Ephemeral);`
`22`		`- if (MinimumPermissions is GuildPermissions permissions)`
	`22`	`+ if (MinimumPermissions != null)`
`23`	`23`	`{`
`24`		`- var user = command.User as IGuildUser;`
`25`		`- if (HasCorrectPermissions(user))`
	`24`	`+ if (command.User as IGuildUser is IGuildUser user && HasCorrectPermissions(user))`
`26`	`25`	`{`
`27`	`26`	`await Handler(command);`
`28`	`27`	`}`
`@@ -39,7 +38,7 @@ public async Task Invoke(SocketSlashCommand command)`
`39`	`38`
`40`	`39`	`private bool HasCorrectPermissions(IGuildUser user)`
`41`	`40`	`{`
`42`		`- var guildPermissions = MinimumPermissions.Value;`
	`41`	`+ var guildPermissions = MinimumPermissions!.Value;`
`43`	`42`	`var userPermissions = user.GuildPermissions;`
`44`	`43`
`45`	`44`	`return userPermissions.Administrator \|\|`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace TabletBot.Discord.SlashCommands`
`8`	`8`	`{`
`9`	`9`	`public abstract class SlashCommandModule`
`10`	`10`	`{`
`11`		`- public event Func<SlashCommandModule, Task> Update;`
	`11`	`+ public event Func<SlashCommandModule, Task>? Update;`
`12`	`12`
`13`	`13`	`public void OnUpdate() => Update?.Invoke(this);`
`14`	`14`
`@@ -23,7 +23,7 @@ public async Task HandleInteraction(SocketInteraction interaction)`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`- public IList<SlashCommand> CommandHandlers { set; get; }`
	`26`	`+ public IList<SlashCommand> CommandHandlers { set; get; } = Array.Empty<SlashCommand>();`
`27`	`27`
`28`	`28`	`protected abstract IEnumerable<SlashCommand> GetSlashCommands();`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ private async Task SetSnippet(SocketSlashCommand command)`
`153`	`153`	`{`
`154`	`154`	`var snippet = command.GetValue<string>("snippet");`
`155`	`155`	`var title = command.GetValue<string>("title");`
`156`		`- var content = command.GetValue<string>("content").Replace(@"\n", Environment.NewLine);`
	`156`	`+ var content = command.GetValue<string>("content")?.Replace(@"\n", Environment.NewLine);`
`157`	`157`
`158`	`158`	`if (Snippets.FirstOrDefault(s => s.Snippet == snippet) is SnippetStore store)`
`159`	`159`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ private async Task SetTablet(SocketSlashCommand command)`
`38`	`38`	`{`
`39`	`39`	`var tablet = command.GetValue<string>("tablet");`
`40`	`40`	`var user = command.User as IGuildUser;`
	`41`	`+`
	`42`	`+ if (user is not IGuildUser)`
	`43`	`+ return;`
`41`	`44`
`42`	`45`	`if (tablet != null)`
`43`	`46`	`{`