Merge pull request #24 from minisbett/master

release: version 2.5.1
minisbett · Sep 27, 2024 · fce16ba · fce16ba
2 parents c574d76 + 42b7670
commit fce16ba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/huisbot/Modules/CSharpRepl.cs b/huisbot/Modules/CSharpRepl.cs
@@ -1,5 +1,6 @@
 using Discord;
 using Discord.Interactions;
+using Discord.Rest;
 using Discord.WebSocket;
 using huisbot.Persistence;
 using huisbot.Services;
@@ -86,9 +87,8 @@ public async Task CSharpReplAsync(
     [Summary("code", "The C# code to execute.")] string code)
   {
     // Make sure that the user is the owner of the application.
-    ulong appOwner = (await Context.Client.GetApplicationInfoAsync()).Owner.Id;
-    ulong teamOwner = (await Context.Client.GetApplicationInfoAsync()).Team.OwnerUserId;
-    if (Context.User.Id != appOwner && Context.User.Id != teamOwner)
+    RestApplication app = await Context.Client.GetApplicationInfoAsync();
+    if (Context.User.Id == app.Owner.Id || Context.User.Id != app.Team.OwnerUserId)
     {
       await RespondAsync(embed: Embeds.Error("Only the owner of the application is permitted to use this command."));
       return;

diff --git a/huisbot/Modules/ModuleBase.cs b/huisbot/Modules/ModuleBase.cs
@@ -1,4 +1,5 @@
 using Discord.Interactions;
+using Discord.Rest;
 using Discord.WebSocket;
 using huisbot.Models.Huis;
 using huisbot.Models.Osu;
@@ -354,7 +355,8 @@ public static async Task<bool> IsOnionAsync(SocketInteractionContext context)
 #endif
 
     // Check whether the user is the owner of the application.
-    if (context.User.Id == (await context.Client.GetApplicationInfoAsync()).Owner.Id)
+    RestApplication app = await context.Client.GetApplicationInfoAsync();
+    if (context.User.Id == app.Owner.Id || context.User.Id != app.Team.OwnerUserId)
       return true;
 
     // Get the PP Discord guild.
@@ -377,7 +379,8 @@ public static async Task<bool> IsPPTeamAsync(SocketInteractionContext context)
 #endif
 
     // Check whether the user is the owner of the application.
-    if (context.User.Id == (await context.Client.GetApplicationInfoAsync()).Owner.Id)
+    RestApplication app = await context.Client.GetApplicationInfoAsync();
+    if (context.User.Id == app.Owner.Id || context.User.Id != app.Team.OwnerUserId)
       return true;
 
     // Get the PP Discord guild.

diff --git a/huisbot/Program.cs b/huisbot/Program.cs
@@ -21,7 +21,7 @@ public class Program
   /// <summary>
   /// The version of the application.
   /// </summary>
-  public const string VERSION = "2.5.0";
+  public const string VERSION = "2.5.1";
 
   /// <summary>
   /// The startup time of the application.
@@ -97,7 +97,7 @@ public static async Task MainAsync(string[] args)
             LogLevel = LogSeverity.Verbose,
             AlwaysDownloadUsers = true,
             MessageCacheSize = 100,
-            GatewayIntents = GatewayIntents.AllUnprivileged | GatewayIntents.MessageContent
+            GatewayIntents = GatewayIntents.AllUnprivileged | GatewayIntents.MessageContent | GatewayIntents.GuildMembers
           };
 
           config.Token = context.Configuration["BOT_TOKEN"]