fix!: nullability & other things

.github/workflows/documentation.yml

@@ -32,10 +32,8 @@ jobs:
       run: dotnet build -c Release --no-restore -v minimal -f net7.0 DisCatSharp.sln
       timeout-minutes: 7
       continue-on-error: true
-    #- name: Add Custom Plugins
-    #  run: cp -R DisCatSharp.Docs/dcs/plugins/* /home/runner/.dotnet/tools/.store/docfx/2.67.0/docfx/2.67.0/tools/net7.0/any/
     - name: Build Docs
-      run: docfx DisCatSharp.Docs/docfx.json
+      run: docfx DisCatSharp.Docs/docfx.json --logLevel Verbose
     - name: Pack Docs
       shell: pwsh
       run: ./DisCatSharp.Tools/pack-docs.ps1 -DocsPath "./DisCatSharp.Docs" -OutputPath "./" -PackageName "dcs-docs"

.github/workflows/documentation_test.yml

@@ -8,17 +8,21 @@ env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: true
+  GH_TOKEN: ${{ github.token }}
 
 jobs:
   build:
-    timeout-minutes: 20
+    timeout-minutes: 25
     runs-on: ubuntu-latest
     name: Build documentation
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
       with:
         token:  ${{ secrets.NYUW_TOKEN_GH }}
+    - name: Checkout PR if nessesary
+      if: github.event_name == 'pull_request'
+      run: gh pr checkout ${{ github.event.pull_request.number }}
     - name: Setup .NET
       uses: actions/[email protected]
       with:
@@ -32,10 +36,8 @@ jobs:
       run: dotnet build -c Release -v minimal -f net7.0 --no-restore DisCatSharp.sln
       timeout-minutes: 7
       continue-on-error: true
-    #- name: Add Custom Plugins
-    #  run: cp -R DisCatSharp.Docs/dcs/plugins/* /home/runner/.dotnet/tools/.store/docfx/2.67.0/docfx/2.67.0/tools/net7.0/any/
     - name: Build Docs
-      run: docfx DisCatSharp.Docs/docfx.json
+      run: docfx DisCatSharp.Docs/docfx.json --logLevel Verbose
     - name: Pack Docs
       shell: pwsh
       run: ./DisCatSharp.Tools/pack-docs.ps1 -DocsPath "./DisCatSharp.Docs" -OutputPath "./" -PackageName "dcs-docs-preview"
@@ -79,8 +81,6 @@ jobs:
       run: rm dcs-docs-preview.zip
     - name: Add .htaccess
       run: rm -f .htaccess && wget https://gist.githubusercontent.com/Lulalaby/8a032d0ddebb9125691094edc67b6593/raw/0c4bf0423cfe334fdd5092b014d2481759dd052a/.htaccess
-    #- name: Add _redirects
-    #  run: rm -f _redirects && wget https://gist.githubusercontent.com/Lulalaby/0c784680a855fd161411002e3859b4fd/raw/9708d1acfce3f647cbb8da19c2022a20198979fa/_redirects
     - name: Set access rights
       run: sudo chmod 777 -R .
     - name: Commit changes

.nuget/NuGet.config

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <configuration>
-  <packageSources>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
-  <packageSourceMapping>
-  <packageSource key="nuget.org">
-    <package pattern="*" />
-  </packageSource>
-</packageSourceMapping>
+	<packageSources>
+		<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+	</packageSources>
+	<packageSourceMapping>
+		<packageSource key="nuget.org">
+			<package pattern="*" />
+		</packageSource>
+	</packageSourceMapping>
 </configuration>

Directory.Build.props

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project>
-  <ItemGroup>
-    <SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
-  </ItemGroup>
+	<ItemGroup>
+		<SourceRoot Include="$(MSBuildThisFileDirectory)/" />
+	</ItemGroup>
 	<PropertyGroup>
 		<!--<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)/DisCatSharp.Tools/DisCatSharp.ruleset</CodeAnalysisRuleSet>-->
-    <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
+		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 	</PropertyGroup>
 </Project>

DisCatSharp.ApplicationCommands/ApplicationCommandsUtilities.cs

@@ -22,40 +22,42 @@ internal static bool IsModuleCandidateType(this Type type)
 	/// <summary>
 	/// Whether this module is a candidate type.
 	/// </summary>
-	/// <param name="ti">The type info.</param>
-	internal static bool IsModuleCandidateType(this TypeInfo ti)
+	/// <param name="targetTypeInfo">The type info.</param>
+	internal static bool IsModuleCandidateType(this TypeInfo targetTypeInfo)
 	{
 		if (ApplicationCommandsExtension.DebugEnabled)
-			ApplicationCommandsExtension.Logger.LogDebug("Checking type {name}", ti.FullName);
+			ApplicationCommandsExtension.Logger.LogDebug("Checking type {name}", targetTypeInfo.FullName);
 		// check if compiler-generated
-		if (ti.GetCustomAttribute<CompilerGeneratedAttribute>(false) != null)
+		if (targetTypeInfo.GetCustomAttribute<CompilerGeneratedAttribute>(false) != null)
 			return false;
 
 		// check if derives from the required base class
-		var tmodule = typeof(ApplicationCommandsModule);
-		var timodule = tmodule.GetTypeInfo();
-		if (!timodule.IsAssignableFrom(ti))
+		var type = typeof(ApplicationCommandsModule);
+		var typeInfo = type.GetTypeInfo();
+		if (!typeInfo.IsAssignableFrom(targetTypeInfo))
 		{
 			if (ApplicationCommandsExtension.DebugEnabled)
 				ApplicationCommandsExtension.Logger.LogDebug("Not assignable from type");
 			return false;
 		}
 
 		// check if anonymous
-		if (ti.IsGenericType && ti.Name.Contains("AnonymousType") && (ti.Name.StartsWith("<>") || ti.Name.StartsWith("VB$")) && (ti.Attributes & TypeAttributes.NotPublic) == TypeAttributes.NotPublic)
+		if (targetTypeInfo.IsGenericType && targetTypeInfo.Name.Contains("AnonymousType") &&
+		    (targetTypeInfo.Name.StartsWith("<>") || targetTypeInfo.Name.StartsWith("VB$")) &&
+		    (targetTypeInfo.Attributes & TypeAttributes.NotPublic) == TypeAttributes.NotPublic)
 		{
 			if (ApplicationCommandsExtension.DebugEnabled)
 				ApplicationCommandsExtension.Logger.LogDebug("Anonymous");
 			return false;
 		}
 
 		// check if abstract, static, or not a class
-		if (!ti.IsClass || ti.IsAbstract)
+		if (!targetTypeInfo.IsClass || targetTypeInfo.IsAbstract)
 			return false;
 
 		// check if delegate type
-		var tdelegate = typeof(Delegate).GetTypeInfo();
-		if (tdelegate.IsAssignableFrom(ti))
+		var typeDelegate = typeof(Delegate).GetTypeInfo();
+		if (typeDelegate.IsAssignableFrom(targetTypeInfo))
 		{
 			if (ApplicationCommandsExtension.DebugEnabled)
 				ApplicationCommandsExtension.Logger.LogDebug("Delegated");
@@ -65,15 +67,16 @@ internal static bool IsModuleCandidateType(this TypeInfo ti)
 		if (ApplicationCommandsExtension.DebugEnabled)
 			ApplicationCommandsExtension.Logger.LogDebug("Checking qualifying methods");
 		// qualifies if any method or type qualifies
-		return ti.DeclaredMethods.Any(xmi => xmi.IsCommandCandidate(out _)) || ti.DeclaredNestedTypes.Any(xti => xti.IsModuleCandidateType());
+		return targetTypeInfo.DeclaredMethods.Any(xmi => xmi.IsCommandCandidate(out _)) ||
+		       targetTypeInfo.DeclaredNestedTypes.Any(xti => xti.IsModuleCandidateType());
 	}
 
 	/// <summary>
 	/// Whether this is a command candidate.
 	/// </summary>
 	/// <param name="method">The method.</param>
 	/// <param name="parameters">The parameters.</param>
-	internal static bool IsCommandCandidate(this MethodInfo method, out ParameterInfo[] parameters)
+	internal static bool IsCommandCandidate(this MethodInfo? method, out ParameterInfo[]? parameters)
 	{
 		parameters = null;
 		// check if exists
@@ -83,6 +86,7 @@ internal static bool IsCommandCandidate(this MethodInfo method, out ParameterInf
 				ApplicationCommandsExtension.Logger.LogDebug("Not existent");
 			return false;
 		}
+
 		if (ApplicationCommandsExtension.DebugEnabled)
 			ApplicationCommandsExtension.Logger.LogDebug("Checking method {name}", method.Name);
 
@@ -96,10 +100,13 @@ internal static bool IsCommandCandidate(this MethodInfo method, out ParameterInf
 
 		// check if appropriate return and arguments
 		parameters = method.GetParameters();
-		if (!parameters.Any() || (parameters.First().ParameterType != typeof(ContextMenuContext) && parameters.First().ParameterType != typeof(InteractionContext)) || method.ReturnType != typeof(Task))
+		if (!parameters.Any() ||
+		    (parameters.First().ParameterType != typeof(ContextMenuContext) &&
+		     parameters.First().ParameterType != typeof(InteractionContext)) || method.ReturnType != typeof(Task))
 		{
 			if (ApplicationCommandsExtension.DebugEnabled)
-				ApplicationCommandsExtension.Logger.LogDebug("Missing first parameter with type ContextMenuContext or InteractionContext");
+				ApplicationCommandsExtension.Logger
+					.LogDebug("Missing first parameter with type ContextMenuContext or InteractionContext");
 			return false;
 		}
 

DisCatSharp.ApplicationCommands/Attributes/ContextMenu/ContextMenuAttribute.cs

@@ -55,7 +55,11 @@ public sealed class ContextMenuAttribute : Attribute
 	/// <param name="isNsfw">Whether the context menu is marked as NSFW.</param>
 	/// <param name="allowedContexts">The allowed contexts of the context menu.</param>
 	/// <param name="integrationTypes">The allowed integration types of the context menu.</param>
-	public ContextMenuAttribute(ApplicationCommandType type, string name, bool isNsfw = false, ApplicationCommandContexts[]? allowedContexts = null, ApplicationCommandIntegrationTypes[]? integrationTypes = null)
+	public ContextMenuAttribute(
+		ApplicationCommandType type, string name, bool isNsfw = false,
+		ApplicationCommandContexts[]? allowedContexts = null,
+		ApplicationCommandIntegrationTypes[]? integrationTypes = null
+	)
 	{
 		if (type == ApplicationCommandType.ChatInput)
 			throw new ArgumentException("Context menus cannot be of type ChatInput (Slash).");
@@ -69,7 +73,6 @@ public ContextMenuAttribute(ApplicationCommandType type, string name, bool isNsf
 		this.IntegrationTypes = integrationTypes?.ToList();
 	}
 
-
 	/// <summary>
 	/// Marks this method as a context menu.
 	/// </summary>
@@ -79,7 +82,11 @@ public ContextMenuAttribute(ApplicationCommandType type, string name, bool isNsf
 	/// <param name="isNsfw">Whether the context menu is marked as NSFW.</param>
 	/// <param name="allowedContexts">The allowed contexts of the context menu.</param>
 	/// <param name="integrationTypes">The allowed integration types of the context menu.</param>
-	public ContextMenuAttribute(ApplicationCommandType type, string name, long defaultMemberPermissions, bool isNsfw = false, ApplicationCommandContexts[]? allowedContexts = null, ApplicationCommandIntegrationTypes[]? integrationTypes = null)
+	public ContextMenuAttribute(
+		ApplicationCommandType type, string name, long defaultMemberPermissions,
+		bool isNsfw = false, ApplicationCommandContexts[]? allowedContexts = null,
+		ApplicationCommandIntegrationTypes[]? integrationTypes = null
+	)
 	{
 		if (type == ApplicationCommandType.ChatInput)
 			throw new ArgumentException("Context menus cannot be of type ChatInput (Slash).");
@@ -93,7 +100,6 @@ public ContextMenuAttribute(ApplicationCommandType type, string name, long defau
 		this.IntegrationTypes = integrationTypes?.ToList();
 	}
 
-
 	/// <summary>
 	/// Marks this method as context menu.
 	/// </summary>
@@ -103,7 +109,11 @@ public ContextMenuAttribute(ApplicationCommandType type, string name, long defau
 	/// <param name="isNsfw">Whether the context menu is marked as NSFW.</param>
 	/// <param name="allowedContexts">The allowed contexts of the context menu.</param>
 	/// <param name="integrationTypes">The allowed integration types of the context menu.</param>
-	public ContextMenuAttribute(ApplicationCommandType type, string name, bool dmPermission, bool isNsfw = false, ApplicationCommandContexts[]? allowedContexts = null, ApplicationCommandIntegrationTypes[]? integrationTypes = null)
+	public ContextMenuAttribute(
+		ApplicationCommandType type, string name, bool dmPermission, bool isNsfw = false,
+		ApplicationCommandContexts[]? allowedContexts = null,
+		ApplicationCommandIntegrationTypes[]? integrationTypes = null
+	)
 	{
 		if (type == ApplicationCommandType.ChatInput)
 			throw new ArgumentException("Context menus cannot be of type ChatInput (Slash).");
@@ -127,7 +137,12 @@ public ContextMenuAttribute(ApplicationCommandType type, string name, bool dmPer
 	/// <param name="isNsfw">Whether the context menu is marked as NSFW.</param>
 	/// <param name="allowedContexts">The allowed contexts of the context menu.</param>
 	/// <param name="integrationTypes">The allowed integration types of the context menu.</param>
-	public ContextMenuAttribute(ApplicationCommandType type, string name, long defaultMemberPermissions, bool dmPermission, bool isNsfw = false, ApplicationCommandContexts[]? allowedContexts = null, ApplicationCommandIntegrationTypes[]? integrationTypes = null)
+	public ContextMenuAttribute(
+		ApplicationCommandType type, string name, long defaultMemberPermissions,
+		bool dmPermission, bool isNsfw = false,
+		ApplicationCommandContexts[]? allowedContexts = null,
+		ApplicationCommandIntegrationTypes[]? integrationTypes = null
+	)
 	{
 		if (type == ApplicationCommandType.ChatInput)
 			throw new ArgumentException("Context menus cannot be of type ChatInput (Slash).");

DisCatSharp.ApplicationCommands/Attributes/ContextMenu/ContextMenuCooldownAttribute.cs

@@ -12,7 +12,8 @@ namespace DisCatSharp.ApplicationCommands.Attributes;
 /// Defines a cooldown for this command. This allows you to define how many times can users execute a specific command
 /// </summary>
 [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
-public sealed class ContextMenuCooldownAttribute : ApplicationCommandCheckBaseAttribute, ICooldown<BaseContext, ContextMenuCooldownBucket>
+public sealed class ContextMenuCooldownAttribute : ApplicationCommandCheckBaseAttribute,
+	ICooldown<BaseContext, ContextMenuCooldownBucket>
 {
 	/// <summary>
 	/// Gets the maximum number of uses before this command triggers a cooldown for its bucket.
@@ -45,7 +46,7 @@ public ContextMenuCooldownAttribute(int maxUses, double resetAfter, CooldownBuck
 		this.MaxUses = maxUses;
 		this.Reset = TimeSpan.FromSeconds(resetAfter);
 		this.BucketType = bucketType;
-		this.Buckets = new ConcurrentDictionary<string, ContextMenuCooldownBucket>();
+		this.Buckets = new();
 	}
 
 	/// <summary>
@@ -68,7 +69,11 @@ public ContextMenuCooldownBucket GetBucket(BaseContext ctx)
 	public TimeSpan GetRemainingCooldown(BaseContext ctx)
 	{
 		var bucket = this.GetBucket(ctx);
-		return bucket == null ? TimeSpan.Zero : bucket.RemainingUses > 0 ? TimeSpan.Zero : bucket.ResetsAt - DateTimeOffset.UtcNow;
+		return bucket == null
+			? TimeSpan.Zero
+			: bucket.RemainingUses > 0
+				? TimeSpan.Zero
+				: bucket.ResetsAt - DateTimeOffset.UtcNow;
 	}
 
 	/// <summary>
@@ -108,7 +113,7 @@ public override async Task<bool> ExecuteChecksAsync(BaseContext ctx)
 		var bid = this.GetBucketId(ctx, out var usr, out var chn, out var gld);
 		if (!this.Buckets.TryGetValue(bid, out var bucket))
 		{
-			bucket = new ContextMenuCooldownBucket(this.MaxUses, this.Reset, usr, chn, gld);
+			bucket = new(this.MaxUses, this.Reset, usr, chn, gld);
 			this.Buckets.AddOrUpdate(bid, bucket, (k, v) => bucket);
 		}
 
@@ -121,10 +126,12 @@ public override async Task<bool> ExecuteChecksAsync(BaseContext ctx)
 /// </summary>
 public sealed class ContextMenuCooldownBucket : CooldownBucket
 {
-	internal ContextMenuCooldownBucket(int maxUses, TimeSpan resetAfter, ulong userId = 0, ulong channelId = 0, ulong guildId = 0)
+	internal ContextMenuCooldownBucket(
+		int maxUses, TimeSpan resetAfter, ulong userId = 0, ulong channelId = 0,
+		ulong guildId = 0
+	)
 		: base(maxUses, resetAfter, userId, channelId, guildId)
-	{
-	}
+	{ }
 
 	/// <summary>
 	/// Returns a string representation of this command cooldown bucket.

DisCatSharp.ApplicationCommands/Attributes/RequireOwnerAttribute.cs

@@ -10,7 +10,8 @@ namespace DisCatSharp.ApplicationCommands.Attributes;
 /// <summary>
 /// Defines that this application command is restricted to the owner of the bot.
 /// </summary>
-[Deprecated("This is deprecated and will be remove in future in favor of RequireTeamXY"), AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = false)]
+[Deprecated("This is deprecated and will be remove in future in favor of RequireTeamXY"),
+ AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = false)]
 public sealed class ApplicationCommandRequireOwnerAttribute : ApplicationCommandCheckBaseAttribute
 {
 	/// <summary>
@@ -28,6 +29,8 @@ public override Task<bool> ExecuteChecksAsync(BaseContext ctx)
 		var app = ctx.Client.CurrentApplication!;
 		var me = ctx.Client.CurrentUser!;
 
-		return app != null ? Task.FromResult(app.Members.Any(x => x.Id == ctx.User.Id)) : Task.FromResult(ctx.User.Id == me.Id);
+		return app != null
+			? Task.FromResult(app.Members.Any(x => x.Id == ctx.User.Id))
+			: Task.FromResult(ctx.User.Id == me.Id);
 	}
 }

DisCatSharp.ApplicationCommands/Attributes/RequireOwnerOrIdAttribute.cs

@@ -12,7 +12,8 @@ namespace DisCatSharp.ApplicationCommands.Attributes;
 /// <summary>
 /// Requires ownership of the bot or a whitelisted id to execute this command.
 /// </summary>
-[Deprecated("This is deprecated and will be remove in future in favor of RequireTeamXY"), AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = false)]
+[Deprecated("This is deprecated and will be remove in future in favor of RequireTeamXY"),
+ AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = false)]
 public sealed class ApplicationCommandRequireOwnerOrIdAttribute : ApplicationCommandCheckBaseAttribute
 {
 	/// <summary>
@@ -39,7 +40,9 @@ public override Task<bool> ExecuteChecksAsync(BaseContext ctx)
 		var app = ctx.Client.CurrentApplication!;
 		var me = ctx.Client.CurrentUser!;
 
-		var owner = app != null ? Task.FromResult(app.Members.Any(x => x.Id == ctx.User.Id)) : Task.FromResult(ctx.User.Id == me.Id);
+		var owner = app != null
+			? Task.FromResult(app.Members.Any(x => x.Id == ctx.User.Id))
+			: Task.FromResult(ctx.User.Id == me.Id);
 
 		var allowed = this.UserIds.Contains(ctx.User.Id);
 

DisCatSharp.ApplicationCommands/Attributes/RequirePermissionsAttribute.cs

@@ -44,11 +44,13 @@ public override async Task<bool> ExecuteChecksAsync(BaseContext ctx)
 		var usr = ctx.Member;
 		if (usr == null)
 			return false;
+
 		var pusr = ctx.Channel.PermissionsFor(usr);
 
 		var bot = await ctx.Guild.GetMemberAsync(ctx.Client.CurrentUser.Id).ConfigureAwait(false);
 		if (bot == null)
 			return false;
+
 		var pbot = ctx.Channel.PermissionsFor(bot);
 
 		var usrok = ctx.Guild.OwnerId == usr.Id;

DisCatSharp.ApplicationCommands/Attributes/RequireTeamDeveloper.cs

@@ -28,6 +28,8 @@ public override Task<bool> ExecuteChecksAsync(BaseContext ctx)
 			return Task.FromResult(app.Owner.Id == ctx.User.Id);
 
 		var teamMember = app.Team?.Members.FirstOrDefault(x => x.User.Id == ctx.User.Id);
-		return teamMember == null ? Task.FromResult(false) : Task.FromResult(teamMember.Role is "developer" or "admin" or "owner");
+		return teamMember == null
+			? Task.FromResult(false)
+			: Task.FromResult(teamMember.Role is "developer" or "admin" or "owner");
 	}
 }

DisCatSharp.ApplicationCommands/Attributes/RequireTeamMember.cs

@@ -24,6 +24,8 @@ public ApplicationCommandRequireTeamMemberAttribute()
 	public override Task<bool> ExecuteChecksAsync(BaseContext ctx)
 	{
 		var app = ctx.Client.CurrentApplication!;
-		return app.Team is null ? Task.FromResult(app.Owner.Id == ctx.User.Id) : Task.FromResult(app.Members.Any(x => x.Id == ctx.User.Id));
+		return app.Team is null
+			? Task.FromResult(app.Owner.Id == ctx.User.Id)
+			: Task.FromResult(app.Members.Any(x => x.Id == ctx.User.Id));
 	}
 }