Merge branch 'master' into feat/refactorIdentify

4 files changed, 26 insertions, 25 deletions

diff --git a/src/bundle/Server.ts b/src/bundle/Server.ts
index 119bb52b..6ba74be6 100644
--- a/src/bundle/Server.ts
+++ b/src/bundle/Server.ts
@@ -1,6 +1,6 @@
 /*
-	Fosscord: A FOSS re-implementation and extension of the Discord.com backend.
-	Copyright (C) 2023 Fosscord and Fosscord Contributors
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
 	
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
@@ -20,12 +20,12 @@ process.on("unhandledRejection", console.error);
 process.on("uncaughtException", console.error);
 
 import http from "http";
-import * as Api from "@fosscord/api";
-import * as Gateway from "@fosscord/gateway";
-import { CDNServer } from "@fosscord/cdn";
+import * as Api from "@spacebar/api";
+import * as Gateway from "@spacebar/gateway";
+import { CDNServer } from "@spacebar/cdn";
 import express from "express";
 import { green, bold } from "picocolors";
-import { Config, initDatabase, Sentry } from "@fosscord/util";
+import { Config, initDatabase, Sentry } from "@spacebar/util";
 
 const app = express();
 const server = http.createServer();
@@ -33,7 +33,7 @@ const port = Number(process.env.PORT) || 3001;
 const production = process.env.NODE_ENV == "development" ? false : true;
 server.on("request", app);
 
-const api = new Api.FosscordServer({ server, port, production, app });
+const api = new Api.SpacebarServer({ server, port, production, app });
 const cdn = new CDNServer({ server, port, production, app });
 const gateway = new Gateway.Server({ server, port, production });
 
diff --git a/src/bundle/index.ts b/src/bundle/index.ts
index 617dc715..c6af4f00 100644
--- a/src/bundle/index.ts
+++ b/src/bundle/index.ts
@@ -1,6 +1,6 @@
 /*
-	Fosscord: A FOSS re-implementation and extension of the Discord.com backend.
-	Copyright (C) 2023 Fosscord and Fosscord Contributors
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
 	
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-export * from "@fosscord/api";
-export * from "@fosscord/util";
-export * from "@fosscord/gateway";
-export * from "@fosscord/cdn";
+export * from "@spacebar/api";
+export * from "@spacebar/util";
+export * from "@spacebar/gateway";
+export * from "@spacebar/cdn";
diff --git a/src/bundle/start.ts b/src/bundle/start.ts
index 8da3cc20..df50fd4c 100644
--- a/src/bundle/start.ts
+++ b/src/bundle/start.ts
@@ -1,6 +1,6 @@
 /*
-	Fosscord: A FOSS re-implementation and extension of the Discord.com backend.
-	Copyright (C) 2023 Fosscord and Fosscord Contributors
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
 	
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
@@ -42,14 +42,14 @@ if (cluster.isPrimary) {
 
 	console.log(
 		bold(`
-███████╗ ██████╗ ███████╗███████╗ ██████╗ ██████╗ ██████╗ ██████╗
-██╔════╝██╔═══██╗██╔════╝██╔════╝██╔════╝██╔═══██╗██╔══██╗██╔══██╗
-█████╗  ██║   ██║███████╗███████╗██║     ██║   ██║██████╔╝██║  ██║
-██╔══╝  ██║   ██║╚════██║╚════██║██║     ██║   ██║██╔══██╗██║  ██║
-██║     ╚██████╔╝███████║███████║╚██████╗╚██████╔╝██║  ██║██████╔╝
-╚═╝      ╚═════╝ ╚══════╝╚══════╝ ╚═════╝ ╚═════╝ ╚═╝  ╚═╝╚═════╝
+███████╗██████╗  █████╗  ██████╗███████╗██████╗  █████╗ ██████╗ 
+██╔════╝██╔══██╗██╔══██╗██╔════╝██╔════╝██╔══██╗██╔══██╗██╔══██╗
+███████╗██████╔╝███████║██║     █████╗  ██████╔╝███████║██████╔╝
+╚════██║██╔═══╝ ██╔══██║██║     ██╔══╝  ██╔══██╗██╔══██║██╔══██╗
+███████║██║     ██║  ██║╚██████╗███████╗██████╔╝██║  ██║██║  ██║
+╚══════╝╚═╝     ╚═╝  ╚═╝ ╚═════╝╚══════╝╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝
 
-		fosscord-server | ${yellow(
+		spacebar-server | ${yellow(
 			`Pre-release (${
 				commit !== null
 					? commit.slice(0, 7)
diff --git a/src/bundle/stats.ts b/src/bundle/stats.ts
index 6e5bed36..b690eb75 100644
--- a/src/bundle/stats.ts
+++ b/src/bundle/stats.ts
@@ -1,6 +1,6 @@
 /*
-	Fosscord: A FOSS re-implementation and extension of the Discord.com backend.
-	Copyright (C) 2023 Fosscord and Fosscord Contributors
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
 	
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
@@ -33,7 +33,8 @@ export function initStats() {
 	if (process.getuid && process.getuid() === 0) {
 		console.warn(
 			red(
-				`[Process] Warning fosscord is running as root, this highly discouraged and might expose your system vulnerable to attackers. Please run fosscord as a user without root privileges.`,
+				`[Process] Warning Spacebar is running as root, this highly discouraged and might expose your system vulnerable to attackers.` +
+					`Please run Spacebar as a user without root privileges.`,
 			),
 		);
 	}