Skip to content

Fix page_cursor and page both being sent for 0.19+ #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MV-GH merged 1 commit into from
Jul 15, 2024
Merged

Fix page_cursor and page both being sent for 0.19+ #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/commonMain/kotlin/it/vercruysse/lemmyapi/datatypes/GetPosts.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import it.vercruysse.lemmyapi.dto.ListingType
import kotlinx.serialization.Serializable

import it.vercruysse.lemmyapi.CommonParcelize
import it.vercruysse.lemmyapi.dto.PAGE_CURSOR_GUARD

@CommonParcelize
@Serializable
Expand All @@ -20,5 +21,5 @@ data class GetPosts(
val liked_only: Boolean? = null,
val disliked_only: Boolean? = null,
val show_hidden: Boolean? = null,
val page_cursor: PaginationCursor? = null,
val page_cursor: PaginationCursor? = PAGE_CURSOR_GUARD,
) : DatatypeRoot
3 changes: 2 additions & 1 deletion app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0/x19/x0/LemmyApiController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package it.vercruysse.lemmyapi.v0.x19.x0
import io.ktor.client.HttpClient
import it.vercruysse.lemmyapi.dto.ExportUserSettingsResponse
import it.vercruysse.lemmyapi.dto.ImportUserSettings
import it.vercruysse.lemmyapi.dto.PAGE_CURSOR_GUARD
import it.vercruysse.lemmyapi.utils.getResult
import it.vercruysse.lemmyapi.utils.postResult
import it.vercruysse.lemmyapi.utils.putResult
Expand Down Expand Up @@ -196,7 +197,7 @@ internal class LemmyApiController(client: HttpClient, auth: String?) :
* @GET("post/list")
*/
override suspend fun getPosts(form: GetPosts): Result<GetPostsResponse> =
client.getResult("post/list", form)
client.getResult("post/list", form.copy(page = if (form.page_cursor != PAGE_CURSOR_GUARD) null else form.page))

/**
* Delete a post.
Expand Down
3 changes: 2 additions & 1 deletion app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0/x19/x3/LemmyApiController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package it.vercruysse.lemmyapi.v0.x19.x3
import io.ktor.client.HttpClient
import it.vercruysse.lemmyapi.dto.ExportUserSettingsResponse
import it.vercruysse.lemmyapi.dto.ImportUserSettings
import it.vercruysse.lemmyapi.dto.PAGE_CURSOR_GUARD
import it.vercruysse.lemmyapi.utils.getResult
import it.vercruysse.lemmyapi.utils.postResult
import it.vercruysse.lemmyapi.utils.putResult
Expand Down Expand Up @@ -196,7 +197,7 @@ internal class LemmyApiController(client: HttpClient, auth: String?) :
* @GET("post/list")
*/
override suspend fun getPosts(form: GetPosts): Result<GetPostsResponse> =
client.getResult("post/list", form)
client.getResult("post/list", form.copy(page = if (form.page_cursor != PAGE_CURSOR_GUARD) null else form.page))

/**
* Delete a post.
Expand Down
3 changes: 2 additions & 1 deletion app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0/x19/x4/LemmyApiController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package it.vercruysse.lemmyapi.v0.x19.x4
import io.ktor.client.HttpClient
import it.vercruysse.lemmyapi.dto.ExportUserSettingsResponse
import it.vercruysse.lemmyapi.dto.ImportUserSettings
import it.vercruysse.lemmyapi.dto.PAGE_CURSOR_GUARD
import it.vercruysse.lemmyapi.utils.getResult
import it.vercruysse.lemmyapi.utils.postResult
import it.vercruysse.lemmyapi.utils.putResult
Expand Down Expand Up @@ -196,7 +197,7 @@ internal class LemmyApiController(client: HttpClient, auth: String?) :
* @GET("post/list")
*/
override suspend fun getPosts(form: GetPosts): Result<GetPostsResponse> =
client.getResult("post/list", form)
client.getResult("post/list", form.copy(page = if (form.page_cursor != PAGE_CURSOR_GUARD) null else form.page))

/**
* Delete a post.
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ POM_DEVELOPER_URL=https://github.com/MV-GH

POM_ARTIFACT_ID=lemmy-api
GROUP=it.vercruysse.lemmyapi
VERSION_NAME=0.3.2-SNAPSHOT
VERSION_NAME=0.3.3-SNAPSHOT