Global usings and file scoped namespaces

src/NadekoBot/Common/ModuleBehaviors/IEarlyBehavior.cs

@@ -1,14 +1,13 @@
 using System.Threading.Tasks;
 using Discord;
 
-namespace NadekoBot.Common.ModuleBehaviors
+namespace NadekoBot.Common.ModuleBehaviors;
+
+/// <summary>
+/// Implemented by modules which block execution before anything is executed
+/// </summary>
+public interface IEarlyBehavior
 {
-    /// <summary>
-    /// Implemented by modules which block execution before anything is executed
-    /// </summary>
-    public interface IEarlyBehavior
-    {
-        int Priority { get; }
-        Task<bool> RunBehavior(IGuild guild, IUserMessage msg);
-    }
-}
+    int Priority { get; }
+    Task<bool> RunBehavior(IGuild guild, IUserMessage msg);
+}

src/NadekoBot/Common/ModuleBehaviors/IINputTransformer.cs

@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 using Discord;
 
-namespace NadekoBot.Common.ModuleBehaviors
+namespace NadekoBot.Common.ModuleBehaviors;
+
+public interface IInputTransformer
 {
-    public interface IInputTransformer
-    {
-        Task<string> TransformInput(IGuild guild, IMessageChannel channel, IUser user, string input);
-    }
-}
+    Task<string> TransformInput(IGuild guild, IMessageChannel channel, IUser user, string input);
+}

src/NadekoBot/Common/ModuleBehaviors/ILateBlocker.cs

@@ -1,13 +1,11 @@
 using System.Threading.Tasks;
 using Discord.Commands;
-using Discord.WebSocket;
 
-namespace NadekoBot.Common.ModuleBehaviors
+namespace NadekoBot.Common.ModuleBehaviors;
+
+public interface ILateBlocker
 {
-    public interface ILateBlocker
-    {
-        public int Priority { get; }
+    public int Priority { get; }
         
-        Task<bool> TryBlockLate(ICommandContext context, string moduleName, CommandInfo command);
-    }
-}
+    Task<bool> TryBlockLate(ICommandContext context, string moduleName, CommandInfo command);
+}

src/NadekoBot/Common/ModuleBehaviors/ILateExecutor.cs

@@ -1,13 +1,12 @@
 using System.Threading.Tasks;
 using Discord;
 
-namespace NadekoBot.Common.ModuleBehaviors
+namespace NadekoBot.Common.ModuleBehaviors;
+
+/// <summary>
+/// Last thing to be executed, won't stop further executions
+/// </summary>
+public interface ILateExecutor
 {
-    /// <summary>
-    /// Last thing to be executed, won't stop further executions
-    /// </summary>
-    public interface ILateExecutor
-    {
-        Task LateExecute(IGuild guild, IUserMessage msg);
-    }
-}
+    Task LateExecute(IGuild guild, IUserMessage msg);
+}

src/NadekoBot/Common/ModuleBehaviors/IModuleBehavior.cs

@@ -2,33 +2,32 @@
 using Discord.WebSocket;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Common.ModuleBehaviors
+namespace NadekoBot.Common.ModuleBehaviors;
+
+public struct ModuleBehaviorResult
 {
-    public struct ModuleBehaviorResult
+    public bool Blocked { get; set; }
+    public string NewInput { get; set; }
+
+    public static ModuleBehaviorResult None() => new ModuleBehaviorResult
     {
-        public bool Blocked { get; set; }
-        public string NewInput { get; set; }
+        Blocked = false,
+        NewInput = null,
+    };
 
-        public static ModuleBehaviorResult None() => new ModuleBehaviorResult
-        {
-            Blocked = false,
-            NewInput = null,
-        };
-
-        public static ModuleBehaviorResult FromBlocked(bool blocked) => new ModuleBehaviorResult
-        {
-            Blocked = blocked,
-            NewInput = null,
-        };
-    }
-
-    public interface IModuleBehavior
+    public static ModuleBehaviorResult FromBlocked(bool blocked) => new ModuleBehaviorResult
     {
-        /// <summary>
-        /// Negative priority means it will try to apply as early as possible
-        /// Positive priority menas it will try to apply as late as possible
-        /// </summary>
-        int Priority { get; }
-        Task<ModuleBehaviorResult> ApplyBehavior(DiscordSocketClient client, IGuild guild, IUserMessage msg);
-    }
+        Blocked = blocked,
+        NewInput = null,
+    };
 }
+
+public interface IModuleBehavior
+{
+    /// <summary>
+    /// Negative priority means it will try to apply as early as possible
+    /// Positive priority menas it will try to apply as late as possible
+    /// </summary>
+    int Priority { get; }
+    Task<ModuleBehaviorResult> ApplyBehavior(DiscordSocketClient client, IGuild guild, IUserMessage msg);
+}

src/NadekoBot/Common/ModuleBehaviors/IReadyExecutor.cs

@@ -1,16 +1,15 @@
 using System.Threading.Tasks;
 
-namespace NadekoBot.Common.ModuleBehaviors
+namespace NadekoBot.Common.ModuleBehaviors;
+
+/// <summary>
+/// All services which need to execute something after
+/// the bot is ready should implement this interface 
+/// </summary>
+public interface IReadyExecutor
 {
     /// <summary>
-    /// All services which need to execute something after
-    /// the bot is ready should implement this interface 
+    /// Executed when bot is ready
     /// </summary>
-    public interface IReadyExecutor
-    {
-        /// <summary>
-        /// Executed when bot is ready
-        /// </summary>
-        public Task OnReadyAsync();
-    }
+    public Task OnReadyAsync();
 }