Skip to content

my chages to add status and guild member list #1625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
oh64 wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

my chages to add status and guild member list #1625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0580510
status p1
oh64 Apr 6, 2026
b43d65e
shemas
oh64 Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions assets/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,62 @@
"status": {
"$ref": "#/components/schemas/Status"
},
"client_status": {
"type": "object",
"properties": {
"desktop": {
"enum": [
"dnd",
"idle",
"invisible",
"offline",
"online"
],
"type": "string"
},
"mobile": {
"enum": [
"dnd",
"idle",
"invisible",
"offline",
"online"
],
"type": "string"
},
"web": {
"enum": [
"dnd",
"idle",
"invisible",
"offline",
"online"
],
"type": "string"
},
"embedded": {
"enum": [
"dnd",
"idle",
"invisible",
"offline",
"online"
],
"type": "string"
},
"vr": {
"enum": [
"dnd",
"idle",
"invisible",
"offline",
"online"
],
"type": "string"
}
},
"additionalProperties": false
},
"activities": {
"type": "array",
"items": {
Expand Down Expand Up @@ -9411,6 +9467,9 @@
},
"embedded": {
"type": "string"
},
"vr": {
"type": "string"
}
}
},
Expand Down
59 changes: 59 additions & 0 deletions assets/schemas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,62 @@
"status": {
"$ref": "#/definitions/Status"
},
"client_status": {
"type": "object",
"properties": {
"desktop": {
"enum": [
"dnd",
"idle",
"invisible",
"offline",
"online"
],
"type": "string"
},
"mobile": {
"enum": [
"dnd",
"idle",
"invisible",
"offline",
"online"
],
"type": "string"
},
"web": {
"enum": [
"dnd",
"idle",
"invisible",
"offline",
"online"
],
"type": "string"
},
"embedded": {
"enum": [
"dnd",
"idle",
"invisible",
"offline",
"online"
],
"type": "string"
},
"vr": {
"enum": [
"dnd",
"idle",
"invisible",
"offline",
"online"
],
"type": "string"
}
},
"additionalProperties": false
},
"activities": {
"type": "array",
"items": {
Expand Down Expand Up @@ -10009,6 +10065,9 @@
},
"embedded": {
"type": "string"
},
"vr": {
"type": "string"
}
},
"additionalProperties": false,
Expand Down
14 changes: 1 addition & 13 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 42 additions & 1 deletion src/api/routes/users/@me/settings-proto/1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

import { route } from "@spacebar/api";
import { Request, Response, Router } from "express";
import { emitEvent, OrmUtils, UserSettingsProtos } from "@spacebar/util";
import { emitEvent, OrmUtils, PresenceUpdateEvent, Session, User, UserSettings, UserSettingsProtos } from "@spacebar/util";
import { getMostRelevantSession } from "@spacebar/gateway";
import { PreloadedUserSettings } from "discord-protos";
import { JsonValue } from "@protobuf-ts/runtime";
import { SettingsProtoJsonResponse, SettingsProtoResponse, SettingsProtoUpdateJsonSchema, SettingsProtoUpdateSchema } from "@spacebar/schemas";
Expand Down Expand Up @@ -162,6 +163,46 @@ async function patchUserSettings(userId: string, updatedSettings: PreloadedUserS
userSettings.userSettings = settings;
await userSettings.save();

const settingsJson = PreloadedUserSettings.toJson(settings);
const protoStatus = (settingsJson as { status?: { status?: string } } | undefined)?.status?.status;
const allowedStatuses = ["online", "idle", "dnd", "offline", "invisible"] as const;
type AllowedStatus = (typeof allowedStatuses)[number];

if (protoStatus && allowedStatuses.includes(protoStatus as AllowedStatus)) {
const nextStatus = protoStatus as AllowedStatus;

const user = await User.findOne({
where: { id: userId, bot: false },
relations: { settings: true },
});

if (user) {
const currentStatus = user.settings?.status;
if (currentStatus !== nextStatus) {
if (!user.settings) user.settings = UserSettings.create<UserSettings>({ status: nextStatus });
else user.settings.status = nextStatus;
await user.settings.save();

await Session.update({ user_id: userId }, { status: nextStatus });
const sessions = await Session.find({ where: { user_id: userId } });
const session = getMostRelevantSession(sessions);

if (session) {
await emitEvent({
event: "PRESENCE_UPDATE",
user_id: userId,
data: {
user: user.toPublicUser(),
activities: session.activities,
client_status: session.client_status,
status: session.getPublicStatus(),
},
} satisfies PresenceUpdateEvent);
}
}
}
}

await emitEvent({
user_id: userId,
event: "USER_SETTINGS_PROTO_UPDATE",
Expand Down
34 changes: 17 additions & 17 deletions src/api/routes/users/@me/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import { route } from "@spacebar/api";
import { User, UserSettings, emitEvent, Session, PresenceUpdateEvent } from "@spacebar/util";
import { getMostRelevantSession } from "@spacebar/gateway";
import { Request, Response, Router } from "express";
import { UserSettingsUpdateSchema } from "@spacebar/schemas";

Expand Down Expand Up @@ -75,25 +76,24 @@ router.patch(
await user.settings.save();
await user.save();
if (body.status) {
const [session] = (await Session.find({
await Session.update({ user_id: user.id }, { status: body.status });

const sessions = await Session.find({
where: { user_id: user.id },
})) as [Session | undefined];
if (session) {
session.status = body.status;
});
const session = getMostRelevantSession(sessions);

await Promise.all([
emitEvent({
event: "PRESENCE_UPDATE",
user_id: user.id,
data: {
user: user.toPublicUser(),
activities: session.activities,
client_status: session?.client_status,
status: session.getPublicStatus(),
},
} satisfies PresenceUpdateEvent),
session.save(),
]);
if (session) {
await emitEvent({
event: "PRESENCE_UPDATE",
user_id: user.id,
data: {
user: user.toPublicUser(),
activities: session.activities,
client_status: session.client_status,
status: session.getPublicStatus(),
},
} satisfies PresenceUpdateEvent);
}
}

Expand Down
Loading
Loading