diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts
index 1504faae..5cb7a56b 100644
--- a/src/api/util/handlers/Message.ts
+++ b/src/api/util/handlers/Message.ts
@@ -22,7 +22,6 @@ import {
Attachment,
Channel,
Config,
- Embed,
EmbedCache,
emitEvent,
EVERYONE_MENTION,
@@ -32,8 +31,6 @@ import {
HERE_MENTION,
Message,
MessageCreateEvent,
- MessageCreateSchema,
- MessageType,
MessageUpdateEvent,
Role,
ROLE_MENTION,
@@ -45,14 +42,12 @@ import {
handleFile,
Permissions,
normalizeUrl,
- Reaction,
- MessageCreateCloudAttachment,
- MessageCreateAttachment,
} from "@spacebar/util";
import { HTTPError } from "lambert-server";
import { In } from "typeorm";
import fetch from "node-fetch-commonjs";
import { CloudAttachment } from "../../../util/entities/CloudAttachment";
+import { Embed, MessageCreateAttachment, MessageCreateCloudAttachment, MessageCreateSchema, MessageType, Reaction } from "@spacebar/schemas";
const allow_empty = false;
// TODO: check webhook, application, system author, stickers
// TODO: embed gifs/videos/images
diff --git a/src/api/util/handlers/Webhook.ts b/src/api/util/handlers/Webhook.ts
index 4431766d..9040f74c 100644
--- a/src/api/util/handlers/Webhook.ts
+++ b/src/api/util/handlers/Webhook.ts
@@ -10,11 +10,11 @@ import {
uploadFile,
ValidateName,
Webhook,
- WebhookExecuteSchema,
} from "@spacebar/util";
import { Request, Response } from "express";
import { HTTPError } from "lambert-server";
import { MoreThan } from "typeorm";
+import { WebhookExecuteSchema } from "@spacebar/schemas"
export const executeWebhook = async (req: Request, res: Response) => {
const { wait } = req.query;
diff --git a/src/api/util/handlers/route.ts b/src/api/util/handlers/route.ts
index 8425b8c2..24c3416d 100644
--- a/src/api/util/handlers/route.ts
+++ b/src/api/util/handlers/route.ts
@@ -25,12 +25,12 @@ import {
RightResolvable,
Rights,
SpacebarApiErrors,
- ajv,
getPermission,
getRights,
} from "@spacebar/util";
import { AnyValidateFunction } from "ajv/dist/core";
import { NextFunction, Request, Response } from "express";
+import { ajv } from "@spacebar/schemas"
const ignoredRequestSchemas = [
// skip validation for settings proto JSON updates - TODO: figure out if this even possible to fix?
diff --git a/src/api/util/utility/EmbedHandlers.ts b/src/api/util/utility/EmbedHandlers.ts
index 6dec3a1b..f93df3e2 100644
--- a/src/api/util/utility/EmbedHandlers.ts
+++ b/src/api/util/utility/EmbedHandlers.ts
@@ -16,7 +16,8 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { Config, Embed, EmbedImage, EmbedType } from "@spacebar/util";
+import { Config }from "@spacebar/util";
+import { Embed, EmbedImage, EmbedType } from "@spacebar/schemas";
import * as cheerio from "cheerio";
import crypto from "crypto";
import fetch, { RequestInit } from "node-fetch-commonjs";
|
