i did far too much stuff in this commit (#71)

Naamloos · Feb 23, 2018 · 6ba1c37 · 6ba1c37
1 parent b1d901b
commit 6ba1c37
Show file tree

Hide file tree

Showing 39 changed files with 426 additions and 445 deletions.
diff --git a/ModCore/Api/Perspective.cs b/ModCore/Api/Perspective.cs
@@ -1,12 +1,8 @@
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using System.Net.Http;
 using Newtonsoft.Json;
-using System.IO;
-using ModCore.Entities;
-using System;
-using System.Linq;
 
 namespace ModCore.Api
 {
@@ -41,9 +37,9 @@ public Perspective(string token)
 
         public async Task<PerspectiveAnalysisResponse> RequestAnalysis(string message)
         {
-            var RequestPayload = new PerspectiveAnalysisRequest()
+            var RequestPayload = new PerspectiveAnalysisRequest
             {
-                Comment = new PerspectiveComment()
+                Comment = new PerspectiveComment
                 {
                     Text = message
                 }
@@ -67,13 +63,13 @@ public class PerspectiveAnalysisRequest
         public PerspectiveContext Context = new PerspectiveContext();
 
         [JsonProperty("requestedAttributes")]
-        public Dictionary<string, PerspectiveAttributes> RequestedAttributes = new Dictionary<string, PerspectiveAttributes>()
+        public Dictionary<string, PerspectiveAttributes> RequestedAttributes = new Dictionary<string, PerspectiveAttributes>
         {
-            { "TOXICITY", new PerspectiveAttributes(){ ScoreTreshold = null, ScoreType = null } }
+            { "TOXICITY", new PerspectiveAttributes { ScoreTreshold = null, ScoreType = null } }
         };
 
         [JsonProperty("languages")]
-        public List<string> Languages = new List<string>() { "en" };
+        public List<string> Languages = new List<string> { "en" };
 
         [JsonProperty("doNotStore")]
         public bool DoNotStore = true;
@@ -138,17 +134,17 @@ public class AttributeScore
     public class SpanScore
     {
         [JsonProperty("begin")]
-        public int Begin = 0;
+        public int Begin;
         [JsonProperty("end")]
-        public int End = 0;
+        public int End;
         [JsonProperty("score")]
         public Score Score;
     }
 
     public class Score
     {
         [JsonProperty("value")]
-        public float Value = 0.0f;
+        public float Value;
 
         [JsonProperty("type")]
         public string Type = "";

diff --git a/ModCore/Commands/Config.cs b/ModCore/Commands/Config.cs
diff --git a/ModCore/Commands/Info.cs b/ModCore/Commands/Info.cs
@@ -1,13 +1,14 @@
 using System;
 using System.Globalization;
+using System.Text;
 using System.Threading.Tasks;
+using DSharpPlus;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
+using DSharpPlus.Entities;
 using DSharpPlus.Interactivity;
 using ModCore.Entities;
-using DSharpPlus.Entities;
-using System.Text;
-using DSharpPlus;
+using ModCore.Logic;
 
 namespace ModCore.Commands
 {
@@ -57,14 +58,14 @@ public async Task UserInfoAsync(CommandContext ctx, [Description("Member to get
 
             embed.WithFooter($"{ctx.Guild.Name} / #{ctx.Channel.Name} / {DateTime.Now}");
 
-            await ctx.RespondAsync("", false, embed: embed);
+            await ctx.ElevatedRespondAsync(embed: embed);
             await ctx.LogActionAsync();
         }
 
         [Command("guild"), Aliases("g"), Description("Returns information about this guild.")]
         public async Task GuildInfoAsync(CommandContext ctx)
         {
-            await ctx.RespondAsync("The following embed might flood this channel. Do you want to proceed?");
+            await ctx.SafeRespondAsync("The following embed might flood this channel. Do you want to proceed?");
             var m = await Interactivity.WaitForMessageAsync(x => x.Content.ToLower() == "yes" || x.Content.ToLower() == "no");
             if (m?.Message?.Content == "yes")
             {
@@ -130,13 +131,13 @@ public async Task GuildInfoAsync(CommandContext ctx)
                     $"MFA Level: {g.MfaLevel}.\n" +
                     $"Verification Level: {g.VerificationLevel}");
 
-                await ctx.RespondAsync("", false, embed: embed);
+                await ctx.ElevatedRespondAsync(embed: embed);
                 #endregion
             }
             else
             {
                 #region no or timeout
-                await ctx.RespondAsync("Okay, I'm not sending the embed.");
+                await ctx.SafeRespondAsync("Okay, I'm not sending the embed.");
                 #endregion
             }
             await ctx.LogActionAsync();
@@ -152,7 +153,7 @@ public async Task RoleInfoAsync(CommandContext ctx, [Description("Role to get in
                 .AddField("Data", $"Mentionable: {(role.IsMentionable ? "yes" : "no")}.\nHoisted: {(role.IsHoisted ? "yes" : "no")}.\nManaged: {(role.IsManaged ? "yes" : "no")}.")
                 .WithColor(role.Color);
 
-            await ctx.RespondAsync(embed: embed);
+            await ctx.ElevatedRespondAsync(embed: embed);
             await ctx.LogActionAsync();
         }
 
@@ -195,7 +196,7 @@ public async Task ChannelInfoAsync(CommandContext ctx, [Description("Channel to
             embed.AddField("Misc", $"NSFW: {(channel.IsNSFW ? "yes" : "no")}\n" +
                 $"{(channel.Type == ChannelType.Text ? $"Last message ID: {channel.LastMessageId}" : "")}");
 
-            await ctx.RespondAsync(embed: embed);
+            await ctx.ElevatedRespondAsync(embed: embed);
             await ctx.LogActionAsync();
         }
     }