Complete endpoint model

HeroBrine1st · Mar 30, 2024 · 876ddb9 · 876ddb9
1 parent 95adce5
commit 876ddb9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/app/src/main/java/ru/herobrine1st/e621/api/API.kt b/app/src/main/java/ru/herobrine1st/e621/api/API.kt
@@ -21,8 +21,8 @@
 package ru.herobrine1st.e621.api
 
 import androidx.annotation.IntRange
-import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
+import ru.herobrine1st.e621.api.endpoint.favourites.AddToFavouritesEndpoint
 import ru.herobrine1st.e621.api.endpoint.favourites.GetFavouritesEndpoint
 import ru.herobrine1st.e621.api.endpoint.posts.GetPostCommentsDTextEndpoint
 import ru.herobrine1st.e621.api.endpoint.posts.GetPostCommentsHTMLEndpoint
@@ -69,7 +69,7 @@ interface API : AutocompleteSuggestionsAPI {
 
     suspend fun addToFavourites(
         postId: PostId,
-    ): Result<JsonElement>
+    ): Result<AddToFavouritesEndpoint.Response>
 
 
     suspend fun removeFromFavourites(

diff --git a/app/src/main/java/ru/herobrine1st/e621/api/APIClient.kt b/app/src/main/java/ru/herobrine1st/e621/api/APIClient.kt
@@ -29,7 +29,6 @@ import io.ktor.client.request.header
 import io.ktor.client.request.setBody
 import io.ktor.http.HttpHeaders
 import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.serializer
@@ -149,7 +148,7 @@ class APIImpl(val client: APIClient) : API {
         limit: Int?,
     ) = client.request(GetFavouritesEndpoint(userId, page, limit))
 
-    override suspend fun addToFavourites(postId: PostId): Result<JsonElement> =
+    override suspend fun addToFavourites(postId: PostId): Result<AddToFavouritesEndpoint.Response> =
         client.request(AddToFavouritesEndpoint(postId))
 
     override suspend fun removeFromFavourites(postId: PostId) =

diff --git a/app/src/main/java/ru/herobrine1st/e621/api/endpoint/favourites/AddToFavouritesEndpoint.kt b/app/src/main/java/ru/herobrine1st/e621/api/endpoint/favourites/AddToFavouritesEndpoint.kt
@@ -23,16 +23,20 @@ package ru.herobrine1st.e621.api.endpoint.favourites
 import io.ktor.resources.Resource
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonElement
 import ru.herobrine1st.e621.api.HttpMethod
 import ru.herobrine1st.e621.api.HttpMethodType
 import ru.herobrine1st.e621.api.endpoint.APIEndpoint
+import ru.herobrine1st.e621.api.model.Post
 import ru.herobrine1st.e621.api.model.PostId
 
-// TODO proper model
 @Serializable
 @HttpMethod(HttpMethodType.POST)
 @Resource("/favorites.json")
 data class AddToFavouritesEndpoint(
-    @SerialName("post_id") val postId: PostId
-): APIEndpoint<Unit, JsonElement>
+    @SerialName("post_id") val postId: PostId,
+) : APIEndpoint<Unit, AddToFavouritesEndpoint.Response> {
+    @Serializable
+    data class Response(
+        val post: Post,
+    )
+}