From ea3047890bf06dfe8b2de470f5b17ca9f40c1921 Mon Sep 17 00:00:00 2001
From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>
Date: Sun, 11 Aug 2024 06:40:42 +0200
Subject: Fix issues with requesting presences
---
src/util/entities/Session.ts | 12 +++++++-----
src/util/interfaces/Status.ts | 9 +++++----
.../migration/mariadb/1723347738541-client_status.ts | 17 +++++++++++++++++
src/util/migration/mysql/1723347738541-client_status.ts | 17 +++++++++++++++++
.../migration/postgres/1723347738541-client_status.ts | 17 +++++++++++++++++
5 files changed, 63 insertions(+), 9 deletions(-)
create mode 100644 src/util/migration/mariadb/1723347738541-client_status.ts
create mode 100644 src/util/migration/mysql/1723347738541-client_status.ts
create mode 100644 src/util/migration/postgres/1723347738541-client_status.ts
(limited to 'src/util')
diff --git a/src/util/entities/Session.ts b/src/util/entities/Session.ts
index 6c6f7caa6..15f8faa2f 100644
--- a/src/util/entities/Session.ts
+++ b/src/util/entities/Session.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 .
*/
@@ -19,7 +19,7 @@
import { User } from "./User";
import { BaseClass } from "./BaseClass";
import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
-import { Status } from "../interfaces/Status";
+import { ClientStatus, Status } from "../interfaces/Status";
import { Activity } from "../interfaces/Activity";
//TODO we need to remove all sessions on server start because if the server crashes without closing websockets it won't delete them
@@ -43,7 +43,6 @@ export class Session extends BaseClass {
@Column({ type: "simple-json", nullable: true })
activities: Activity[];
- // TODO client_status
@Column({ type: "simple-json", select: false })
client_info: {
client: string;
@@ -51,6 +50,9 @@ export class Session extends BaseClass {
version: number;
};
+ @Column({ type: "simple-json" })
+ client_status: ClientStatus;
+
@Column({ nullable: false, type: "varchar" })
status: Status; //TODO enum
}
diff --git a/src/util/interfaces/Status.ts b/src/util/interfaces/Status.ts
index 407a813ec..0f2f4e136 100644
--- a/src/util/interfaces/Status.ts
+++ b/src/util/interfaces/Status.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 .
*/
@@ -21,5 +21,6 @@ export type Status = "idle" | "dnd" | "online" | "offline" | "invisible";
export interface ClientStatus {
desktop?: string; // e.g. Windows/Linux/Mac
mobile?: string; // e.g. iOS/Android
- web?: string; // e.g. browser, bot account
+ web?: string; // e.g. browser, bot account, unknown
+ embedded?: string; // e.g. embedded
}
diff --git a/src/util/migration/mariadb/1723347738541-client_status.ts b/src/util/migration/mariadb/1723347738541-client_status.ts
new file mode 100644
index 000000000..0e02c45e5
--- /dev/null
+++ b/src/util/migration/mariadb/1723347738541-client_status.ts
@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class client_status1723347738541 implements MigrationInterface {
+ name = "client_status1723347738541";
+
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(
+ "ALTER TABLE `sessions` ADD `client_status` text NULL AFTER `client_info`",
+ );
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(
+ "ALTER TABLE `sessions` DROP COLUMN `client_status`",
+ );
+ }
+}
diff --git a/src/util/migration/mysql/1723347738541-client_status.ts b/src/util/migration/mysql/1723347738541-client_status.ts
new file mode 100644
index 000000000..0e02c45e5
--- /dev/null
+++ b/src/util/migration/mysql/1723347738541-client_status.ts
@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class client_status1723347738541 implements MigrationInterface {
+ name = "client_status1723347738541";
+
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(
+ "ALTER TABLE `sessions` ADD `client_status` text NULL AFTER `client_info`",
+ );
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(
+ "ALTER TABLE `sessions` DROP COLUMN `client_status`",
+ );
+ }
+}
diff --git a/src/util/migration/postgres/1723347738541-client_status.ts b/src/util/migration/postgres/1723347738541-client_status.ts
new file mode 100644
index 000000000..35d9391ff
--- /dev/null
+++ b/src/util/migration/postgres/1723347738541-client_status.ts
@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class client_status1723347738541 implements MigrationInterface {
+ name = "client_status1723347738541";
+
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(
+ "ALTER TABLE sessions ADD client_status text NULL",
+ );
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(
+ "ALTER TABLE sessions DROP COLUMN client_status",
+ );
+ }
+}
--
cgit 1.5.1