Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 fix relationships

Browse Source
This commit is contained in:
Flam3rboy 2021-09-20 21:34:33 +02:00
parent fe34c5da87
commit 5b3ac6dadb
2 changed files with 15 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

254
api/assets/schemas.json
View File

@ -385,15 +385,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -707,15 +698,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -978,15 +960,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -1228,15 +1201,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -1481,15 +1445,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -1743,15 +1698,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -1998,15 +1944,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -2248,15 +2185,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -2510,15 +2438,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -2785,15 +2704,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -3099,15 +3009,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -3349,15 +3250,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -3599,15 +3491,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -3861,15 +3744,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -4118,15 +3992,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -4371,15 +4236,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -4624,15 +4480,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -4873,15 +4720,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -5142,15 +4980,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -5418,15 +5247,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -5672,15 +5492,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -5928,15 +5739,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -6184,15 +5986,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -6461,8 +6254,14 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
}
}, },
"RelationshipType": { "$schema": "http://json-schema.org/draft-07/schema#"
},
"RelationshipPutSchema": {
"type": "object",
"properties": {
"type": {
"enum": [ "enum": [
1, 1,
2, 2,
@ -6472,19 +6271,7 @@
"type": "number" "type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#"
},
"RelationshipPutSchema": {
"type": "object",
"properties": {
"type": {
"$ref": "#/definitions/RelationshipType"
}
},
"additionalProperties": false, "additionalProperties": false,
"required": [
"type"
],
"definitions": { "definitions": {
"ChannelPermissionOverwriteType": { "ChannelPermissionOverwriteType": {
"enum": [ "enum": [
@ -6711,15 +6498,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -6965,15 +6743,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"
@ -7402,15 +7171,6 @@
} }
}, },
"additionalProperties": false "additionalProperties": false
},
"RelationshipType": {
"enum": [
1,
2,
3,
4
],
"type": "number"
} }
}, },
"$schema": "http://json-schema.org/draft-07/schema#" "$schema": "http://json-schema.org/draft-07/schema#"

14
api/src/routes/users/@me/relationships.ts
View File

@ -21,20 +21,20 @@ router.get("/", route({}), async (req: Request, res: Response) => {
const user = await User.findOneOrFail({ where: { id: req.user_id }, relations: ["relationships", "relationships.to"] }); const user = await User.findOneOrFail({ where: { id: req.user_id }, relations: ["relationships", "relationships.to"] });
//TODO DTO //TODO DTO
const related_users = user.relationships.map(r => { const related_users = user.relationships.map((r) => {
return { return {
id: r.to.id, id: r.to.id,
type: r.type, type: r.type,
nickname: null, nickname: null,
user: r.to.toPublicUser(), user: r.to.toPublicUser()
} };
}) });
return res.json(related_users); return res.json(related_users);
}); });
export interface RelationshipPutSchema { export interface RelationshipPutSchema {
type: RelationshipType; type?: RelationshipType;
} }
router.put("/:id", route({ body: "RelationshipPutSchema" }), async (req: Request, res: Response) => { router.put("/:id", route({ body: "RelationshipPutSchema" }), async (req: Request, res: Response) => {
@ -42,7 +42,7 @@ router.put("/:id", route({ body: "RelationshipPutSchema" }), async (req: Request
req, req,
res, res,
await User.findOneOrFail({ id: req.params.id }, { relations: ["relationships", "relationships.to"], select: userProjection }), await User.findOneOrFail({ id: req.params.id }, { relations: ["relationships", "relationships.to"], select: userProjection }),
req.body.type req.body.type ?? RelationshipType.friends
); );
}); });
@ -59,7 +59,7 @@ router.post("/", route({ body: "RelationshipPostSchema" }), async (req: Request,
relations: ["relationships", "relationships.to"], relations: ["relationships", "relationships.to"],
select: userProjection, select: userProjection,
where: { where: {
discriminator: String(req.body.discriminator).padStart(4, '0'), //Discord send the discriminator as integer, we need to add leading zeroes discriminator: String(req.body.discriminator).padStart(4, "0"), //Discord send the discriminator as integer, we need to add leading zeroes
username: req.body.username username: req.body.username
} }
}), }),