diff --git a/src/api/routes/auth/forgot.ts b/src/api/routes/auth/forgot.ts
index 3c1258f2..a21db720 100644
--- a/src/api/routes/auth/forgot.ts
+++ b/src/api/routes/auth/forgot.ts
@@ -17,7 +17,7 @@
*/
import { Request, Response, Router } from "express";
-import { route, verifyCaptcha } from "@spacebar/api";
+import { route, verifyCaptcha } from "@spacebar/api/util";
import { User } from "@spacebar/database";
import { Config, Email } from "@spacebar/util";
import { ForgotPasswordSchema } from "@spacebar/schemas";
diff --git a/src/api/routes/auth/login.ts b/src/api/routes/auth/login.ts
index 49889c2f..b74414b5 100644
--- a/src/api/routes/auth/login.ts
+++ b/src/api/routes/auth/login.ts
@@ -19,7 +19,7 @@
import crypto from "node:crypto";
import bcrypt from "bcrypt";
import { Request, Response, Router } from "express";
-import { route, verifyCaptcha } from "@spacebar/api";
+import { route, verifyCaptcha } from "@spacebar/api/util";
import { User } from "@spacebar/database";
import { Config, FieldErrors, WebAuthn, generateToken, generateWebAuthnTicket } from "@spacebar/util";
import { LoginSchema } from "@spacebar/schemas";
diff --git a/src/api/routes/auth/register.ts b/src/api/routes/auth/register.ts
index 767d53cc..6d2133f0 100644
--- a/src/api/routes/auth/register.ts
+++ b/src/api/routes/auth/register.ts
@@ -20,7 +20,7 @@ import bcrypt from "bcrypt";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server/HTTPError";
import { MoreThan } from "typeorm";
-import { route, verifyCaptcha } from "@spacebar/api";
+import { route, verifyCaptcha } from "@spacebar/api/util";
import { Invite, User, ValidRegistrationToken } from "@spacebar/database";
import { Config, FieldErrors, generateToken, IpDataClient, AbuseIpDbClient } from "@spacebar/util";
import { RegisterSchema } from "@spacebar/schemas";
diff --git a/src/api/routes/auth/verify/index.ts b/src/api/routes/auth/verify/index.ts
index bdf4dc6d..59020b61 100644
--- a/src/api/routes/auth/verify/index.ts
+++ b/src/api/routes/auth/verify/index.ts
@@ -17,7 +17,7 @@
*/
import { Request, Response, Router } from "express";
-import { route, verifyCaptcha } from "@spacebar/api";
+import { route, verifyCaptcha } from "@spacebar/api/util";
import { User } from "@spacebar/database";
import { checkToken, Config, FieldErrors, generateToken } from "@spacebar/util";
diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts
index d31df7dc..98ed53fb 100644
--- a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts
@@ -19,7 +19,7 @@
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server/HTTPError";
import multer from "multer";
-import { handleMessage, postHandleMessage, route } from "@spacebar/api";
+import { handleMessage, postHandleMessage, route } from "@spacebar/api/util";
import { Attachment, Channel, Message } from "@spacebar/database";
import {
MessageCreateEvent,
diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/threads.ts b/src/api/routes/channels/#channel_id/messages/#message_id/threads.ts
index bf37dfe1..edd6f555 100644
--- a/src/api/routes/channels/#channel_id/messages/#message_id/threads.ts
+++ b/src/api/routes/channels/#channel_id/messages/#message_id/threads.ts
@@ -17,7 +17,7 @@
*/
import { Request, Response, Router } from "express";
-import { route, sendMessage } from "@spacebar/api";
+import { route, sendMessage } from "@spacebar/api/util";
import { Channel, Message, User } from "@spacebar/database";
import { emitEvent, MessageUpdateEvent } from "@spacebar/util";
import { MessageThreadCreationSchema, ChannelType, MessageType } from "@spacebar/schemas";
diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts
index ccfd54fd..554593ca 100644
--- a/src/api/routes/channels/#channel_id/messages/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/index.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { handleMessage, postHandleMessage, route } from "@spacebar/api";
+import { handleMessage, postHandleMessage, route } from "@spacebar/api/util";
import { Attachment, Channel, Member, Message, ReadState, Relationship, User, ThreadMember, ThreadMemberFlags } from "@spacebar/database";
import {
Config,
@@ -39,7 +39,6 @@ import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server/HTTPError";
import multer from "multer";
import { FindManyOptions, FindOperator, LessThan, MoreThan, MoreThanOrEqual } from "typeorm";
-import { URL } from "node:url";
import {
AcknowledgeDeleteSchema,
isTextChannel,
diff --git a/src/api/routes/channels/#channel_id/threads.ts b/src/api/routes/channels/#channel_id/threads.ts
index b9850635..6fe4ff11 100644
--- a/src/api/routes/channels/#channel_id/threads.ts
+++ b/src/api/routes/channels/#channel_id/threads.ts
@@ -19,7 +19,7 @@
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server/HTTPError";
import { FindManyOptions, FindOptionsOrder, In, Like, ArrayContains, ArrayOverlap } from "typeorm";
-import { handleMessage, postHandleMessage, route, sendMessage } from "@spacebar/api";
+import { handleMessage, postHandleMessage, route, sendMessage } from "@spacebar/api/util";
import { Attachment, Channel, Member, Message, ReadState, ThreadMember, User } from "@spacebar/database";
import { emitEvent, uploadFile, MessageCreateEvent, FieldErrors, getPermission, ChannelFlags } from "@spacebar/util";
import { ChannelType, MessageType, ThreadCreationSchema, MessageCreateAttachment, MessageCreateCloudAttachment } from "@spacebar/schemas";
diff --git a/src/api/routes/guilds/#guild_id/regions.ts b/src/api/routes/guilds/#guild_id/regions.ts
index 12fb33df..a924441c 100644
--- a/src/api/routes/guilds/#guild_id/regions.ts
+++ b/src/api/routes/guilds/#guild_id/regions.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { getVoiceRegions, route } from "@spacebar/api";
+import { getVoiceRegions, route } from "@spacebar/api/util";
import { Guild } from "@spacebar/database";
import { Request, Response, Router } from "express";
diff --git a/src/api/routes/interactions/#interaction_id/#interaction_token/callback.ts b/src/api/routes/interactions/#interaction_id/#interaction_token/callback.ts
index fde2c556..d071bcb4 100644
--- a/src/api/routes/interactions/#interaction_id/#interaction_token/callback.ts
+++ b/src/api/routes/interactions/#interaction_id/#interaction_token/callback.ts
@@ -18,7 +18,7 @@
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server/HTTPError";
-import { handleComps, route, sendMessage } from "@spacebar/api";
+import { handleComps, route, sendMessage } from "@spacebar/api/util";
import { Message, User } from "@spacebar/database";
import { InteractionCallbacksSchema, InteractionCallbackType, InteractionFailureReason, MessageType } from "@spacebar/schemas";
import { Config, emitEvent, InteractionSuccessEvent, MessageUpdateEvent, pendingInteractions, InteractionFailureEvent } from "@spacebar/util";
diff --git a/src/api/routes/stop.ts b/src/api/routes/stop.ts
index 836c72cc..574bf918 100644
--- a/src/api/routes/stop.ts
+++ b/src/api/routes/stop.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { route, SpacebarServer } from "@spacebar/api";
+import { route } from "@spacebar/api/util/handlers/route";
import { Request, Response, Router } from "express";
import { ProcessLifecycle } from "@spacebar/util/util/ProcessLifecycle";
diff --git a/src/api/routes/template.ts.disabled b/src/api/routes/template.ts.disabled
index 2de95f5f..bdf53fc5 100644
--- a/src/api/routes/template.ts.disabled
+++ b/src/api/routes/template.ts.disabled
@@ -1,7 +1,8 @@
//TODO: this is a template for a generic route
import { Router, Request, Response } from "express";
-import { route } from "@spacebar/api";
+import { route } from "@spacebar/api/util/handlers/route";
+
const router = Router({ mergeParams: true });
router.get("/",route({}), async (req: Request, res: Response) => {
diff --git a/src/api/routes/voice/regions.ts b/src/api/routes/voice/regions.ts
index d23a0cb7..4ef6d60f 100644
--- a/src/api/routes/voice/regions.ts
+++ b/src/api/routes/voice/regions.ts
@@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { getVoiceRegions, route } from "@spacebar/api";
+import { getVoiceRegions, route } from "@spacebar/api/util";
import { Request, Response, Router } from "express";
const router: Router = Router({ mergeParams: true });
diff --git a/src/api/routes/webhooks/#webhook_id/#token/github.ts b/src/api/routes/webhooks/#webhook_id/#token/github.ts
index d8a84d8a..140d3618 100644
--- a/src/api/routes/webhooks/#webhook_id/#token/github.ts
+++ b/src/api/routes/webhooks/#webhook_id/#token/github.ts
@@ -1,8 +1,8 @@
-import { getProxyUrl, route } from "@spacebar/api";
import { NextFunction, Request, Response, Router } from "express";
import { HTTPError } from "lambert-server/HTTPError";
-import { executeWebhook } from "../../../../util/handlers/Webhook";
+import { getProxyUrl, route } from "@spacebar/api/util";
import { EmbedType, WebhookExecuteSchema } from "@spacebar/schemas";
+import { executeWebhook } from "../../../../util/handlers/Webhook";
const router = Router({ mergeParams: true });
|
