Move all interaction classes to its own project

Geekbot.net.sln

@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bot", "src\Bot\Bot.csproj",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands", "src\Commands\Commands.csproj", "{7C771DFE-912A-4276-B0A6-047E09603F1E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Interactions", "src\Interactions\Interactions.csproj", "{FF6859D9-C539-4910-BE1E-9ECFED2F46FA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@ Global
 		{7C771DFE-912A-4276-B0A6-047E09603F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7C771DFE-912A-4276-B0A6-047E09603F1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C771DFE-912A-4276-B0A6-047E09603F1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FF6859D9-C539-4910-BE1E-9ECFED2F46FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF6859D9-C539-4910-BE1E-9ECFED2F46FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF6859D9-C539-4910-BE1E-9ECFED2F46FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF6859D9-C539-4910-BE1E-9ECFED2F46FA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Bot/Commands/User/Karma.cs

@@ -47,14 +47,14 @@ namespace Geekbot.Bot.Commands.User
         {
             try
             {
-                var author = new Core.Interactions.Resolved.User()
+                var author = new Interactions.Resolved.User()
                 {
                     Id = Context.User.Id.ToString(),
                     Username = Context.User.Username,
                     Discriminator = Context.User.Discriminator,
                     Avatar = Context.User.AvatarId,
                 };
-                var targetUser = new Core.Interactions.Resolved.User()
+                var targetUser = new Interactions.Resolved.User()
                 {
                     Id = user.Id.ToString(),
                     Username = user.Username,

src/Bot/Commands/User/Rank.cs

@@ -9,7 +9,7 @@ using Geekbot.Core.ErrorHandling;
 using Geekbot.Core.GuildSettingsManager;
 using Geekbot.Core.Highscores;
 
-namespace Geekbot.Bot.Commands.User.Ranking
+namespace Geekbot.Bot.Commands.User
 {
     public class Rank : GeekbotCommandBase
     {

src/Commands/Commands.csproj

@@ -15,6 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj" />
+    <ProjectReference Include="..\Interactions\Interactions.csproj" />
   </ItemGroup>
 
 </Project>

src/Commands/Karma/Karma.cs

@@ -2,8 +2,8 @@ using System.Drawing;
 using Geekbot.Core;
 using Geekbot.Core.Database;
 using Geekbot.Core.Database.Models;
-using Geekbot.Core.Interactions.Embed;
+using Geekbot.Interactions.Embed;
-using Geekbot.Core.Interactions.Resolved;
+using Geekbot.Interactions.Resolved;
 using Localization = Geekbot.Core.Localization;
 
 namespace Geekbot.Commands.Karma;

src/Commands/UrbanDictionary/UrbanDictionary.cs

@@ -1,6 +1,6 @@
 using System.Drawing;
 using Geekbot.Core;
-using Geekbot.Core.Interactions.Embed;
+using Geekbot.Interactions.Embed;
 
 namespace Geekbot.Commands.UrbanDictionary;
 

src/Core/Interactions/IInteractionCommandManager.cs

@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Geekbot.Core.Interactions.ApplicationCommand;
-using Geekbot.Core.Interactions.Request;
-using Geekbot.Core.Interactions.Response;
-
-namespace Geekbot.Core.Interactions
-{
-    public interface IInteractionCommandManager
-    {
-        Dictionary<string, Command> CommandsInfo { get; init; }
-        Task<InteractionResponse> RunCommand(Interaction interaction);
-    }
-}

src/Interactions/ApplicationCommand/Command.cs

@@ -1,7 +1,6 @@
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.ApplicationCommand
+namespace Geekbot.Interactions.ApplicationCommand
 {
     /// <see href="https://discord.com/developers/docs/interactions/application-commands#application-command-object"/>
     public record Command

src/Interactions/ApplicationCommand/CommandType.cs

@@ -1,4 +1,4 @@
-namespace Geekbot.Core.Interactions.ApplicationCommand
+namespace Geekbot.Interactions.ApplicationCommand
 {
     /// <see href="https://discord.com/developers/docs/interactions/application-commands#application-command-object-application-command-types"/>
     public enum CommandType

src/Interactions/ApplicationCommand/Option.cs

@@ -1,7 +1,6 @@
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.ApplicationCommand
+namespace Geekbot.Interactions.ApplicationCommand
 {
     /// <remarks>
     /// Required options must be listed before optional options

src/Interactions/ApplicationCommand/OptionChoice.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.ApplicationCommand
+namespace Geekbot.Interactions.ApplicationCommand
 {
     /// <remarks>
     /// If you specify choices for an option, they are the only valid values for a user to pick

src/Interactions/ApplicationCommand/OptionType.cs

@@ -1,4 +1,4 @@
-namespace Geekbot.Core.Interactions.ApplicationCommand
+namespace Geekbot.Interactions.ApplicationCommand
 {
     /// <see href="https://discord.com/developers/docs/interactions/application-commands#application-command-object-application-command-option-type"/>
     public enum OptionType

src/Interactions/Embed/Embed.cs

@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using Discord;
 using Color = System.Drawing.Color;
 
-namespace Geekbot.Core.Interactions.Embed
+namespace Geekbot.Interactions.Embed
 {
     /// <see href="https://discord.com/developers/docs/resources/channel#embed-object" />
     public class Embed

src/Interactions/Embed/EmbedAuthor.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Embed
+namespace Geekbot.Interactions.Embed
 {
     public record EmbedAuthor
     {

src/Interactions/Embed/EmbedField.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Embed
+namespace Geekbot.Interactions.Embed
 {
     /// <see href="https://discord.com/developers/docs/resources/channel#embed-object-embed-field-structure" />
     public record EmbedField

src/Interactions/Embed/EmbedFooter.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Embed
+namespace Geekbot.Interactions.Embed
 {
     /// <see href="https://discord.com/developers/docs/resources/channel#embed-object-embed-footer-structure" />
     public record EmbedFooter

src/Interactions/Embed/EmbedImage.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Embed
+namespace Geekbot.Interactions.Embed
 {
     /// <see href="https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure" />
     public record EmbedImage

src/Interactions/Embed/EmbedProvider.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Embed
+namespace Geekbot.Interactions.Embed
 {
     /// <see href="https://discord.com/developers/docs/resources/channel#embed-object-embed-provider-structure" />
     public record EmbedProvider

src/Interactions/Embed/EmbedThumbnail.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Embed
+namespace Geekbot.Interactions.Embed
 {
     /// <see href="https://discord.com/developers/docs/resources/channel#embed-object-embed-thumbnail-structure" />
     public record EmbedThumbnail

src/Interactions/Embed/EmbedTypes.cs

@@ -1,7 +1,7 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Embed
+namespace Geekbot.Interactions.Embed
 {
     /// <summary>
     /// Embed types are "loosely defined" and, for the most part, are not used by our clients for rendering.

src/Interactions/Embed/EmbedVideo.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Embed
+namespace Geekbot.Interactions.Embed
 {
     /// <see href="https://discord.com/developers/docs/resources/channel#embed-object-embed-video-structure" />
     public record EmbedVideo

src/Interactions/IInteractionBase.cs

@@ -1,8 +1,7 @@
-using System;
+using Geekbot.Interactions.Request;
-using Geekbot.Core.Interactions.Request;
+using Geekbot.Interactions.Response;
-using Geekbot.Core.Interactions.Response;
 
-namespace Geekbot.Core.Interactions
+namespace Geekbot.Interactions
 {
     public interface IInteractionBase
     {

src/Interactions/IInteractionCommandManager.cs

@@ -0,0 +1,12 @@
+using Geekbot.Interactions.ApplicationCommand;
+using Geekbot.Interactions.Request;
+using Geekbot.Interactions.Response;
+
+namespace Geekbot.Interactions
+{
+    public interface IInteractionCommandManager
+    {
+        Dictionary<string, Command> CommandsInfo { get; init; }
+        Task<InteractionResponse> RunCommand(Interaction interaction);
+    }
+}

src/Interactions/InteractionBase.cs

@@ -1,11 +1,10 @@
-using System;
+using Geekbot.Interactions.ApplicationCommand;
-using System.Threading.Tasks;
+using Geekbot.Interactions.Request;
-using Geekbot.Core.Interactions.ApplicationCommand;
+using Geekbot.Interactions.Response;
-using Geekbot.Core.Interactions.Request;
-using Geekbot.Core.Interactions.Response;
 using Sentry;
+using Localization = Geekbot.Core.Localization;
 
-namespace Geekbot.Core.Interactions
+namespace Geekbot.Interactions
 {
     public abstract class InteractionBase : IInteractionBase
     {

src/Interactions/InteractionCommandManager.cs

@@ -1,17 +1,12 @@
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
 using Geekbot.Core.GuildSettingsManager;
-using Geekbot.Core.Interactions.ApplicationCommand;
+using Geekbot.Interactions.ApplicationCommand;
-using Geekbot.Core.Interactions.Request;
+using Geekbot.Interactions.Request;
-using Geekbot.Core.Interactions.Response;
+using Geekbot.Interactions.Response;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Geekbot.Core.Interactions
+namespace Geekbot.Interactions
 {
     public class InteractionCommandManager : IInteractionCommandManager
     {

src/Interactions/Interactions.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64;linux-x64;linux-musl-x64</RuntimeIdentifiers>
+    <VersionSuffix>$(VersionSuffix)</VersionSuffix>
+    <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)</Version>
+    <Version Condition=" '$(VersionSuffix)' == '' ">0.0.0-DEV</Version>
+    <RootNamespace>Geekbot.Interactions</RootNamespace>
+    <AssemblyName>Geekbot.Interactions</AssemblyName>
+    <NoWarn>NU1701</NoWarn> 
+    <NoWarn>CS8618</NoWarn>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Core\Core.csproj" />
+  </ItemGroup>
+
+</Project>

src/Interactions/MessageComponents/ButtonStyle.cs

@@ -1,4 +1,4 @@
-namespace Geekbot.Core.Interactions.MessageComponents
+namespace Geekbot.Interactions.MessageComponents
 {
     /// <see href="https://discord.com/developers/docs/interactions/message-components#button-object-button-styles" />
     public enum ButtonStyle

src/Interactions/MessageComponents/Component.cs

@@ -1,7 +1,6 @@
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.MessageComponents
+namespace Geekbot.Interactions.MessageComponents
 {
     /// <see href="https://discord.com/developers/docs/interactions/message-components#component-object-component-structure"/>
     public record Component

src/Interactions/MessageComponents/ComponentEmoji.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.MessageComponents
+namespace Geekbot.Interactions.MessageComponents
 {
     /// <remarks>
     /// Partial emoji with just id, name, and animated

src/Interactions/MessageComponents/ComponentType.cs

@@ -1,4 +1,4 @@
-namespace Geekbot.Core.Interactions.MessageComponents
+namespace Geekbot.Interactions.MessageComponents
 {
     /// <see href="https://discord.com/developers/docs/interactions/message-components#component-object-component-types" />
     public enum ComponentType

src/Interactions/MessageComponents/SelectOption.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.MessageComponents
+namespace Geekbot.Interactions.MessageComponents
 {
     /// <see href="https://discord.com/developers/docs/interactions/message-components#select-menu-object-select-option-structure" />
     public record SelectOption

src/Interactions/Request/Interaction.cs

@@ -1,9 +1,7 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
-using Geekbot.Core.Interactions.Resolved;
+using Geekbot.Interactions.Resolved;
 
-namespace Geekbot.Core.Interactions.Request
+namespace Geekbot.Interactions.Request
 {
     /// <see href="https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-interaction-structure" />
     public record Interaction

src/Interactions/Request/InteractionData.cs

@@ -1,9 +1,8 @@
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
-using Geekbot.Core.Interactions.ApplicationCommand;
+using Geekbot.Interactions.ApplicationCommand;
-using Geekbot.Core.Interactions.MessageComponents;
+using Geekbot.Interactions.MessageComponents;
 
-namespace Geekbot.Core.Interactions.Request
+namespace Geekbot.Interactions.Request
 {
     /// <see href="https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-interaction-data-structure" />
     public class InteractionData

src/Interactions/Request/InteractionOption.cs

@@ -1,9 +1,8 @@
-using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Geekbot.Core.Interactions.ApplicationCommand;
+using Geekbot.Interactions.ApplicationCommand;
 
-namespace Geekbot.Core.Interactions.Request
+namespace Geekbot.Interactions.Request
 {
     /// <see href="https://discord.com/developers/docs/interactions/application-commands#application-command-object-application-command-interaction-data-option-structure" />
     public record InteractionOption

src/Interactions/Request/InteractionResolvedData.cs

@@ -1,8 +1,7 @@
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
-using Geekbot.Core.Interactions.Resolved;
+using Geekbot.Interactions.Resolved;
 
-namespace Geekbot.Core.Interactions.Request
+namespace Geekbot.Interactions.Request
 {
     public class InteractionResolvedData
     {

src/Interactions/Request/InteractionType.cs

@@ -1,4 +1,4 @@
-namespace Geekbot.Core.Interactions.Request
+namespace Geekbot.Interactions.Request
 {
     /// <see href="https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-interaction-type" />
     public enum InteractionType

src/Interactions/Resolved/Attachment.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Resolved
+namespace Geekbot.Interactions.Resolved
 {
     public record Attachment
     {

src/Interactions/Resolved/Channel.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Resolved
+namespace Geekbot.Interactions.Resolved
 {
     public record Channel
     {

src/Interactions/Resolved/ChannelType.cs

@@ -1,4 +1,4 @@
-namespace Geekbot.Core.Interactions.Resolved
+namespace Geekbot.Interactions.Resolved
 {
     public enum ChannelType
     {

src/Interactions/Resolved/Emoji.cs

@@ -1,7 +1,6 @@
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Resolved
+namespace Geekbot.Interactions.Resolved
 {
     public record Emoji
     {

src/Interactions/Resolved/Member.cs

@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Resolved
+namespace Geekbot.Interactions.Resolved
 {
     public record Member
     {

src/Interactions/Resolved/Message.cs

@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Resolved
+namespace Geekbot.Interactions.Resolved
 {
     public record Message
     {

src/Interactions/Resolved/MessageInteraction.cs

@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Geekbot.Core.Interactions.Request;
+using Geekbot.Interactions.Request;
 
-namespace Geekbot.Core.Interactions.Resolved
+namespace Geekbot.Interactions.Resolved
 {
     public record MessageInteraction
     {

src/Interactions/Resolved/MessageType.cs

@@ -1,4 +1,4 @@
-namespace Geekbot.Core.Interactions.Resolved
+namespace Geekbot.Interactions.Resolved
 {
     public enum MessageType
     {

src/Interactions/Resolved/Reaction.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Resolved
+namespace Geekbot.Interactions.Resolved
 {
     public struct Reaction
     {

src/Interactions/Resolved/Role.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Resolved
+namespace Geekbot.Interactions.Resolved
 {
     public record Role
     {

src/Interactions/Resolved/RoleTag.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Resolved
+namespace Geekbot.Interactions.Resolved
 {
     public record RoleTag
     {

src/Interactions/Resolved/ThreadMetadata.cs

@@ -1,7 +1,6 @@
-using System;
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Resolved
+namespace Geekbot.Interactions.Resolved
 {
     public record ThreadMetadata
     {

src/Interactions/Resolved/User.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Resolved
+namespace Geekbot.Interactions.Resolved
 {
     public class User
     {

src/Interactions/Response/InteractionResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Geekbot.Core.Interactions.Response
+namespace Geekbot.Interactions.Response
 {
     /// <summary>
     /// Interactions--both receiving and responding--are webhooks under the hood. So responding to an Interaction is just like sending a webhook request!

src/Interactions/Response/InteractionResponseData.cs

@@ -1,10 +1,8 @@
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using Discord;
-using Geekbot.Core.Interactions.MessageComponents;
+using Geekbot.Interactions.MessageComponents;
-using Embed = Geekbot.Core.Interactions.Embed.Embed;
 
-namespace Geekbot.Core.Interactions.Response
+namespace Geekbot.Interactions.Response
 {
     /// <remarks>
     /// Not all message fields are currently supported.

src/Interactions/Response/InteractionResponseType.cs

@@ -1,4 +1,4 @@
-namespace Geekbot.Core.Interactions.Response
+namespace Geekbot.Interactions.Response
 {
     /// <see href="https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-response-object-interaction-callback-type"/>
     public enum InteractionResponseType

src/Web/Commands/Karma.cs

@@ -1,9 +1,9 @@
 using Geekbot.Commands.Karma;
 using Geekbot.Core.Database;
-using Geekbot.Core.Interactions;
+using Geekbot.Interactions;
-using Geekbot.Core.Interactions.ApplicationCommand;
+using Geekbot.Interactions.ApplicationCommand;
-using Geekbot.Core.Interactions.Request;
+using Geekbot.Interactions.Request;
-using Geekbot.Core.Interactions.Response;
+using Geekbot.Interactions.Response;
 
 namespace Geekbot.Web.Commands;
 

src/Web/Commands/KarmaUserBad.cs

@@ -1,9 +1,9 @@
 using Geekbot.Commands.Karma;
 using Geekbot.Core.Database;
-using Geekbot.Core.Interactions;
+using Geekbot.Interactions;
-using Geekbot.Core.Interactions.ApplicationCommand;
+using Geekbot.Interactions.ApplicationCommand;
-using Geekbot.Core.Interactions.Request;
+using Geekbot.Interactions.Request;
-using Geekbot.Core.Interactions.Response;
+using Geekbot.Interactions.Response;
 
 namespace Geekbot.Web.Commands;
 

src/Web/Commands/KarmaUserGood.cs

@@ -1,9 +1,9 @@
 using Geekbot.Commands.Karma;
 using Geekbot.Core.Database;
-using Geekbot.Core.Interactions;
+using Geekbot.Interactions;
-using Geekbot.Core.Interactions.ApplicationCommand;
+using Geekbot.Interactions.ApplicationCommand;
-using Geekbot.Core.Interactions.Request;
+using Geekbot.Interactions.Request;
-using Geekbot.Core.Interactions.Response;
+using Geekbot.Interactions.Response;
 
 namespace Geekbot.Web.Commands;
 

src/Web/Commands/KarmaUserNeutral.cs

@@ -1,9 +1,9 @@
 using Geekbot.Commands.Karma;
 using Geekbot.Core.Database;
-using Geekbot.Core.Interactions;
+using Geekbot.Interactions;
-using Geekbot.Core.Interactions.ApplicationCommand;
+using Geekbot.Interactions.ApplicationCommand;
-using Geekbot.Core.Interactions.Request;
+using Geekbot.Interactions.Request;
-using Geekbot.Core.Interactions.Response;
+using Geekbot.Interactions.Response;
 
 namespace Geekbot.Web.Commands;
 

src/Web/Commands/Rank.cs

@@ -1,10 +1,10 @@
 using Geekbot.Core.Converters;
 using Geekbot.Core.Database;
 using Geekbot.Core.Highscores;
-using Geekbot.Core.Interactions;
+using Geekbot.Interactions;
-using Geekbot.Core.Interactions.ApplicationCommand;
+using Geekbot.Interactions.ApplicationCommand;
-using Geekbot.Core.Interactions.Request;
+using Geekbot.Interactions.Request;
-using Geekbot.Core.Interactions.Response;
+using Geekbot.Interactions.Response;
 
 namespace Geekbot.Web.Commands;
 

src/Web/Commands/Roll.cs

@@ -1,8 +1,8 @@
 using Geekbot.Core.Database;
-using Geekbot.Core.Interactions;
+using Geekbot.Interactions;
-using Geekbot.Core.Interactions.ApplicationCommand;
+using Geekbot.Interactions.ApplicationCommand;
-using Geekbot.Core.Interactions.Request;
+using Geekbot.Interactions.Request;
-using Geekbot.Core.Interactions.Response;
+using Geekbot.Interactions.Response;
 using Geekbot.Core.KvInMemoryStore;
 using Geekbot.Core.RandomNumberGenerator;
 

src/Web/Commands/UrbanDictionary.cs

@@ -1,7 +1,7 @@
-using Geekbot.Core.Interactions;
+using Geekbot.Interactions;
-using Geekbot.Core.Interactions.ApplicationCommand;
+using Geekbot.Interactions.ApplicationCommand;
-using Geekbot.Core.Interactions.Request;
+using Geekbot.Interactions.Request;
-using Geekbot.Core.Interactions.Response;
+using Geekbot.Interactions.Response;
 
 namespace Geekbot.Web.Commands;
 

src/Web/Controllers/Interactions/InteractionController.cs

@@ -1,9 +1,9 @@
 using System.Text;
 using System.Text.Json;
 using Geekbot.Core.GlobalSettings;
-using Geekbot.Core.Interactions;
+using Geekbot.Interactions;
-using Geekbot.Core.Interactions.Request;
+using Geekbot.Interactions.Request;
-using Geekbot.Core.Interactions.Response;
+using Geekbot.Interactions.Response;
 using Microsoft.AspNetCore.Mvc;
 using Sodium;
 

src/Web/Controllers/Interactions/InteractionRegistrarController.cs

@@ -1,8 +1,8 @@
 using System.Net.Http.Headers;
 using Geekbot.Core;
 using Geekbot.Core.GlobalSettings;
-using Geekbot.Core.Interactions;
+using Geekbot.Interactions;
-using Geekbot.Core.Interactions.ApplicationCommand;
+using Geekbot.Interactions.ApplicationCommand;
 using Geekbot.Core.Logger;
 using Geekbot.Web.Controllers.Interactions.Model;
 using Microsoft.AspNetCore.Mvc;

src/Web/Controllers/Interactions/Model/InteractionRegistrationOperations.cs

@@ -1,4 +1,4 @@
-using Geekbot.Core.Interactions.ApplicationCommand;
+using Geekbot.Interactions.ApplicationCommand;
 
 namespace Geekbot.Web.Controllers.Interactions.Model;
 

src/Web/Controllers/Interactions/Model/RegisteredInteraction.cs

@@ -1,5 +1,5 @@
 using System.Text.Json.Serialization;
-using Geekbot.Core.Interactions.Request;
+using Geekbot.Interactions.Request;
 
 namespace Geekbot.Web.Controllers.Interactions.Model;
 

src/Web/Web.csproj

@@ -18,6 +18,7 @@
     <ItemGroup>
         <ProjectReference Include="..\Commands\Commands.csproj" />
         <ProjectReference Include="..\Core\Core.csproj" />
+        <ProjectReference Include="..\Interactions\Interactions.csproj" />
     </ItemGroup>
 
     <ItemGroup>

src/Web/WebApiStartup.cs

@@ -6,8 +6,8 @@ using Geekbot.Core.Database;
 using Geekbot.Core.GlobalSettings;
 using Geekbot.Core.GuildSettingsManager;
 using Geekbot.Core.Highscores;
-using Geekbot.Core.Interactions;
 using Geekbot.Core.Logger;
+using Geekbot.Interactions;
 using Geekbot.Web.Logging;
 
 namespace Geekbot.Web;