Fix UserRelationsResponse schema

assets/openapi.json

@@ -7606,9 +7606,9 @@
                 ]
             },
             "UserRelationsResponse": {
-                "type": "object",
+                "type": "array",
-                "properties": {
+                "items": {
-                    "object": {
+                    "additionalProperties": false,
                     "type": "object",
                     "properties": {
                         "id": {
@@ -7617,22 +7617,23 @@
                         "username": {
                             "type": "string"
                         },
-                            "avatar": {
+                        "discriminator": {
                             "type": "string"
                         },
-                            "discriminator": {
+                        "avatar": {
                             "type": "string"
                         },
                         "public_flags": {
                             "type": "integer"
                         }
                     },
-                        "additionalProperties": false
-                    }
-                },
                     "required": [
-                    "object"
+                        "discriminator",
+                        "id",
+                        "public_flags",
+                        "username"
                     ]
+                }
             },
             "WebAuthnCreateResponse": {
                 "type": "object",

assets/schemas.json

@@ -485211,9 +485211,9 @@
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
     "UserRelationsResponse": {
-        "type": "object",
+        "type": "array",
-        "properties": {
+        "items": {
-            "object": {
+            "additionalProperties": false,
             "type": "object",
             "properties": {
                 "id": {
@@ -485222,23 +485222,23 @@
                 "username": {
                     "type": "string"
                 },
-                    "avatar": {
+                "discriminator": {
                     "type": "string"
                 },
-                    "discriminator": {
+                "avatar": {
                     "type": "string"
                 },
                 "public_flags": {
                     "type": "integer"
                 }
             },
-                "additionalProperties": false
-            }
-        },
-        "additionalProperties": false,
             "required": [
-            "object"
+                "discriminator",
-        ],
+                "id",
+                "public_flags",
+                "username"
+            ]
+        },
         "definitions": {
             "ChannelPermissionOverwriteType": {
                 "enum": [

src/api/routes/users/#id/relationships.ts

@@ -17,7 +17,7 @@
 */
 
 import { route } from "@spacebar/api";
-import { User } from "@spacebar/util";
+import { User, UserRelationsResponse } from "@spacebar/util";
 import { Request, Response, Router } from "express";
 
 const router: Router = Router();
@@ -33,7 +33,8 @@ router.get(
 		},
 	}),
 	async (req: Request, res: Response) => {
-		const mutual_relations: object[] = [];
+		const mutual_relations: UserRelationsResponse = [];
+
 		const requested_relations = await User.findOneOrFail({
 			where: { id: req.params.id },
 			relations: ["relationships"],

src/util/schemas/UserRelationsResponse.ts

@@ -1,27 +0,0 @@
-/*
-	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
-	by the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Affero General Public License for more details.
-	
-	You should have received a copy of the GNU Affero General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-export interface UserRelationsResponse {
-	object: {
-		id?: string;
-		username?: string;
-		avatar?: string;
-		discriminator?: string;
-		public_flags?: number;
-	};
-}

src/util/schemas/responses/UserRelationsResponse.ts

@@ -1,9 +1,7 @@
-export interface UserRelationsResponse {
+import { User } from "@spacebar/util";
-	object: {
+
-		id?: string;
+export type UserRelationsResponse = (Pick<User, "id"> &
-		username?: string;
+	Pick<User, "username"> &
-		avatar?: string;
+	Pick<User, "discriminator"> &
-		discriminator?: string;
+	Pick<User, "avatar"> &
-		public_flags?: number;
+	Pick<User, "public_flags">)[];
-	};
-}