Cherrypick fixups

TheArcaneBrony · TheArcaneBrony · commit 8fb8f4f315b6 · 2025-07-27T20:15:18.000+02:00
diff --git a/src/Server.ts b/src/Server.ts
diff --git a/src/api/middlewares/ErrorHandler.ts b/src/api/middlewares/ErrorHandler.ts
@@ -38,6 +38,7 @@ export function ErrorHandler(
 
 		if (error instanceof HTTPError && error.code) {
 			code = httpcode = error.code;
+			// @ts-expect-error - we make it exist
 			if (error.data) data = error.data;
 		} else if (error instanceof ApiError) {
 			code = error.code;
diff --git a/src/api/middlewares/RateLimit.ts b/src/api/middlewares/RateLimit.ts
@@ -16,8 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { getIpAdress } from "@spacebar/api";
-import { Config, getRights, listenEvent } from "@spacebar/util";
+import { Config, getRights, listenEvent, getIpAdress } from "@spacebar/util";
 import { NextFunction, Request, Response, Router } from "express";
 import { API_PREFIX_TRAILING_SLASH } from "./Authentication";
 
diff --git a/src/api/routes/auth/forgot.ts b/src/api/routes/auth/forgot.ts
@@ -16,8 +16,8 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { getIpAdress, route, verifyCaptcha } from "@spacebar/api";
-import { Config, Email, ForgotPasswordSchema, User } from "@spacebar/util";
+import { route, verifyCaptcha } from "@spacebar/api";
+import { Config, Email, ForgotPasswordSchema, getIpAdress, User } from "@spacebar/util";
 import { Request, Response, Router } from "express";
 const router = Router();
 
diff --git a/src/api/routes/auth/generate-registration-tokens.ts b/src/api/routes/auth/generate-registration-tokens.ts
@@ -16,8 +16,8 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { random, route } from "@spacebar/api";
-import { Config, ValidRegistrationToken } from "@spacebar/util";
+import { route } from "@spacebar/api";
+import { Config, generateRandomString, ValidRegistrationToken } from "@spacebar/util";
 import { Request, Response, Router } from "express";
 
 const router: Router = Router();
@@ -51,7 +51,7 @@ router.get(
 
 		for (let i = 0; i < count; i++) {
 			const token = ValidRegistrationToken.create({
-				token: random(length),
+				token: generateRandomString(length),
 				expires_at: new Date(
 					Date.now() +
 						Config.get().security
diff --git a/src/api/routes/auth/location-metadata.ts b/src/api/routes/auth/location-metadata.ts
@@ -16,8 +16,9 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { IPAnalysis, getIpAdress, route } from "@spacebar/api";
+import { route } from "@spacebar/api";
 import { Request, Response, Router } from "express";
+import { getIpAdress, IPAnalysis } from "@spacebar/util";
 const router = Router();
 
 router.get(
diff --git a/src/api/routes/auth/login.ts b/src/api/routes/auth/login.ts
@@ -16,15 +16,15 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { getIpAdress, route, verifyCaptcha } from "@spacebar/api";
+import { route, verifyCaptcha } from "@spacebar/api";
 import {
 	Config,
 	FieldErrors,
 	LoginSchema,
 	User,
 	WebAuthn,
 	generateToken,
-	generateWebAuthnTicket,
+	generateWebAuthnTicket, getIpAdress,
 } from "@spacebar/util";
 import bcrypt from "bcrypt";
 import crypto from "crypto";
diff --git a/src/api/routes/auth/register.ts b/src/api/routes/auth/register.ts
@@ -17,9 +17,6 @@
 */
 
 import {
-	IPAnalysis,
-	getIpAdress,
-	isProxy,
 	route,
 	verifyCaptcha,
 } from "@spacebar/api";
@@ -30,7 +27,7 @@ import {
 	RegisterSchema,
 	User,
 	ValidRegistrationToken,
-	generateToken,
+	generateToken, getIpAdress, IPAnalysis, isProxy,
 } from "@spacebar/util";
 import bcrypt from "bcrypt";
 import { Request, Response, Router } from "express";
diff --git a/src/api/routes/auth/verify/index.ts b/src/api/routes/auth/verify/index.ts
@@ -16,12 +16,12 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { getIpAdress, route, verifyCaptcha } from "@spacebar/api";
+import { route, verifyCaptcha } from "@spacebar/api";
 import {
 	checkToken,
 	Config,
 	FieldErrors,
-	generateToken,
+	generateToken, getIpAdress,
 	User,
 } from "@spacebar/util";
 import { Request, Response, Router } from "express";
diff --git a/src/api/routes/channels/#channel_id/invites.ts b/src/api/routes/channels/#channel_id/invites.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { random, route } from "@spacebar/api";
+import { route } from "@spacebar/api";
 import {
 	Channel,
 	Guild,
@@ -26,7 +26,7 @@ import {
 	PublicInviteRelation,
 	User,
 	emitEvent,
-	isTextChannel,
+	isTextChannel, generateRandomString,
 } from "@spacebar/util";
 import { Request, Response, Router } from "express";
 import { HTTPError } from "lambert-server";
@@ -70,7 +70,7 @@ router.post(
 				: new Date(body.max_age * 1000 + Date.now());
 
 		const invite = await Invite.create({
-			code: random(),
+			code: generateRandomString(),
 			temporary: body.temporary || true,
 			uses: 0,
 			max_uses: body.max_uses ? Math.max(0, body.max_uses) : 0,
diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts
@@ -427,17 +427,18 @@ router.post(
 			read_state = ReadState.create({ user_id: req.user_id, channel_id });
 		read_state.last_message_id = message.id;
 
-		let blocks = (
+		const blocks = (
 			await PluginEventHandler.preMessageEvent({
 				message
 			} as PreMessageEventArgs)
 		).filter((x) => x.cancel);
-		if (blocks.length > 0)
+		if (blocks.length > 0) {
+			console.log("[Message] Pre-message event handler blocked message send:", message, blocks)
 			throw new HTTPError(
 				"Message denied.",
 				400,
-				blocks.filter((x) => x.blockReason).map((x) => x.blockReason)
 			);
+		}
 
 		await Promise.all([
 			read_state.save(),
diff --git a/src/api/routes/guilds/#guild_id/bans.ts b/src/api/routes/guilds/#guild_id/bans.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { getIpAdress, route } from "@spacebar/api";
+import { route } from "@spacebar/api";
 import {
 	APIBansArray,
 	Ban,
@@ -27,7 +27,7 @@ import {
 	GuildBansResponse,
 	Member,
 	User,
-	emitEvent,
+	emitEvent, getIpAdress,
 } from "@spacebar/util";
 import { Request, Response, Router } from "express";
 import { HTTPError } from "lambert-server";
diff --git a/src/api/routes/guilds/#guild_id/bulk-ban.ts b/src/api/routes/guilds/#guild_id/bulk-ban.ts
@@ -16,14 +16,14 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { getIpAdress, route } from "@spacebar/api";
+import { route } from "@spacebar/api";
 import {
 	Ban,
 	DiscordApiErrors,
 	GuildBanAddEvent,
 	Member,
 	User,
-	emitEvent,
+	emitEvent, getIpAdress,
 } from "@spacebar/util";
 import { Request, Response, Router } from "express";
 import { HTTPError } from "lambert-server";
diff --git a/src/api/routes/guilds/#guild_id/regions.ts b/src/api/routes/guilds/#guild_id/regions.ts
@@ -16,8 +16,8 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { getIpAdress, getVoiceRegions, route } from "@spacebar/api";
-import { Guild } from "@spacebar/util";
+import { getVoiceRegions, route } from "@spacebar/api";
+import { getIpAdress, Guild } from "@spacebar/util";
 import { Request, Response, Router } from "express";
 
 const router = Router();
diff --git a/src/api/routes/guilds/#guild_id/templates.ts b/src/api/routes/guilds/#guild_id/templates.ts
@@ -16,8 +16,8 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { generateCode, route } from "@spacebar/api";
-import { Guild, Template } from "@spacebar/util";
+import { route } from "@spacebar/api";
+import { generateCode, Guild, Template } from "@spacebar/util";
 import { Request, Response, Router } from "express";
 import { HTTPError } from "lambert-server";
 
diff --git a/src/api/routes/guilds/#guild_id/widget.json.ts b/src/api/routes/guilds/#guild_id/widget.json.ts
@@ -16,14 +16,15 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { random, route } from "@spacebar/api";
+import { route } from "@spacebar/api";
 import {
 	Channel,
 	DiscordApiErrors,
 	Guild,
 	Invite,
 	Member,
 	Permissions,
+	generateRandomString
 } from "@spacebar/util";
 import { Request, Response, Router } from "express";
 
@@ -77,7 +78,7 @@ router.get(
 			const expires_at = new Date(max_age * 1000 + Date.now());
 
 			invite = await Invite.create({
-				code: random(),
+				code: generateRandomString(),
 				temporary: false,
 				uses: 0,
 				max_uses: 0,
diff --git a/src/api/routes/users/@me/mfa/totp/disable.ts b/src/api/routes/users/@me/mfa/totp/disable.ts
@@ -26,7 +26,6 @@ import {
 import { Request, Response, Router } from "express";
 import { HTTPError } from "lambert-server";
 import { verifyToken } from "node-2fa";
-import { route } from "../../../../..";
 
 const router = Router();
 
diff --git a/src/api/routes/voice/regions.ts b/src/api/routes/voice/regions.ts
@@ -16,7 +16,8 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { getIpAdress, getVoiceRegions, route } from "@spacebar/api";
+import { getVoiceRegions, route } from "@spacebar/api";
+import { getIpAdress } from "@spacebar/util";
 import { Request, Response, Router } from "express";
 
 const router: Router = Router();
diff --git a/src/api/util/handlers/Voice.ts b/src/api/util/handlers/Voice.ts
@@ -16,8 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Config } from "@spacebar/util";
-import { distanceBetweenLocations, IPAnalysis } from "../utility/ipAddress";
+import { Config, distanceBetweenLocations, IPAnalysis } from "@spacebar/util";
 
 export async function getVoiceRegions(ipAddress: string, vip: boolean) {
 	const regions = Config.get().regions;
diff --git a/src/api/util/index.ts b/src/api/util/index.ts
@@ -16,13 +16,8 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-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";
 export * from "./utility/captcha";
 export * from "./utility/EmbedHandlers";
diff --git a/src/api/util/utility/String.ts b/src/api/util/utility/String.ts
diff --git a/src/plugins/example-plugin/TestPlugin.ts b/src/plugins/example-plugin/TestPlugin.ts
@@ -7,7 +7,7 @@ import {
 	PluginManifest,
 	PreMessageEventArgs,
 	PreMessageEventResult
-} from "@fosscord/util";
+} from "@spacebar/util";
 import { TestSettings } from "./TestSettings";
 
 export default class TestPlugin implements Plugin {
diff --git a/src/util/migrations/postgres/1660404619978-PluginConfigs.ts b/src/util/migrations/postgres/1660404619978-PluginConfigs.ts
diff --git a/src/util/migrations/sqlite/1660534525799-UpdateMigrations.ts b/src/util/migrations/sqlite/1660534525799-UpdateMigrations.ts
diff --git a/src/util/migrations/sqlite/1660565540177-sync_rebase_15aug2022.ts b/src/util/migrations/sqlite/1660565540177-sync_rebase_15aug2022.ts
diff --git a/src/util/util/RandomInviteID.ts b/src/util/util/RandomInviteID.ts
diff --git a/src/util/util/String.ts b/src/util/util/String.ts
diff --git a/src/util/util/index.ts b/src/util/util/index.ts
