Merge pull request #1631 from CyberL1/fix/account-connections-visibility

This commit is contained in:
Cyber
2026-04-19 11:42:08 +02:00
committed by GitHub
3 changed files with 61 additions and 2 deletions
+35 -2
View File
@@ -20,7 +20,7 @@ import { route } from "@spacebar/api";
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";
import { PartialConnectedAccountResponse, PrivateUserProjection, PublicUser, PublicUserProjection, RelationshipType, UserProfileModifySchema } from "@spacebar/schemas";
const router: Router = Router({ mergeParams: true });
@@ -35,6 +35,18 @@ router.get("/", route({ responses: { 200: { body: "UserProfileResponse" } } }),
id: user_id,
},
relations: { connected_accounts: true },
select: {
// Manually select everything cause typeorm is a fuck
connected_accounts: {
id: true,
type: true,
name: true,
verified: true,
metadata_: true,
metadata_visibility: true,
visibility: true,
},
},
});
const mutual_guilds: object[] = [];
@@ -112,8 +124,29 @@ router.get("/", route({ responses: { 200: { body: "UserProfileResponse" } } }),
}
}
// Only expose public properties to response
const publicUserConnections: PartialConnectedAccountResponse[] = [];
user.connected_accounts
.filter((x) => x.visibility != 0)
.map((x) => {
const publicUserConnection = {
id: x.id,
type: x.type,
name: x.name,
verified: x.verified ?? false,
} satisfies PartialConnectedAccountResponse;
if (x.metadata_visibility != 0) {
// @ts-expect-error idk
publicUserConnection.metadata = x.metadata_;
}
publicUserConnections.push(publicUserConnection);
});
res.json({
connected_accounts: user.connected_accounts.filter((x) => x.visibility != 0),
connected_accounts: publicUserConnections,
premium_guild_since: premium_guild_since, // TODO
premium_since: user.premium_since, // TODO
mutual_guilds: with_mutual_guilds ? mutual_guilds : undefined, // TODO {id: "", nick: null} when ?with_mutual_guilds=true
@@ -0,0 +1,25 @@
/*
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
Copyright (C) 2026 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 PartialConnectedAccountResponse {
id: string;
type: string;
name: string;
verified: boolean;
metadata?: object;
}
+1
View File
@@ -49,6 +49,7 @@ export * from "./InstanceStatsResponse";
export * from "./LocationMetadataResponse";
export * from "./MemberJoinGuildResponse";
export * from "./OAuthAuthorizeResponse";
export * from "./PartialConnectedAccountResponse";
export * from "./PreloadMessagesResponseSchema";
export * from "./RefreshUrlsResponse";
export * from "./SettingsProtoUpdateResponse";