diff --git a/src/gateway/opcodes/Identify.ts b/src/gateway/opcodes/Identify.ts
index 41f9f83d..e30a1ee0 100644
--- a/src/gateway/opcodes/Identify.ts
+++ b/src/gateway/opcodes/Identify.ts
@@ -1,17 +1,17 @@
/*
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
Copyright (C) 2023 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/>.
*/
@@ -122,8 +122,8 @@ export async function onIdentify(this: WebSocket, data: Payload) {
session_id: this.session_id,
status: identify.presence?.status || "online",
client_info: {
- client: identify.properties?.$device,
- os: identify.properties?.os,
+ client: identify.properties?.device || identify.properties?.$device,
+ os: identify.properties?.os || identify.properties?.$os,
version: 0,
},
activities: identify.presence?.activities, // TODO: validation
@@ -372,7 +372,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
data: {
user: user.toPublicUser(),
activities: session.activities,
- client_status: session.client_info,
+ client_status: session.client_status,
status: session.status,
},
} as PresenceUpdateEvent),
diff --git a/src/gateway/opcodes/LazyRequest.ts b/src/gateway/opcodes/LazyRequest.ts
index 3c21b708..27e9b00a 100644
--- a/src/gateway/opcodes/LazyRequest.ts
+++ b/src/gateway/opcodes/LazyRequest.ts
@@ -1,17 +1,17 @@
/*
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
Copyright (C) 2023 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/>.
*/
@@ -248,7 +248,7 @@ export async function onLazyRequest(this: WebSocket, { d }: Payload) {
d: {
user: user,
activities: session?.activities || [],
- client_status: session?.client_info,
+ client_status: session?.client_status,
status: session?.status || "offline",
} as Presence,
});
diff --git a/src/gateway/opcodes/PresenceUpdate.ts b/src/gateway/opcodes/PresenceUpdate.ts
index 03736263..f84da120 100644
--- a/src/gateway/opcodes/PresenceUpdate.ts
+++ b/src/gateway/opcodes/PresenceUpdate.ts
@@ -1,17 +1,17 @@
/*
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
Copyright (C) 2023 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/>.
*/
@@ -35,14 +35,19 @@ export async function onPresenceUpdate(this: WebSocket, { d }: Payload) {
{ status: presence.status, activities: presence.activities },
);
+ const session = await Session.findOneOrFail({
+ select: ["client_status"],
+ where: { session_id: this.session_id },
+ });
+
await emitEvent({
event: "PRESENCE_UPDATE",
user_id: this.user_id,
data: {
user: await User.getPublicUser(this.user_id),
- activities: presence.activities,
- client_status: {}, // TODO:
status: presence.status,
+ activities: presence.activities,
+ client_status: session.client_status,
},
} as PresenceUpdateEvent);
}
diff --git a/src/gateway/opcodes/RequestGuildMembers.ts b/src/gateway/opcodes/RequestGuildMembers.ts
index 8934377d..9a966752 100644
--- a/src/gateway/opcodes/RequestGuildMembers.ts
+++ b/src/gateway/opcodes/RequestGuildMembers.ts
@@ -22,6 +22,7 @@ import {
Member,
Presence,
RequestGuildMembersSchema,
+ Session,
} from "@spacebar/util";
import { WebSocket, Payload, OPCODES, Send } from "@spacebar/gateway";
import { check } from "./instanceOf";
@@ -63,7 +64,7 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
...whereQuery,
guild_id,
},
- relations: ["roles", ...(presences ? ["presence"] : [])],
+ relations: ["users", "roles"],
};
if (limit) memberFind.take = Math.abs(Number(limit || 100));
const members = await Member.find(memberFind);
@@ -83,13 +84,21 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
const chunks: GuildMembersChunkEvent["data"][] = [];
while (members.length > 0) {
- const chunk = members.splice(0, 1000);
+ const chunk: Member[] = members.splice(0, 1000);
const presenceList: Presence[] = [];
if (presences) {
for await (const member of chunk) {
- presenceList.push(member.presence);
- delete member.presence;
+ const session = await Session.findOne({
+ where: { user_id: member.id },
+ });
+ if (session)
+ presenceList.push({
+ user: member.user.toPublicUser(),
+ status: session.status,
+ activities: session.activities,
+ client_status: session.client_status,
+ });
}
}
|
