diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts
index c35b3f60..153e086d 100644
--- a/src/util/entities/Message.ts
+++ b/src/util/entities/Message.ts
@@ -20,7 +20,6 @@ import { User } from "./User";
import { Member } from "./Member";
import { Role } from "./Role";
import { Channel } from "./Channel";
-import { InteractionType } from "../interfaces";
import { Application } from "./Application";
import { Column, CreateDateColumn, Entity, Index, JoinColumn, JoinTable, ManyToMany, ManyToOne, OneToMany, RelationId, FindOneOptions, Raw, Not, BaseEntity, In } from "typeorm";
import { BaseClass } from "./BaseClass";
@@ -42,6 +41,7 @@ import {
Reaction,
UnfurledMediaItem,
PartialUser,
+ InteractionType,
} from "@spacebar/schemas";
import { MessageFlags } from "@spacebar/util";
import { JsonRemoveEmpty } from "../util/Decorators";
diff --git a/src/util/imports/Interactions.ts b/src/util/imports/Interactions.ts
index 304241cd..7c3bbd3d 100644
--- a/src/util/imports/Interactions.ts
+++ b/src/util/imports/Interactions.ts
@@ -16,8 +16,8 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { ApplicationCommandType } from "@spacebar/schemas";
-import { InteractionType, Snowflake } from "@spacebar/util";
+import { ApplicationCommandType, InteractionType } from "@spacebar/schemas";
+import { Snowflake } from "@spacebar/util";
interface PendingInteraction {
timeout: NodeJS.Timeout;
diff --git a/src/util/interfaces/Event.ts b/src/util/interfaces/Event.ts
index 63e206f3..96d04a55 100644
--- a/src/util/interfaces/Event.ts
+++ b/src/util/interfaces/Event.ts
@@ -18,8 +18,6 @@
import {
ConnectedAccount,
- Interaction,
- Message,
Invite,
Role,
Emoji,
@@ -42,6 +40,7 @@ import { JsonValue } from "@protobuf-ts/runtime";
import {
ApplicationCommand,
GuildCreateResponse,
+ Interaction,
InteractionFailureReason,
PartialEmoji,
PublicChannel,
diff --git a/src/util/interfaces/Interaction.ts b/src/util/interfaces/Interaction.ts
deleted file mode 100644
index 8c9c752d..00000000
--- a/src/util/interfaces/Interaction.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
- Copyright (C) 2023 Spacebar and Spacebar Contributors
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { Embed, AllowedMentions } from "@spacebar/schemas";
-
-export interface Interaction {
- id: string;
- type: InteractionType;
- data?: object; // TODO typing
- guild_id: string;
- channel_id: string;
- member_id: string;
- token: string;
- version: number;
-}
-
-export enum InteractionType {
- Ping = 1,
- ApplicationCommand = 2,
- MessageComponent = 3,
- ApplicationCommandAutocomplete = 4,
- ModalSubmit = 5,
-}
-
-export enum InteractionResponseType {
- SelfCommandResponse = 0,
- Pong = 1,
- Acknowledge = 2,
- ChannelMessage = 3,
- ChannelMessageWithSource = 4,
- AcknowledgeWithSource = 5,
-}
-
-export interface InteractionApplicationCommandCallbackData {
- tts?: boolean;
- content: string;
- embeds?: Embed[];
- allowed_mentions?: AllowedMentions;
-}
diff --git a/src/util/interfaces/index.ts b/src/util/interfaces/index.ts
index 6620ba32..63a3dc6c 100644
--- a/src/util/interfaces/index.ts
+++ b/src/util/interfaces/index.ts
@@ -20,6 +20,5 @@ export * from "./Activity";
export * from "./ConnectedAccount";
export * from "./Event";
export * from "./GuildWelcomeScreen";
-export * from "./Interaction";
export * from "./Presence";
export * from "./Status";
|
