user installable

zai-tm · Mar 20, 2024 · 84e5bfe · 84e5bfe
1 parent 6dc2c0d
commit 84e5bfe
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 10 deletions.
diff --git a/XaiSharp/Commands/Message/SuggestAsQuote.cs b/XaiSharp/Commands/Message/SuggestAsQuote.cs
@@ -5,6 +5,7 @@
 
 namespace XaiSharp.Commands.Message
 {
+    [IntegrationType(ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall)]
     public class SuggestAsQuote : InteractionModuleBase<SocketInteractionContext>
     {
         Config config = Util.ParseConfig(File.ReadAllText("config.yml"));

diff --git a/XaiSharp/Commands/Slash/About.cs b/XaiSharp/Commands/Slash/About.cs
@@ -4,6 +4,8 @@
 
 namespace XaiSharp.Commands.Slash
 {
+    [IntegrationType(ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall)]
+    [CommandContextType(InteractionContextType.BotDm, InteractionContextType.PrivateChannel, InteractionContextType.Guild)]
     public class About : InteractionModuleBase<SocketInteractionContext>
     {
         Config config = Util.ParseConfig(File.ReadAllText("config.yml"));

diff --git a/XaiSharp/Commands/Slash/Countdown.cs b/XaiSharp/Commands/Slash/Countdown.cs
@@ -4,6 +4,8 @@
 
 namespace XaiSharp.Commands.Slash
 {
+    [IntegrationType(ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall)]
+    [CommandContextType(InteractionContextType.BotDm, InteractionContextType.PrivateChannel, InteractionContextType.Guild)]
     public class Countdown : InteractionModuleBase<SocketInteractionContext>
     {
         public class Event

diff --git a/XaiSharp/Commands/Slash/Crash.cs b/XaiSharp/Commands/Slash/Crash.cs
@@ -1,7 +1,10 @@
-using Discord.Interactions;
+using Discord;
+using Discord.Interactions;
 
 namespace XaiSharp.Commands.Slash
 {
+    [IntegrationType(ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall)]
+    [CommandContextType(InteractionContextType.BotDm, InteractionContextType.PrivateChannel, InteractionContextType.Guild)]
     public class Crash : InteractionModuleBase<SocketInteractionContext>
     {
 

diff --git a/XaiSharp/Commands/Slash/Credit.cs b/XaiSharp/Commands/Slash/Credit.cs
@@ -3,6 +3,8 @@
 
 namespace XaiSharp.Commands.Slash
 {
+    [IntegrationType(ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall)]
+    [CommandContextType(InteractionContextType.BotDm, InteractionContextType.PrivateChannel, InteractionContextType.Guild)]
     public class Credit : InteractionModuleBase<SocketInteractionContext>
     {
 

diff --git a/XaiSharp/Commands/Slash/CtrlAltDel.cs b/XaiSharp/Commands/Slash/CtrlAltDel.cs
@@ -4,6 +4,8 @@
 using System.Net;
 namespace XaiSharp.Commands.Slash
 {
+    [IntegrationType(ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall)]
+    [CommandContextType(InteractionContextType.BotDm, InteractionContextType.PrivateChannel, InteractionContextType.Guild)]
     public class CtrlAltDel : InteractionModuleBase<SocketInteractionContext>
     {
         [Group("cad", "That other webcomic")]

diff --git a/XaiSharp/Commands/Slash/Dice.cs b/XaiSharp/Commands/Slash/Dice.cs
@@ -3,6 +3,8 @@
 
 namespace XaiSharp.Commands.Slash
 {
+    [IntegrationType(ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall)]
+    [CommandContextType(InteractionContextType.BotDm, InteractionContextType.PrivateChannel, InteractionContextType.Guild)]
     public class Dice : InteractionModuleBase<SocketInteractionContext>
     {
 

diff --git a/XaiSharp/Commands/Slash/DiscordChangelog.cs b/XaiSharp/Commands/Slash/DiscordChangelog.cs
@@ -7,6 +7,8 @@
 
 namespace XaiSharp.Commands.Slash
 {
+    [IntegrationType(ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall)]
+    [CommandContextType(InteractionContextType.BotDm, InteractionContextType.PrivateChannel, InteractionContextType.Guild)]
     public class DiscordChangelog : InteractionModuleBase<SocketInteractionContext>
     {
         public class Changelog

diff --git a/XaiSharp/Commands/Slash/EightBall.cs b/XaiSharp/Commands/Slash/EightBall.cs
@@ -4,6 +4,8 @@
 
 namespace XaiSharp.Commands.Slash
 {
+    [IntegrationType(ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall)]
+    [CommandContextType(InteractionContextType.BotDm, InteractionContextType.PrivateChannel, InteractionContextType.Guild)]
     public class EightBall : InteractionModuleBase<SocketInteractionContext>
     {
 

diff --git a/XaiSharp/Commands/Slash/Info.cs b/XaiSharp/Commands/Slash/Info.cs
@@ -15,7 +15,8 @@ public class Info : InteractionModuleBase<SocketInteractionContext>
         public class InfoGroup : InteractionModuleBase<SocketInteractionContext>
 
         {
-            [EnabledInDm(false)]
+            [IntegrationType(ApplicationIntegrationType.GuildInstall)]
+            [CommandContextType(InteractionContextType.Guild)]
             [SlashCommand("server", "View info about the current server")]
             public async Task HandleServer()
             {
@@ -81,7 +82,8 @@ public async Task HandleServer()
                     } catch (Exception e) { Console.WriteLine(e); }
             }
 
-            [EnabledInDm(false)]
+            [IntegrationType(ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall)]
+            [CommandContextType(InteractionContextType.BotDm, InteractionContextType.PrivateChannel, InteractionContextType.Guild)]
             [SlashCommand("user", "View info about a user")]
             public async Task HandleUser(IGuildUser user)
             {

diff --git a/XaiSharp/Commands/Slash/Ping.cs b/XaiSharp/Commands/Slash/Ping.cs
@@ -4,6 +4,8 @@
 
 namespace XaiSharp.Commands.Slash
 {
+    [IntegrationType(ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall)]
+    [CommandContextType(InteractionContextType.BotDm, InteractionContextType.PrivateChannel, InteractionContextType.Guild)]
     public class Ping : InteractionModuleBase<SocketInteractionContext>
     {
 

diff --git a/XaiSharp/Commands/Slash/Quotes.cs b/XaiSharp/Commands/Slash/Quotes.cs
@@ -4,6 +4,8 @@
 
 namespace XaiSharp.Commands.Slash
 {
+    [IntegrationType(ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall)]
+    [CommandContextType(InteractionContextType.BotDm, InteractionContextType.PrivateChannel, InteractionContextType.Guild)]
     public class Quotes : InteractionModuleBase<SocketInteractionContext>
     {
 

diff --git a/XaiSharp/Commands/Slash/XKCD.cs b/XaiSharp/Commands/Slash/XKCD.cs
@@ -4,6 +4,8 @@
 using System.Net;
 namespace XaiSharp.Commands.Slash
 {
+    [IntegrationType(ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall)]
+    [CommandContextType(InteractionContextType.BotDm, InteractionContextType.PrivateChannel, InteractionContextType.Guild)]
     public class XKCD : InteractionModuleBase<SocketInteractionContext>
     {
         [Group("xkcd", "The webcomic everyone knows and loves")]

diff --git a/XaiSharp/Commands/User/Kill.cs b/XaiSharp/Commands/User/Kill.cs
@@ -4,6 +4,8 @@
 
 namespace XaiSharp.Commands.User
 {
+    [IntegrationType(ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall)]
+    [CommandContextType(InteractionContextType.BotDm, InteractionContextType.PrivateChannel, InteractionContextType.Guild)]
     public class Kill : InteractionModuleBase<SocketInteractionContext>
     {
         private class DeathMessage

diff --git a/XaiSharp/XaiSharp.csproj b/XaiSharp/XaiSharp.csproj
@@ -27,20 +27,20 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Discord.Net" Version="3.12.0" />
-    <PackageReference Include="GitInfo" Version="3.3.1">
+    <PackageReference Include="Discord.Net" Version="3.14.1" />
+    <PackageReference Include="GitInfo" Version="3.3.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Markdig" Version="0.32.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
+    <PackageReference Include="Markdig" Version="0.36.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NewTumblrSharp" Version="1.2.0.156" />
     <PackageReference Include="SQLite" Version="3.13.0" />
     <PackageReference Include="System.Data.SQLite" Version="1.0.118" />
-    <PackageReference Include="YamlDotNet" Version="13.2.0" />
+    <PackageReference Include="YamlDotNet" Version="15.1.2" />
   </ItemGroup>
 
   <ItemGroup>