Merge pull request #5 from tnfAngel/update-main

merge pub-main into main
tnfAngel · Dec 6, 2023 · a99ec13 · a99ec13
2 parents fa74831 + 17796fb
commit a99ec13
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 26 deletions.
diff --git a/src/structures/party/ClientParty.ts b/src/structures/party/ClientParty.ts
@@ -16,7 +16,7 @@ import type PartyMemberConfirmation from './PartyMemberConfirmation';
 import type ClientPartyMember from './ClientPartyMember';
 import type Client from '../../Client';
 import type {
-  PartyData, PartyPrivacy, PartySchema, Playlist,
+  Island, PartyData, PartyPrivacy, PartySchema,
 } from '../../../resources/structs';
 import type PartyMember from './PartyMember';
 import type Friend from '../friend/Friend';
@@ -402,30 +402,36 @@ class ClientParty extends Party {
 
   /**
    * Updates the party's playlist
-   * @param playlist The new playlist
+   * @param mnemonic The new mnemonic (Playlist id or island code, for example: playlist_defaultduo or 1111-1111-1111)
    * @param regionId The new region id
+   * @param version The new version
+   * @param options Playlist options
    * @throws {PartyPermissionError} The client is not the leader of the party
    * @throws {EpicgamesAPIError}
    */
-  public async setPlaylist(playlist: Playlist, regionId?: string) {
+  public async setPlaylist(mnemonic: string, regionId?: string, version?: number, options?: Omit<Island, 'linkId'>) {
     if (!this.me.isLeader) throw new PartyPermissionError();
 
     let regionIdData = this.meta.get('Default:RegionId_s');
     if (regionId) {
       regionIdData = this.meta.set('Default:RegionId_s', regionId);
     }
 
-    let data = this.meta.get('Default:PlaylistData_j');
-    data = this.meta.set('Default:PlaylistData_j', {
+    let data = this.meta.get('Default:SelectedIsland_j');
+    data = this.meta.set('Default:SelectedIsland_j', {
       ...data,
-      PlaylistData: {
-        ...data.PlaylistData,
-        ...playlist,
+      SelectedIsland: {
+        ...data.SelectedIsland,
+        linkId: {
+          mnemonic,
+          version: version ?? -1,
+        },
+        ...options,
       },
     });
 
     await this.sendPatch({
-      'Default:PlaylistData_j': data,
+      'Default:SelectedIsland_j': data,
       'Default:RegionId_s': regionIdData,
     });
   }

diff --git a/src/structures/party/Party.ts b/src/structures/party/Party.ts
@@ -92,13 +92,6 @@ class Party extends Base {
    * The currently selected playlist
    */
   public get playlist() {
-    return this.meta.playlist;
-  }
-
-  /**
-   * The currently selected island
-   */
-  public get island() {
     return this.meta.island;
   }
 

diff --git a/src/structures/party/PartyMember.ts b/src/structures/party/PartyMember.ts
@@ -157,9 +157,9 @@ class PartyMember extends User {
   }
 
   /**
-   * The member's current island
+   * The member's current playlist
    */
-  public get island() {
+  public get playlist() {
     return this.meta.island;
   }
 

diff --git a/src/structures/party/PartyMeta.ts b/src/structures/party/PartyMeta.ts
@@ -1,17 +1,10 @@
 import Meta from '../../util/Meta';
-import type { Island, PartySchema, Playlist } from '../../../resources/structs';
+import type { Island, PartySchema } from '../../../resources/structs';
 
 /**
  * Represents a party's meta
  */
 class PartyMeta extends Meta<PartySchema> {
-  /**
-   * The currently selected playlist
-   */
-  public get playlist(): Playlist | undefined {
-    return this.get('Default:PlaylistData_j')?.PlaylistData;
-  }
-
   /**
    * The currently selected island
    */