Merge pull request #490 from developomp/master
Prettier format and link simplification
3 files changed, 28 insertions, 22 deletions
diff --git a/util/src/dtos/DmChannelDTO.ts b/util/src/dtos/DmChannelDTO.ts
index 8b7a18fd..226b2f9d 100644
--- a/util/src/dtos/DmChannelDTO.ts
+++ b/util/src/dtos/DmChannelDTO.ts
@@ -12,24 +12,30 @@ export class DmChannelDTO {
type: number;
static async from(channel: Channel, excluded_recipients: string[] = [], origin_channel_id?: string) {
- const obj = new DmChannelDTO()
- obj.icon = channel.icon || null
- obj.id = channel.id
- obj.last_message_id = channel.last_message_id || null
- obj.name = channel.name || null
- obj.origin_channel_id = origin_channel_id || null
- obj.owner_id = channel.owner_id
- obj.type = channel.type
- obj.recipients = (await Promise.all(channel.recipients!.filter(r => !excluded_recipients.includes(r.user_id)).map(async r => {
- return await User.findOneOrFail({ where: { id: r.user_id }, select: PublicUserProjection })
- }))).map(u => new MinimalPublicUserDTO(u))
- return obj
+ const obj = new DmChannelDTO();
+ obj.icon = channel.icon || null;
+ obj.id = channel.id;
+ obj.last_message_id = channel.last_message_id || null;
+ obj.name = channel.name || null;
+ obj.origin_channel_id = origin_channel_id || null;
+ obj.owner_id = channel.owner_id;
+ obj.type = channel.type;
+ obj.recipients = (
+ await Promise.all(
+ channel
+ .recipients!.filter((r) => !excluded_recipients.includes(r.user_id))
+ .map(async (r) => {
+ return await User.findOneOrFail({ where: { id: r.user_id }, select: PublicUserProjection });
+ })
+ )
+ ).map((u) => new MinimalPublicUserDTO(u));
+ return obj;
}
excludedRecipients(excluded_recipients: string[]): DmChannelDTO {
return {
...this,
- recipients: this.recipients.filter(r => !excluded_recipients.includes(r.id))
- }
+ recipients: this.recipients.filter((r) => !excluded_recipients.includes(r.id)),
+ };
}
-}
\ No newline at end of file
+}
diff --git a/util/src/dtos/UserDTO.ts b/util/src/dtos/UserDTO.ts
index f09b5f4e..ee2752a4 100644
--- a/util/src/dtos/UserDTO.ts
+++ b/util/src/dtos/UserDTO.ts
@@ -8,10 +8,10 @@ export class MinimalPublicUserDTO {
username: string;
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.avatar = user.avatar;
+ this.discriminator = user.discriminator;
+ this.id = user.id;
+ this.public_flags = user.public_flags;
+ this.username = user.username;
}
-}
\ No newline at end of file
+}
diff --git a/util/src/dtos/index.ts b/util/src/dtos/index.ts
index 13702342..0e8f8459 100644
--- a/util/src/dtos/index.ts
+++ b/util/src/dtos/index.ts
@@ -1,2 +1,2 @@
export * from "./DmChannelDTO";
-export * from "./UserDTO";
\ No newline at end of file
+export * from "./UserDTO";
|
