summary refs log tree commit diff
path: root/gateway/src
diff options
context:
space:
mode:
authorFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-09-02 19:50:05 +0200
committerFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-09-02 19:50:05 +0200
commit562a53d6bbd4fd3da41eeb94dc4c7ad31cf9a67e (patch)
tree7e9a1ac62489adeb6e716bf6223e34d0576d5218 /gateway/src
parent:art: update openapi title (diff)
downloadserver-562a53d6bbd4fd3da41eeb94dc4c7ad31cf9a67e.tar.xz
:sparkles: add user_id field to Member
Diffstat (limited to 'gateway/src')
-rw-r--r--gateway/src/listener/listener.ts2
-rw-r--r--gateway/src/opcodes/Identify.ts2
-rw-r--r--gateway/src/opcodes/LazyRequest.ts1
3 files changed, 3 insertions, 2 deletions
diff --git a/gateway/src/listener/listener.ts b/gateway/src/listener/listener.ts

index 75ca1680..67837e8d 100644 --- a/gateway/src/listener/listener.ts +++ b/gateway/src/listener/listener.ts
@@ -26,7 +26,7 @@ import { Recipient } from "../../../util/dist/entities/Recipient"; // TODO: use already queried guilds/channels of Identify and don't fetch them again export async function setupListener(this: WebSocket) { - const members = await Member.find({ where: { id: this.user_id } }); + const members = await Member.find({ user_id: this.user_id }); const guild_ids = members.map((x) => x.guild_id); const user = await User.findOneOrFail({ id: this.user_id }); const recipients = await Recipient.find({ where: { id: this.user_id }, relations: ["channel"] }); diff --git a/gateway/src/opcodes/Identify.ts b/gateway/src/opcodes/Identify.ts
index 958f1b73..4a1b7a45 100644 --- a/gateway/src/opcodes/Identify.ts +++ b/gateway/src/opcodes/Identify.ts
@@ -56,7 +56,7 @@ export async function onIdentify(this: WebSocket, data: Payload) { } const members = await Member.find({ - where: { id: this.user_id }, + where: { user_id: this.user_id }, relations: ["guild", "guild.channels", "guild.emojis", "guild.roles", "guild.stickers", "user", "roles"], }); const merged_members = members.map((x: any) => { diff --git a/gateway/src/opcodes/LazyRequest.ts b/gateway/src/opcodes/LazyRequest.ts
index 9f514f5f..146175b5 100644 --- a/gateway/src/opcodes/LazyRequest.ts +++ b/gateway/src/opcodes/LazyRequest.ts
@@ -8,6 +8,7 @@ import { check } from "./instanceOf"; // TODO: check permission and only show roles/members that have access to this channel // TODO: config: if want to list all members (even those who are offline) sorted by role, or just those who are online +// TODO: rewrite typeorm export async function onLazyRequest(this: WebSocket, { d }: Payload) { // TODO: check data