1
0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-05 10:22:31 +01:00

Fix UserRelationsResponse schema

This commit is contained in:
Madeline 2023-04-19 01:24:51 +10:00
parent cec495cc5f
commit 4c6b1e8e16
No known key found for this signature in database
GPG Key ID: 1958E017C36F2E47
5 changed files with 63 additions and 90 deletions

View File

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

View File

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

View File

@ -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"],

View File

@ -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;
};
}

View File

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