Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: Fetch more trending posts, links, and hashtags (#634) 

The previous code didn't set a limit for the number of posts, links, and
hashtags to fetch on the trending pages, so used the conservative
defaults.

Increase these to the API maximums to show the user more information.
This commit is contained in:
Nik Clayton 2024-04-22 21:34:22 +02:00 committed by GitHub
parent 7e335ed51c
commit aa930f3a6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/app/pachli/components/timeline/viewmodel/NetworkTimelineRemoteMediator.kt
View File

@ -125,7 +125,7 @@ class NetworkTimelineRemoteMediator(
Timeline.Home -> api.homeTimeline(maxId = maxId, minId = minId, limit = loadSize)
Timeline.PublicFederated -> api.publicTimeline(local = false, maxId = maxId, minId = minId, limit = loadSize)
Timeline.PublicLocal -> api.publicTimeline(local = true, maxId = maxId, minId = minId, limit = loadSize)
Timeline.TrendingStatuses -> api.trendingStatuses()
Timeline.TrendingStatuses -> api.trendingStatuses(limit = LIMIT_TRENDING_STATUSES)
is Timeline.Hashtags -> {
val firstHashtag = timeline.tags.first()
val additionalHashtags = timeline.tags.subList(1, timeline.tags.size)
@ -167,4 +167,13 @@ class NetworkTimelineRemoteMediator(
else -> throw IllegalStateException("NetworkTimelineRemoteMediator does not support $timeline")
}
}
companion object {
/**
* How many trending statuses to fetch. These are not paged, so fetch the
* documented (https://docs.joinmastodon.org/methods/trends/#query-parameters-1)
* maximum.
*/
const val LIMIT_TRENDING_STATUSES = 40
}
}

11
app/src/main/java/app/pachli/components/trending/TrendingLinksRepository.kt
View File

@ -23,5 +23,14 @@ import javax.inject.Inject
class TrendingLinksRepository @Inject constructor(
private val api: MastodonApi,
) {
suspend fun getTrendingLinks() = api.trendingLinks()
suspend fun getTrendingLinks() = api.trendingLinks(limit = LIMIT_TRENDING_LINKS)
companion object {
/**
* How many trending links to fetch. These are not paged, so fetch the
* documented (https://docs.joinmastodon.org/methods/trends/#query-parameters-2)
* maximum.
*/
const val LIMIT_TRENDING_LINKS = 20
}
}

11
app/src/main/java/app/pachli/components/trending/viewmodel/TrendingTagsViewModel.kt
View File

@ -88,7 +88,7 @@ class TrendingTagsViewModel @Inject constructor(
val deferredFilters = async { mastodonApi.getFilters() }
mastodonApi.trendingTags().fold(
mastodonApi.trendingTags(limit = LIMIT_TRENDING_HASHTAGS).fold(
{ tagResponse ->
val firstTag = tagResponse.firstOrNull()
@ -129,4 +129,13 @@ class TrendingTagsViewModel @Inject constructor(
return map { TrendingViewData.Tag.from(it, maxTrendingValue) }
}
companion object {
/**
* How many trending hashtags to fetch. These are not paged, so fetch the
* documented (https://docs.joinmastodon.org/methods/trends/#query-parameters)
* maximum.
*/
const val LIMIT_TRENDING_HASHTAGS = 20
}
}

12
core/network/src/main/kotlin/app/pachli/core/network/retrofit/MastodonApi.kt
View File

@ -787,11 +787,17 @@ interface MastodonApi {
suspend fun unfollowTag(@Path("name") name: String): NetworkResult<HashTag>
@GET("api/v1/trends/tags")
suspend fun trendingTags(): NetworkResult<List<TrendingTag>>
suspend fun trendingTags(
@Query("limit") limit: Int? = null,
): NetworkResult<List<TrendingTag>>
@GET("api/v1/trends/links")
suspend fun trendingLinks(): NetworkResult<List<TrendsLink>>
suspend fun trendingLinks(
@Query("limit") limit: Int? = null,
): NetworkResult<List<TrendsLink>>
@GET("api/v1/trends/statuses")
suspend fun trendingStatuses(): Response<List<Status>>
suspend fun trendingStatuses(
@Query("limit") limit: Int? = null,
): Response<List<Status>>
}