dandri/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2026-04-26 17:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove display_name

Browse Source
This commit is contained in:
Puyodead1
2023-05-06 01:11:37 -04:00
committed by Rory&
parent 90038fecdd
commit 435e80ff57
12 changed files with 35 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/routes/channels/#channel_id/messages/index.ts
View File

@@ -197,9 +197,8 @@ router.get(
x.author = User.create({
id: "4",
discriminator: pomeloEnabled ? "0" : "0000",
username: "Spacebar Ghost",
global_name: "spacebarghost",
display_name: "Spacebar Ghost",
username: "spacebarghost",
global_name: "Spacebar Ghost",
public_flags: 0,
});
x.attachments?.forEach((y: Attachment) => {

1
src/api/routes/guilds/#guild_id/bans.ts
View File

@@ -62,7 +62,6 @@ router.get(
username: user.username,
discriminator: user.discriminator,
global_name: user.global_name,
display_name: user.display_name,
id: user.id,
avatar: user.avatar ?? null,
public_flags: user.public_flags,

1
src/api/routes/guilds/#guild_id/messages/search.ts
View File

@@ -124,7 +124,6 @@ router.get(
avatar_decoration: null,
discriminator: x.author?.discriminator,
global_name: x.author?.global_name,
display_name: x.author?.display_name,
public_flags: x.author?.public_flags,
},
attachments: x.attachments,

4
src/api/routes/oauth2/authorize.ts
View File

@@ -75,7 +75,7 @@ router.get(
id: req.user_id,
bot: false,
},
select: { id: true, username: true, avatar: true, discriminator: true, public_flags: true, global_name: true, display_name: true, public_flags: true },
select: { id: true, username: true, avatar: true, discriminator: true, public_flags: true, global_name: true, public_flags: true },
});
const guilds = await Member.find({
@@ -123,7 +123,6 @@ router.get(
avatar_decoration: null, // TODO
discriminator: user.discriminator,
global_name: user.global_name,
display_name: user.display_name,
public_flags: user.public_flags,
},
application: {
@@ -147,7 +146,6 @@ router.get(
avatar_decoration: null, // TODO
discriminator: bot.discriminator,
global_name: bot.global_name,
display_name: bot.display_name,
public_flags: bot.public_flags,
bot: true,
approximated_guild_count: 0, // TODO

1
src/api/routes/users/#user_id/relationships.ts
View File

@@ -56,7 +56,6 @@ router.get(
avatar: relation_user.avatar,
discriminator: relation_user.discriminator,
global_name: relation_user.global_name,
display_name: relation_user.display_name,
public_flags: relation_user.public_flags,
});
}

19
src/connections/Discord/index.ts
View File

@@ -16,7 +16,15 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { ConnectedAccount, ConnectedAccountCommonOAuthTokenResponse, Connection, ConnectionLoader, DiscordApiErrors } from "@spacebar/util";
import {
Config,
ConnectedAccount,
ConnectedAccountCommonOAuthTokenResponse,
Connection,
ConnectionCallbackSchema,
ConnectionLoader,
DiscordApiErrors,
} from "@spacebar/util";
import wretch from "wretch";
import { DiscordSettings } from "./DiscordSettings";
import { ConnectionCallbackSchema } from "@spacebar/schemas";
@@ -25,8 +33,7 @@ interface UserResponse {
id: string;
username: string;
discriminator: string;
global_name: string;
display_name?: string;
global_name: string | null;
avatar_url: string | null;
}
@@ -115,12 +122,14 @@ export default class DiscordConnection extends Connection {
if (exists) return null;
// TODO: pomelo
const { pomeloEnabled } = Config.get().general;
return await this.createConnection({
user_id: userId,
external_id: userInfo.id,
friend_sync: params.friend_sync,
name: `${userInfo.username}#${userInfo.discriminator}`,
name: pomeloEnabled
? userInfo.username
: `${userInfo.username}#${userInfo.discriminator}`,
type: this.id,
});
}

3
src/schemas/responses/GuildBansResponse.ts
View File

@@ -21,8 +21,7 @@ export interface GuildBansResponse {
user: {
username: string;
discriminator: string;
global_name: string;
display_name: string | null;
global_name?: string;
id: string;
avatar: string | null;
public_flags: number;

3
src/schemas/responses/GuildWidgetJsonResponse.ts
View File

@@ -30,8 +30,7 @@ export interface GuildWidgetJsonResponse {
members: {
id: string;
username: string;
global_name: string;
display_name: string | null;
global_name: string | null;
discriminator: string;
avatar: string | null;
status: ClientStatus;

1
src/schemas/responses/UserRelationsResponse.ts
View File

@@ -20,7 +20,6 @@ import { User } from "@spacebar/util";
export type UserRelationsResponse = (Pick<User, "id"> &
Pick<User, "username"> &
Pick<User, "global_name"> &
Pick<User, "display_name"> &
Pick<User, "discriminator"> &
Pick<User, "avatar"> &
Pick<User, "public_flags">)[];

31
src/util/dtos/UserDTO.ts
View File

@@ -19,21 +19,20 @@
import { User } from "../entities";
export class MinimalPublicUserDTO {
avatar?: string | null;
discriminator: string;
id: string;
public_flags: number;
username: string;
global_name: string;
display_name?: string;
id: string;
username: string;
global_name: string | null = null;
discriminator: string;
public_flags: number;
avatar?: string | null;
constructor(user: User) {
this.avatar = user.avatar;
this.discriminator = user.discriminator;
this.id = user.id;
this.public_flags = user.public_flags;
this.username = user.username;
this.global_name = user.global_name;
this.display_name = user.display_name;
}
constructor(user: User) {
this.id = user.id;
this.username = user.username;
this.discriminator = user.discriminator;
this.public_flags = user.public_flags;
this.avatar = user.avatar;
if (user.global_name) this.global_name = user.global_name;
}
}

8
src/util/entities/User.ts
View File

@@ -32,7 +32,6 @@ import { ChannelType, PrivateUserProjection, PublicUser, PublicUserProjection, U
export enum PublicUserEnum {
username,
global_name,
display_name,
discriminator,
id,
public_flags,
@@ -56,10 +55,7 @@ export class User extends BaseClass {
username: string; // username max length 32, min 2 (should be configurable)
@Column({ nullable: true })
global_name: string; // puyo: pomelo
@Column({ nullable: true })
display_name?: string; // puyo: pomelo
global_name?: string; // puyo: pomelo
@Column()
discriminator: string; // opaque string: 4 digits on discord.com, 0 for pomelo
@@ -326,8 +322,6 @@ export class User extends BaseClass {
const user = User.create({
username: username,
global_name: username, // TODO: convert to lowercase, strip special characters,etc???
// display_name: username, // TODO: how should we do this?
discriminator,
id: id || Snowflake.generate(),
email: email,

2
src/util/util/email/index.ts
View File

@@ -100,12 +100,10 @@ export const Email: {
) {
const { instanceName } = Config.get().general;
// TODO: pomelo: display_name should take precedence over username if pomelo is enabled. maybe we should use global_name as the username?
const replacements = [
["{instanceName}", instanceName],
["{userUsername}", user.username],
["{userGlobalName}", user.global_name],
["{userDisplayName}", user.display_name],
["{userDiscriminator}", user.discriminator],
["{userId}", user.id],
["{phoneNumber}", user.phone?.slice(-4)],