Fix /users/@me/settings get and migrarion

2 files changed, 9 insertions, 3 deletions

diff --git a/api/src/routes/users/@me/settings.ts b/api/src/routes/users/@me/settings.ts

index 50a00cac..787ea9d4 100644
--- a/api/src/routes/users/@me/settings.ts
+++ b/api/src/routes/users/@me/settings.ts
@@ -4,13 +4,13 @@ import { route } from "@fosscord/api";
 
 const router = Router();
 
-export interface UserSettingsSchema extends Partial<UserSettings> {}
+export interface UserSettingsSchema extends Partial<UserSettings> { }
 
 router.get("/", route({}), async (req: Request, res: Response) => {
 	const user = await User.findOneOrFail(
 		{ id: req.user_id },
-		{ relations: ["settings"] }
-	)
+		{ select: ["settings"] }
+	);
 	return res.json(user.settings);
 });
 
diff --git a/util/src/migrations/1660689892073-mobileFixes2.ts b/util/src/migrations/1660689892073-mobileFixes2.ts

index 34328966..bd28694e 100644
--- a/util/src/migrations/1660689892073-mobileFixes2.ts
+++ b/util/src/migrations/1660689892073-mobileFixes2.ts
@@ -8,9 +8,15 @@ export class mobileFixes21660689892073 implements MigrationInterface {
             ALTER TABLE \`user_settings\`
             ADD \`banner_color\` varchar(255) NULL
         `);
+		await queryRunner.query(`
+			UPDATE \`channels\` SET \`nsfw\` = 0 WHERE \`nsfw\` = NULL
+		`);
         await queryRunner.query(`
             ALTER TABLE \`channels\` CHANGE \`nsfw\` \`nsfw\` tinyint NOT NULL
         `);
+		await queryRunner.query(`
+			UPDATE \`guilds\` SET \`nsfw\` = 0 WHERE \`nsfw\` = NULL
+		`);
         await queryRunner.query(`
             ALTER TABLE \`guilds\` CHANGE \`nsfw\` \`nsfw\` tinyint NOT NULL
         `);