Merge branch 'fosscord:master' into master

.github/relase_body_template.md

@@ -0,0 +1,12 @@
+## Notes
+
+## Additions
+
+## Fixes
+
+## Download
+- [Windows]()
+- [MacOS]()
+- [Linux]()
+
+After (extracting) and starting the server executable you can access your own Fosscord server on http://localhost:3001/

api/src/Server.ts

@@ -10,7 +10,7 @@ import { initRateLimits } from "./middlewares/RateLimit";
 import TestClient from "./middlewares/TestClient";
 import { initTranslation } from "./middlewares/Translation";
 import morgan from "morgan";
-import { initInstance } from "./util/Instance";
+import { initInstance } from "./util/handlers/Instance";
 import { registerRoutes } from "@fosscord/util";
 import { red } from "picocolors"
 

api/src/util/handlers/Message.ts

@@ -22,7 +22,7 @@ import {
 import { HTTPError } from "lambert-server";
 import fetch from "node-fetch";
 import cheerio from "cheerio";
-import { MessageCreateSchema } from "../routes/channels/#channel_id/messages";
+import { MessageCreateSchema } from "../../routes/channels/#channel_id/messages";
 
 // TODO: check webhook, application, system author, stickers
 // TODO: embed gifs/videos/images

api/src/util/handlers/Voice.ts

@@ -1,5 +1,5 @@
 import { Config } from "@fosscord/util";
-import { distanceBetweenLocations, IPAnalysis } from "./ipAddress";
+import { distanceBetweenLocations, IPAnalysis } from "../utility/ipAddress";
 
 export async function getVoiceRegions(ipAddress: string, vip: boolean) {
 	const regions = Config.get().regions;

api/src/util/handlers/route.ts

@@ -18,8 +18,9 @@ import Ajv from "ajv";
 import { AnyValidateFunction } from "ajv/dist/core";
 import addFormats from "ajv-formats";
 
-const SchemaPath = path.join(__dirname, "..", "..", "assets", "schemas.json");
+const SchemaPath = path.join(__dirname, "..", "..", "..", "assets", "schemas.json");
 const schemas = JSON.parse(fs.readFileSync(SchemaPath, { encoding: "utf8" }));
+
 export const ajv = new Ajv({
 	allErrors: true,
 	parseDate: true,
@@ -30,6 +31,7 @@ export const ajv = new Ajv({
 	strict: true,
 	strictRequired: true
 });
+
 addFormats(ajv);
 
 declare global {

api/src/util/index.ts

@@ -1,8 +1,8 @@
-export * from "./Base64";
-export * from "./ipAddress";
-export * from "./Message";
-export * from "./passwordStrength";
-export * from "./RandomInviteID";
-export * from "./route";
-export * from "./String";
-export * from "./Voice";
+export * from "./utility/Base64";
+export * from "./utility/ipAddress";
+export * from "./handlers/Message";
+export * from "./utility/passwordStrength";
+export * from "./utility/RandomInviteID";
+export * from "./handlers/route";
+export * from "./utility/String";
+export * from "./handlers/Voice";

util/src/entities/index.ts

@@ -26,4 +26,4 @@ export * from "./Template";
 export * from "./User";
 export * from "./VoiceState";
 export * from "./Webhook";
-export * from "./clientRelase";
+export * from "./ClientRelase";