summary refs log tree commit diff
path: root/src/api/routes/users
diff options
context:
space:
mode:
authorCyberL1 <cyber.hf18@gmail.com>2025-12-04 19:32:50 +0100
committerCyberL1 <cyber.hf18@gmail.com>2025-12-04 19:32:50 +0100
commit16caeea7445b4649225a6237d61a8521a1ccdf58 (patch)
tree7ac73c1c5b91c45dc34acaafeef020e0b65a24ce /src/api/routes/users
parentMerge pull request #1423 from CyberL1/fix/mobile-app (diff)
downloadserver-ts-16caeea7445b4649225a6237d61a8521a1ccdf58.tar.xz
fix: include `user` object in `guild_member`
Diffstat (limited to 'src/api/routes/users')
-rw-r--r--src/api/routes/users/#user_id/profile.ts14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/api/routes/users/#user_id/profile.ts b/src/api/routes/users/#user_id/profile.ts

index 456f0cb7..a5ea3e9c 100644 --- a/src/api/routes/users/#user_id/profile.ts +++ b/src/api/routes/users/#user_id/profile.ts
@@ -17,17 +17,7 @@ */ import { route } from "@spacebar/api"; -import { - Badge, - Config, - emitEvent, - FieldErrors, - handleFile, - Member, - Relationship, - User, - UserUpdateEvent, -} from "@spacebar/util"; +import { Badge, Config, emitEvent, FieldErrors, handleFile, Member, Relationship, User, UserUpdateEvent } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { In } from "typeorm"; import { PrivateUserProjection, PublicUser, PublicUserProjection, RelationshipType, UserProfileModifySchema } from "@spacebar/schemas"; @@ -127,7 +117,7 @@ router.get("/", route({ responses: { 200: { body: "UserProfileResponse" } } }), premium_type: user.premium_type, profile_themes_experiment_bucket: 4, // TODO: This doesn't make it available, for some reason? user_profile: userProfile, - guild_member: guild_member?.toPublicMember(), + guild_member: { ...guild_member?.toPublicMember(), user: user.toPublicUser() }, guild_member_profile: guild_id && guildMemberProfile, badges: badges.filter((x) => user.badge_ids?.includes(x.id)), });