diff --git a/packages/app/src/classes/ActivityEvent/index.js b/packages/app/src/classes/ActivityEvent/index.js new file mode 100644 index 00000000..4abadfb4 --- /dev/null +++ b/packages/app/src/classes/ActivityEvent/index.js @@ -0,0 +1,26 @@ +export default class ActivityEvent { + constructor(id, payload) { + if (typeof id !== "string") { + console.error("Event id is required") + return false + } + + this.id = id + this.payload = payload + + this.send().catch((err) => { + console.error("Failed to send remote event >", err) + }) + } + + send = async () => { + app.cores.api.customRequest({ + url: "/activity/client", + method: "POST", + data: { + id: this.id, + payload: this.payload, + }, + }) + } +} diff --git a/packages/app/src/classes/RemoteEvent/index.js b/packages/app/src/classes/RemoteEvent/index.js deleted file mode 100644 index c757d444..00000000 --- a/packages/app/src/classes/RemoteEvent/index.js +++ /dev/null @@ -1,26 +0,0 @@ -export default class RemoteEvent { - constructor(id, payload) { - if (typeof id !== "string") { - console.error("Event id is required") - return false - } - - this.id = id - this.payload = payload - - this.send().catch((err) => { - console.error("Failed to send remote event >", err) - }) - } - - send = async () => { - app.cores.api.customRequest({ - url: "/events/client", - method: "POST", - data: { - id: this.id, - payload: this.payload - } - }) - } -} \ No newline at end of file diff --git a/packages/app/src/cores/player/player.core.js b/packages/app/src/cores/player/player.core.js index 2ba10822..435a466b 100755 --- a/packages/app/src/cores/player/player.core.js +++ b/packages/app/src/cores/player/player.core.js @@ -1,6 +1,6 @@ import { Core } from "@ragestudio/vessel" -import RemoteEvent from "@classes/RemoteEvent" +import ActivityEvent from "@classes/ActivityEvent" import QueueManager from "@classes/QueueManager" import TrackInstance from "./classes/TrackInstance" //import MediaSession from "./classes/MediaSession" @@ -201,7 +201,7 @@ export default class Player extends Core { // send the event to the server if (item.manifest._id && item.manifest.service === "default") { - new RemoteEvent("player.play", { + new ActivityEvent("player.play", { identifier: "unique", // this must be unique to prevent duplicate events and ensure only have unique track events track_id: item.manifest._id, service: item.manifest.service, diff --git a/packages/server/services/main/routes/events/client/post.js b/packages/server/services/main/routes/activity/client/post.js similarity index 100% rename from packages/server/services/main/routes/events/client/post.js rename to packages/server/services/main/routes/activity/client/post.js