feat: add smart_shuffle parameter to CurrentlyPlayingContext (#430)

Momme Raap · Momme Raap · commit 40a0b4464125 · 2025-11-08T11:14:35.000+01:00
diff --git a/src/main/java/se/michaelthelin/spotify/model_objects/miscellaneous/CurrentlyPlayingContext.java b/src/main/java/se/michaelthelin/spotify/model_objects/miscellaneous/CurrentlyPlayingContext.java
@@ -24,6 +24,8 @@ public class CurrentlyPlayingContext extends AbstractModelObject {
   private final String repeat_state;
   /** If shuffle is on or off. */
   private final Boolean shuffle_state;
+  /** If smart shuffle is on or off. */
+  private final Boolean smart_shuffle;
   /** The context in which the track is being played. */
   private final Context context;
   /** Unix timestamp when the request was made. */
@@ -45,6 +47,7 @@ private CurrentlyPlayingContext(final Builder builder) {
     this.device = builder.device;
     this.repeat_state = builder.repeat_state;
     this.shuffle_state = builder.shuffle_state;
+    this.smart_shuffle = builder.smart_shuffle;
     this.context = builder.context;
     this.timestamp = builder.timestamp;
     this.progress_ms = builder.progress_ms;
@@ -81,6 +84,15 @@ public Boolean getShuffle_state() {
     return shuffle_state;
   }
 
+  /**
+   * Get smart shuffle state of the device.
+   *
+   * @return If smart shuffle is on or off.
+   */
+  public Boolean getSmart_shuffle() {
+    return smart_shuffle;
+  }
+
   /**
    * Get the context from where the currently playing item is played from.
    *
@@ -147,9 +159,9 @@ public Actions getActions() {
   @Override
   public String toString() {
     return "CurrentlyPlayingContext(device=" + device + ", repeat_state=" + repeat_state + ", shuffle_state="
-        + shuffle_state + ", context=" + context + ", timestamp=" + timestamp + ", progress_ms=" + progress_ms
-        + ", is_playing=" + is_playing + ", item=" + item + ", currentlyPlayingType=" + currentlyPlayingType
-        + ", actions=" + actions + ")";
+        + shuffle_state + ", smart_shuffle=" + smart_shuffle + ", context=" + context + ", timestamp=" + timestamp
+        + ", progress_ms=" + progress_ms + ", is_playing=" + is_playing + ", item=" + item + ", currentlyPlayingType="
+        + currentlyPlayingType + ", actions=" + actions + ")";
   }
 
   @Override
@@ -164,6 +176,7 @@ public static final class Builder extends AbstractModelObject.Builder {
     private Device device;
     private String repeat_state;
     private Boolean shuffle_state;
+    private Boolean smart_shuffle;
     private Context context;
     private Long timestamp;
     private Integer progress_ms;
@@ -211,6 +224,16 @@ public Builder setShuffle_state(Boolean shuffle_state) {
       this.shuffle_state = shuffle_state;
       return this;
     }
+    /**
+     * The smart shuffle setter.
+     *
+     * @param smart_shuffle If smart shuffle is on or off.
+     * @return A {@link CurrentlyPlayingContext.Builder}.
+     */
+    public Builder setSmart_shuffle(Boolean smart_shuffle) {
+      this.smart_shuffle = smart_shuffle;
+      return this;
+    }
 
     /**
      * The playing context setter.
@@ -326,6 +349,10 @@ public CurrentlyPlayingContext createModelObject(JsonObject jsonObject) {
           hasAndNotNull(jsonObject, "shuffle_state")
             ? jsonObject.get("shuffle_state").getAsBoolean()
             : null)
+        .setSmart_shuffle(
+          hasAndNotNull(jsonObject, "smart_shuffle")
+            ? jsonObject.get("smart_shuffle").getAsBoolean()
+            : null)
         .setContext(
           hasAndNotNull(jsonObject, "context")
             ? new Context.JsonUtil().createModelObject(
diff --git a/src/test/fixtures/requests/data/player/GetInformationAboutUsersCurrentPlaybackRequest.json b/src/test/fixtures/requests/data/player/GetInformationAboutUsersCurrentPlaybackRequest.json
@@ -92,5 +92,6 @@
     }
   },
   "repeat_state": "off",
-  "shuffle_state": false
+  "shuffle_state": false,
+  "smart_shuffle": false
 }
diff --git a/src/test/fixtures/requests/data/player/GetInformationAboutUsersCurrentPlaybackRequest_Episode.json b/src/test/fixtures/requests/data/player/GetInformationAboutUsersCurrentPlaybackRequest_Episode.json
@@ -9,6 +9,7 @@
     "volume_percent": 100
   },
   "shuffle_state": false,
+  "smart_shuffle": false,
   "repeat_state": "off",
   "timestamp": 1516669848357,
   "context": {
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/player/GetInformationAboutUsersCurrentPlaybackRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/player/GetInformationAboutUsersCurrentPlaybackRequestTest.java
@@ -73,6 +73,8 @@ public void shouldReturnDefault(final CurrentlyPlayingContext currentlyPlayingCo
       currentlyPlayingContext.getRepeat_state());
     assertFalse(
       currentlyPlayingContext.getShuffle_state());
+    assertFalse(
+      currentlyPlayingContext.getSmart_shuffle());
     assertNull(
       currentlyPlayingContext.getContext());
     assertEquals(
@@ -115,6 +117,8 @@ public void shouldReturnDefaultEpisode(final CurrentlyPlayingContext currentlyPl
       currentlyPlayingContext.getRepeat_state());
     assertFalse(
       currentlyPlayingContext.getShuffle_state());
+    assertFalse(
+      currentlyPlayingContext.getSmart_shuffle());
     assertNotNull(
       currentlyPlayingContext.getContext());
     assertEquals(

Original file line number	Diff line number	Diff line change
`@@ -92,5 +92,6 @@`
`92`	`92`	`}`
`93`	`93`	`},`
`94`	`94`	`"repeat_state": "off",`
`95`		`- "shuffle_state": false`
	`95`	`+ "shuffle_state": false,`
	`96`	`+ "smart_shuffle": false`
`96`	`97`	`}`