summary refs log tree commit diff
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-09-07 15:31:40 +1000
committerMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-09-07 15:35:58 +1000
commit993169836750df0c5230dd112cc56d8ff4f2158c (patch)
tree6feb353da65bfe3922a05f934777838f3a539398
parentAdded spotify keys to Activity schema (diff)
parentUpdate README.md (diff)
downloadserver-993169836750df0c5230dd112cc56d8ff4f2158c.tar.xz
Merge branch 'slowcord' of github.com:MaddyUnderStars/fosscord-server into slowcord
-rw-r--r--README.md2
-rw-r--r--gateway/src/schema/Activity.ts17
-rw-r--r--util/src/interfaces/Activity.ts3
3 files changed, 12 insertions, 10 deletions
diff --git a/README.md b/README.md
index b95a4d0b..6aac9e57 100644
--- a/README.md
+++ b/README.md
@@ -14,5 +14,5 @@
   </a>
 </p>
 
-Branch that [slowcord.maddy.k.vu](https://slowcord.maddy.k.vu) runs.  
+Branch that [slowcord.understars.dev](https://slowcord.understars.dev) runs.  
 Generally up to date with master, also contains my fixes/etc that aren't yet merged.
diff --git a/gateway/src/schema/Activity.ts b/gateway/src/schema/Activity.ts
index c21e993c..3cf254a1 100644
--- a/gateway/src/schema/Activity.ts
+++ b/gateway/src/schema/Activity.ts
@@ -38,17 +38,18 @@ export const ActivitySchema = {
 			},
 			$instance: Boolean,
 			$flags: String,
+
+			$id: String,
+			$sync_id: String,
+			$metadata: { // spotify
+				$context_url: String,
+				album_id: String,
+				artist_ids: [String],
+			},
+			$session_id: String,
 		},
 	],
 	$since: Number, // unix time (in milliseconds) of when the client went idle, or null if the client is not idle
-
-	$id: String,
-	$sync_id: String,
-	$metadata: { // spotify
-		$context_url: String,
-		album_id: String,
-		artist_ids: [String],
-	}
 };
 
 export interface ActivitySchema {
diff --git a/util/src/interfaces/Activity.ts b/util/src/interfaces/Activity.ts
index a2cd2222..944a6466 100644
--- a/util/src/interfaces/Activity.ts
+++ b/util/src/interfaces/Activity.ts
@@ -40,7 +40,8 @@ export interface Activity {
 		context_url?: string;
 		album_id: string;
 		artist_ids: string[];
-	}
+	};
+	session_id: string;
 }
 
 export enum ActivityType {