State update, havent tested

api/src/Server.ts

@@ -1,7 +1,6 @@
-import "missing-native-js-functions";
 import { Server, ServerOptions } from "lambert-server";
 import { Authentication, CORS } from "./middlewares/";
-import { Config, initDatabase, initEvent } from "@fosscord/util";
+import { Config, initDatabase, initEvent, registerRoutes } from "@fosscord/util";
 import { ErrorHandler } from "./middlewares/ErrorHandler";
 import { BodyParser } from "./middlewares/BodyParser";
 import { Router, Request, Response, NextFunction } from "express";
@@ -11,7 +10,6 @@ import TestClient from "./middlewares/TestClient";
 import { initTranslation } from "./middlewares/Translation";
 import morgan from "morgan";
 import { initInstance } from "./util/handlers/Instance";
-import { registerRoutes } from "@fosscord/util";
 import { red } from "picocolors"
 
 export interface FosscordServerOptions extends ServerOptions {}
@@ -50,7 +48,7 @@ export class FosscordServer extends Server {
 					}
 				})
 			);
-		};
+		}
 
 		this.app.use(CORS);
 		this.app.use(BodyParser({ inflate: true, limit: "10mb" }));
@@ -91,4 +89,4 @@ export class FosscordServer extends Server {
 		
 		return super.start();
 	}
-};
+}

api/src/middlewares/Authentication.ts

@@ -1,5 +1,5 @@
 import { NextFunction, Request, Response } from "express";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { checkToken, Config, Rights } from "@fosscord/util";
 
 export const NO_AUTHORIZATION_ROUTES = [

api/src/middlewares/BodyParser.ts

@@ -1,6 +1,6 @@
 import bodyParser, { OptionsJson } from "body-parser";
 import { NextFunction, Request, Response } from "express";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 
 export function BodyParser(opts?: OptionsJson) {
 	const jsonParser = bodyParser.json(opts);

api/src/middlewares/ErrorHandler.ts

@@ -1,5 +1,5 @@
 import { NextFunction, Request, Response } from "express";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { ApiError, FieldError } from "@fosscord/util";
 const EntityNotFoundErrorRegex = /"(\w+)"/;
 

api/src/middlewares/TestClient.ts

@@ -1,11 +1,10 @@
 import express, { Request, Response, Application } from "express";
-import fs, { writeFile } from "fs";
+import fs from "fs";
 import path from "path";
 import fetch, { Response as FetchResponse, Headers } from "node-fetch";
 import ProxyAgent from 'proxy-agent';
 import { Config } from "@fosscord/util";
 import { AssetCacheItem } from "../util/entities/AssetCacheItem"
-import { FileLogger } from "typeorm";
 
 export default function TestClient(app: Application) {
 	const agent = new ProxyAgent();

api/src/routes/auth/register.ts

@@ -1,9 +1,8 @@
 import { Request, Response, Router } from "express";
 import { Config, generateToken, Invite, FieldErrors, User, adjustEmail, trimSpecial } from "@fosscord/util";
 import { route, getIpAdress, IPAnalysis, isProxy } from "@fosscord/api";
-import "missing-native-js-functions";
 import bcrypt from "bcrypt";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 
 const router: Router = Router();
 

api/src/routes/channels/#channel_id/invites.ts

@@ -1,5 +1,5 @@
 import { Router, Request, Response } from "express";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
 import { random } from "@fosscord/api";
 import { Channel, Invite, InviteCreateEvent, emitEvent, User, Guild, PublicInviteRelation } from "@fosscord/util";

api/src/routes/channels/#channel_id/messages/#message_id/index.ts

@@ -19,7 +19,7 @@ import multer from "multer";
 import { route } from "@fosscord/api";
 import { handleMessage, postHandleMessage } from "@fosscord/api";
 import { MessageCreateSchema } from "../index";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 
 const router = Router();
 // TODO: message content/embed string length limit

api/src/routes/channels/#channel_id/messages/#message_id/reactions.ts

@@ -15,7 +15,7 @@ import {
 } from "@fosscord/util";
 import { route } from "@fosscord/api";
 import { Router, Response, Request } from "express";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { In } from "typeorm";
 
 const router = Router();

api/src/routes/channels/#channel_id/messages/bulk-delete.ts

@@ -1,6 +1,6 @@
 import { Router, Response, Request } from "express";
 import { Channel, Config, emitEvent, getPermission, getRights, MessageDeleteBulkEvent, Message } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
 import { In } from "typeorm";
 

api/src/routes/channels/#channel_id/messages/index.ts

@@ -15,7 +15,7 @@ import {
 	uploadFile,
 	Member
 } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { handleMessage, postHandleMessage, route } from "@fosscord/api";
 import multer from "multer";
 import { FindManyOptions, LessThan, MoreThan } from "typeorm";

api/src/routes/channels/#channel_id/permissions.ts

@@ -9,7 +9,7 @@ import {
 	Role
 } from "@fosscord/util";
 import { Router, Response, Request } from "express";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 
 import { route } from "@fosscord/api";
 const router: Router = Router();

api/src/routes/channels/#channel_id/pins.ts

@@ -9,7 +9,7 @@ import {
 	DiscordApiErrors
 } from "@fosscord/util";
 import { Router, Request, Response } from "express";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
 
 const router: Router = Router();

api/src/routes/channels/#channel_id/purge.ts

@@ -1,4 +1,4 @@
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
 import { isTextChannel } from "./messages";
 import { FindManyOptions, Between, Not } from "typeorm";

api/src/routes/channels/#channel_id/webhooks.ts

@@ -1,7 +1,7 @@
 import { Router, Response, Request } from "express";
 import { route } from "@fosscord/api";
 import { Channel, Config, getPermission, trimSpecial, Webhook } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { isTextChannel } from "./messages/index";
 import { DiscordApiErrors } from "@fosscord/util";
 

api/src/routes/discoverable-guilds.ts

@@ -1,7 +1,8 @@
 import { Guild, Config } from "@fosscord/util";
 
 import { Router, Request, Response } from "express";
-import { route } from "@fosscord/api";
+import { route } from "..";
+import { Like } from "typeorm";
 
 const router = Router();
 

api/src/routes/discovery.ts

@@ -1,6 +1,6 @@
 import { Categories } from "@fosscord/util";
 import { Router, Response, Request } from "express";
-import { route } from "@fosscord/api";
+import { route } from "..";
 
 const router = Router();
 

api/src/routes/downloads.ts

@@ -1,5 +1,5 @@
 import { Router, Response, Request } from "express";
-import { route } from "@fosscord/api";
+import { route } from "..";
 import { Release, Config } from "@fosscord/util";
 
 const router = Router();

api/src/routes/experiments.ts

@@ -1,5 +1,5 @@
 import { Router, Response, Request } from "express";
-import { route } from "@fosscord/api";
+import { route } from "..";
 
 const router = Router();
 

api/src/routes/gifs/trending.ts

@@ -3,7 +3,7 @@ import fetch from "node-fetch";
 import ProxyAgent from 'proxy-agent';
 import { route } from "@fosscord/api";
 import { Config } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 
 const router = Router();
 

api/src/routes/guild-recommendations.ts

@@ -1,7 +1,8 @@
 import { Guild, Config } from "@fosscord/util";
 
 import { Router, Request, Response } from "express";
-import { route } from "@fosscord/api";
+import { route } from "..";
+import {Like} from "typeorm"
 
 const router = Router();
 

api/src/routes/guilds/#guild_id/audit-logs.ts

@@ -1,6 +1,6 @@
 import { Router, Response, Request } from "express";
 import { Channel, ChannelUpdateEvent, getPermission, emitEvent } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
 import { ChannelModifySchema } from "../../channels/#channel_id";
 const router = Router();

api/src/routes/guilds/#guild_id/bans.ts

@@ -1,6 +1,6 @@
 import { Request, Response, Router } from "express";
 import { DiscordApiErrors, emitEvent, getPermission, GuildBanAddEvent, GuildBanRemoveEvent, Guild, Ban, User, Member } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { getIpAdress, route } from "@fosscord/api";
 
 export interface BanCreateSchema {

api/src/routes/guilds/#guild_id/channels.ts

@@ -1,6 +1,6 @@
 import { Router, Response, Request } from "express";
 import { Channel, ChannelUpdateEvent, getPermission, emitEvent } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
 import { ChannelModifySchema } from "../../channels/#channel_id";
 const router = Router();

api/src/routes/guilds/#guild_id/delete.ts

@@ -1,6 +1,6 @@
 import { Channel, emitEvent, GuildDeleteEvent, Guild, Member, Message, Role, Invite, Emoji } from "@fosscord/util";
 import { Router, Request, Response } from "express";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
 
 const router = Router();

api/src/routes/guilds/#guild_id/index.ts

@@ -1,8 +1,7 @@
 import { Request, Response, Router } from "express";
 import { DiscordApiErrors, emitEvent, getPermission, getRights, Guild, GuildUpdateEvent, handleFile, Member } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
-import "missing-native-js-functions";
 import { GuildCreateSchema } from "../index";
 
 const router = Router();

api/src/routes/guilds/#guild_id/integrations.ts

@@ -1,6 +1,6 @@
 import { Router, Response, Request } from "express";
 import { Channel, ChannelUpdateEvent, getPermission, emitEvent } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
 import { ChannelModifySchema } from "../../channels/#channel_id";
 const router = Router();

api/src/routes/guilds/#guild_id/members/#member_id/index.ts

@@ -1,6 +1,6 @@
 import { Request, Response, Router } from "express";
 import { Member, getPermission, getRights, Role, GuildMemberUpdateEvent, emitEvent, Sticker, Emoji, Rights, Guild } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
 
 const router = Router();

api/src/routes/guilds/#guild_id/members/index.ts

@@ -2,7 +2,7 @@ import { Request, Response, Router } from "express";
 import { Guild, Member, PublicMemberProjection } from "@fosscord/util";
 import { route } from "@fosscord/api";
 import { MoreThan } from "typeorm";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 
 const router = Router();
 

api/src/routes/guilds/#guild_id/roles/#role_id/index.ts

@@ -1,7 +1,7 @@
 import { Router, Request, Response } from "express";
 import { Role, Member, GuildRoleUpdateEvent, GuildRoleDeleteEvent, emitEvent, handleFile } from "@fosscord/util";
 import { route } from "@fosscord/api";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { RoleModifySchema } from "../";
 
 const router = Router();

api/src/routes/guilds/#guild_id/roles/index.ts

@@ -11,7 +11,7 @@ import {
 	DiscordApiErrors,
 	handleFile
 } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
 
 const router: Router = Router();

api/src/routes/guilds/#guild_id/stickers.ts

@@ -12,7 +12,7 @@ import {
 import { Router, Request, Response } from "express";
 import { route } from "@fosscord/api";
 import multer from "multer";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 const router = Router();
 
 router.get("/", route({}), async (req: Request, res: Response) => {

api/src/routes/guilds/#guild_id/templates.ts

@@ -1,6 +1,6 @@
 import { Request, Response, Router } from "express";
 import { Guild, Template } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
 import { generateCode } from "@fosscord/api";
 

api/src/routes/guilds/#guild_id/vanity-url.ts

@@ -1,7 +1,7 @@
 import { Channel, ChannelType, getPermission, Guild, Invite, trimSpecial } from "@fosscord/util";
 import { Router, Request, Response } from "express";
 import { route } from "@fosscord/api";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 
 const router = Router();
 

api/src/routes/guilds/#guild_id/webhooks.ts

@@ -1,6 +1,6 @@
 import { Router, Response, Request } from "express";
 import { Channel, ChannelUpdateEvent, getPermission, emitEvent } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
 import { ChannelModifySchema } from "../../channels/#channel_id";
 const router = Router();

api/src/routes/guilds/#guild_id/welcome_screen.ts

@@ -1,6 +1,6 @@
 import { Request, Response, Router } from "express";
 import { Guild, getPermission, Snowflake, Member } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
 
 const router: Router = Router();

api/src/routes/guilds/#guild_id/widget.json.ts

@@ -1,6 +1,6 @@
 import { Request, Response, Router } from "express";
 import { Config, Permissions, Guild, Invite, Channel, Member } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { random, route } from "@fosscord/api";
 
 const router: Router = Router();

api/src/routes/guilds/#guild_id/widget.png.ts

@@ -1,6 +1,6 @@
 import { Request, Response, Router } from "express";
 import { Guild } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
 import fs from "fs";
 import path from "path";

api/src/routes/invites/index.ts

@@ -1,7 +1,7 @@
 import { Router, Request, Response } from "express";
 import { emitEvent, getPermission, Guild, Invite, InviteDeleteEvent, User, PublicInviteRelation } from "@fosscord/util";
 import { route } from "@fosscord/api";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 
 const router: Router = Router();
 

api/src/routes/users/@me/delete.ts

@@ -2,7 +2,7 @@ import { Router, Request, Response } from "express";
 import { Guild, Member, User } from "@fosscord/util";
 import { route } from "@fosscord/api";
 import bcrypt from "bcrypt";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 
 const router = Router();
 

api/src/routes/users/@me/guilds.ts

@@ -1,6 +1,6 @@
 import { Router, Request, Response } from "express";
 import { Guild, Member, User, GuildDeleteEvent, GuildMemberRemoveEvent, emitEvent, Config } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { route } from "@fosscord/api";
 
 const router: Router = Router();

api/src/routes/users/@me/relationships.ts

@@ -9,7 +9,7 @@ import {
 	Config
 } from "@fosscord/util";
 import { Router, Response, Request } from "express";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import { DiscordApiErrors } from "@fosscord/util";
 import { route } from "@fosscord/api";
 

api/src/start.ts

@@ -1,7 +1,6 @@
 process.on("uncaughtException", console.error);
 process.on("unhandledRejection", console.error);
 
-import "missing-native-js-functions";
 import { config } from "dotenv";
 config();
 import { FosscordServer } from "./Server";

api/src/util/handlers/Message.ts

@@ -22,7 +22,7 @@ import {
 	Attachment,
 	Config,
 } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { HTTPError } from "@fosscord/util";
 import fetch from "node-fetch";
 import cheerio from "cheerio";
 import { MessageCreateSchema } from "../../routes/channels/#channel_id/messages";

api/src/util/utility/passwordStrength.ts

@@ -1,5 +1,4 @@
 import { Config } from "@fosscord/util";
-import "missing-native-js-functions";
 
 const reNUMBER = /[0-9]/g;
 const reUPPERCASELETTER = /[A-Z]/g;