Routes: reduce scope of api imports to api/util

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";

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";

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";

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";
 

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,

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";

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,

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";

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";
 

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";

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";
 

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) => {

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 });

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 });