feat: add landing

library/src/commonMain/kotlin/Client.kt

@@ -1,4 +1,5 @@
 import dsl.YandexMusicTagMaker
+import exceptions.NotAuthenticatedException
 import exceptions.SessionExpiredException
 import io.ktor.client.*
 import io.ktor.client.call.*
@@ -9,14 +10,16 @@ import io.ktor.client.request.*
 import io.ktor.client.request.forms.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import model.*
-import model.account.Experiments
 import model.account.PromoCodeStatus
 import model.account.Status
 import model.account.UserSettings
 import model.ad.Ad
 import model.feed.Feed
+import model.landing.BlockType
+import model.landing.Landing
 
 
 expect fun getHttpClientEngine(): HttpClientEngine
@@ -124,10 +127,12 @@ class Client {
                         }
                     }
                 }
-            }
-            headers {
-                remove(HttpHeaders.ContentType)
-                remove(HttpHeaders.ContentLength)
+            } else if (method == HttpMethod.Get) {
+                url {
+                    body.forEach {
+                        parameters.append(it.key, it.value)
+                    }
+                }
             }
         }.body<BasicResponse<T>>().result.apply { client = this@Client }
     }
@@ -197,4 +202,19 @@ class Client {
     )
 
     suspend fun feed() = request<Feed>("feed")
+
+    suspend fun feedWizardIsPassed() =
+        requestPrimitive<HashMap<String, Boolean>>("feed", "wizard", "is-passed").value!!["isWizardPassed"] as Boolean
+
+    suspend fun landing(vararg blocks: BlockType) =
+        request<Landing>(
+            listOf("landing3"),
+            body = hashMapOf(
+                "blocks" to blocks.joinToString(",") {
+                    val json = Json.encodeToString(it)
+                    json.substring(1..<json.length - 1)
+                },
+                "eitherUserId" to (me?.account?.uid ?: throw NotAuthenticatedException()).toString()
+            )
+        )
 }

library/src/commonMain/kotlin/model/account/Theme.kt

@@ -0,0 +1,13 @@
+package model.account
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class Theme {
+    @SerialName("white")
+    White,
+
+    @SerialName("black")
+    Black
+}

library/src/commonMain/kotlin/model/account/UserSettings.kt

@@ -1,33 +1,10 @@
 package model.account
 
 import kotlinx.datetime.Instant
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonNames
 import model.Result
 import kotlin.reflect.KMutableProperty1
 
-@OptIn(ExperimentalSerializationApi::class)
-
-@Serializable
-enum class Visibility {
-    @JsonNames("PUBLIC", "public")
-    PUBLIC,
-
-    @JsonNames("PRIVATE", "private")
-    PRIVATE
-}
-
-@Serializable
-enum class Theme {
-    @SerialName("white")
-    White,
-
-    @SerialName("black")
-    Black
-}
-
 @Serializable
 data class UserSettings(
     var uid: Int? = null,

library/src/commonMain/kotlin/model/account/Visibility.kt

@@ -0,0 +1,15 @@
+package model.account
+
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonNames
+
+@OptIn(ExperimentalSerializationApi::class)
+@Serializable
+enum class Visibility {
+    @JsonNames("PUBLIC", "public")
+    PUBLIC,
+
+    @JsonNames("PRIVATE", "private")
+    PRIVATE
+}

library/src/commonMain/kotlin/model/ad/Ad.kt

@@ -1,25 +1,8 @@
 package model.ad
 
-import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import model.Result
 
-@Serializable
-enum class TypeProduct {
-    @SerialName("subscription")
-    Subscription
-}
-
-enum class Currency {
-    RUB
-}
-
-@Serializable
-enum class PaymentMethod {
-    @SerialName("card")
-    Card
-}
-
 @Serializable
 data class Ad(
     val offersBatchId: String? = null,

library/src/commonMain/kotlin/model/ad/Currency.kt

@@ -0,0 +1,5 @@
+package model.ad
+
+enum class Currency {
+    RUB
+}

library/src/commonMain/kotlin/model/ad/PaymentMethod.kt

@@ -0,0 +1,10 @@
+package model.ad
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class PaymentMethod {
+    @SerialName("card")
+    Card
+}

library/src/commonMain/kotlin/model/ad/TypeProduct.kt

@@ -0,0 +1,10 @@
+package model.ad
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class TypeProduct {
+    @SerialName("subscription")
+    Subscription
+}

library/src/commonMain/kotlin/model/album/Album.kt

@@ -1,112 +1,10 @@
 package model.album
 
 import kotlinx.datetime.Instant
-import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import model.artist.Artist
 import model.track.Options
 
-@Serializable
-enum class AlbumType {
-    @SerialName("single")
-    Single,
-
-    @SerialName("compilation")
-    Compilation,
-
-    @SerialName("podcast")
-    Podcast,
-
-    @SerialName("audiobook")
-    AudioBook
-}
-
-@Serializable
-enum class MetaType {
-    @SerialName("music")
-    Music,
-
-    @SerialName("podcast")
-    Podcast,
-
-    @SerialName("podcast-episode")
-    PodcastEpisode,
-
-    @SerialName("audiobook")
-    AudioBook
-}
-
-@Serializable
-enum class Genre {
-    @SerialName("rock")
-    Rock,
-
-    @SerialName("alternative")
-    Alternative,
-
-    @SerialName("pop")
-    Pop,
-
-    @SerialName("films")
-    Films,
-
-    @SerialName("rusrap")
-    RusRap,
-
-    @SerialName("local-indie")
-    LocalIndie,
-
-    @SerialName("indie")
-    Indie,
-
-    @SerialName("rap")
-    Rap,
-
-    @SerialName("foreignrap")
-    ForeignRap,
-
-    @SerialName("ska")
-    SKA,
-
-    @SerialName("punk")
-    Punk,
-
-    @SerialName("postpunk")
-    PostPunk,
-
-    @SerialName("rusrock")
-    RusRock,
-
-    @SerialName("animated")
-    Animated,
-
-    @SerialName("soundtrack")
-    SoundTrack,
-
-    @SerialName("rusbards")
-    Rusbards,
-
-    @SerialName("ruspop")
-    RusPop,
-
-    @SerialName("dance")
-    Dance,
-
-    @SerialName("podcasts")
-    Podcasts,
-
-    edmgenre, breakbeatgenre,
-
-    @SerialName("dnb")
-    DrumAndBase,
-
-    @SerialName("soviet")
-    Soviet,
-
-    @SerialName("fairytales")
-    FairyTales
-}
-
 @Serializable
 data class Album(
     val id: Int,

library/src/commonMain/kotlin/model/album/AlbumType.kt

@@ -0,0 +1,19 @@
+package model.album
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class AlbumType {
+    @SerialName("single")
+    Single,
+
+    @SerialName("compilation")
+    Compilation,
+
+    @SerialName("podcast")
+    Podcast,
+
+    @SerialName("audiobook")
+    AudioBook
+}

library/src/commonMain/kotlin/model/album/Genre.kt

@@ -0,0 +1,79 @@
+package model.album
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class Genre {
+    @SerialName("rock")
+    Rock,
+
+    @SerialName("alternative")
+    Alternative,
+
+    @SerialName("pop")
+    Pop,
+
+    @SerialName("films")
+    Films,
+
+    @SerialName("rusrap")
+    RusRap,
+
+    @SerialName("local-indie")
+    LocalIndie,
+
+    @SerialName("indie")
+    Indie,
+
+    @SerialName("rap")
+    Rap,
+
+    @SerialName("foreignrap")
+    ForeignRap,
+
+    @SerialName("ska")
+    SKA,
+
+    @SerialName("punk")
+    Punk,
+
+    @SerialName("postpunk")
+    PostPunk,
+
+    @SerialName("rusrock")
+    RusRock,
+
+    @SerialName("animated")
+    Animated,
+
+    @SerialName("soundtrack")
+    SoundTrack,
+
+    @SerialName("rusbards")
+    Rusbards,
+
+    @SerialName("ruspop")
+    RusPop,
+
+    @SerialName("dance")
+    Dance,
+
+    @SerialName("podcasts")
+    Podcasts,
+
+    // TODO
+    edmgenre, breakbeatgenre, ukrrock, experimental, electronics, industrial,
+
+    @SerialName("social-tracks")
+    SocialTracks,
+
+    @SerialName("dnb")
+    DrumAndBase,
+
+    @SerialName("soviet")
+    Soviet,
+
+    @SerialName("fairytales")
+    FairyTales
+}