Skip to content
This repository has been archived by the owner on Jul 30, 2023. It is now read-only.

add only_media parameter in public timeline, add method get custome emojis #76

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add only_media parameter in public timeline, add method get custome emojis #76

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c048e96
add only_media parameter in public timeline
RanKKI Nov 2, 2018
734f84d
add methond get custome emojis
RanKKI Nov 7, 2018
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
29 changes: 22 additions & 7 deletions mastodon4j/src/main/java/com/sys1yagi/mastodon4j/api/method/Public.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@ import com.sys1yagi.mastodon4j.MastodonRequest
import com.sys1yagi.mastodon4j.Parameter
import com.sys1yagi.mastodon4j.api.Pageable
import com.sys1yagi.mastodon4j.api.Range
import com.sys1yagi.mastodon4j.api.entity.Emoji
import com.sys1yagi.mastodon4j.api.entity.Instance
import com.sys1yagi.mastodon4j.api.entity.Results
import com.sys1yagi.mastodon4j.api.entity.Status
import com.sys1yagi.mastodon4j.api.exception.Mastodon4jRequestException
import com.sys1yagi.mastodon4j.extension.fromJson
import com.sys1yagi.mastodon4j.extension.genericType
import com.sys1yagi.mastodon4j.extension.toPageable

class Public(private val client: MastodonClient) {
/**
Expand All @@ -29,6 +26,21 @@ class Public(private val client: MastodonClient) {
)
}

/**
* GET /api/v1/custom_emojis
* @see https://github.com/tootsuite/documentation/blob/master/Using-the-API/API.md#getting-current-instances-custom-emojis
*/
fun getCustomEmojis(): MastodonRequest<List<Emoji>> {
return MastodonRequest(
{
client.get("custom_emojis")
},
{ json ->
client.getSerializer().fromJson(json, Emoji::class.java)
}
)
}

/**
* GET /api/v1/search
* q: The search query
Expand Down Expand Up @@ -59,11 +71,14 @@ class Public(private val client: MastodonClient) {
* GET /api/v1/timelines/public
* @see https://github.com/tootsuite/documentation/blob/master/Using-the-API/API.md#timelines
*/
private fun getPublic(local: Boolean, range: Range): MastodonRequest<Pageable<Status>> {
private fun getPublic(local: Boolean, range: Range, only_media: Boolean): MastodonRequest<Pageable<Status>> {
val parameter = range.toParameter()
if (local) {
parameter.append("local", local)
}
if (only_media) {
parameter.append("only_media", true)
}
return MastodonRequest<Pageable<Status>>(
{
client.get("timelines/public", parameter)
Expand All @@ -75,10 +90,10 @@ class Public(private val client: MastodonClient) {
}

@JvmOverloads
fun getLocalPublic(range: Range = Range()) = getPublic(true, range)
fun getLocalPublic(range: Range = Range(), only_media: Boolean = false) = getPublic(true, range, only_media)

@JvmOverloads
fun getFederatedPublic(range: Range = Range()) = getPublic(false, range)
fun getFederatedPublic(range: Range = Range(), only_media: Boolean = false) = getPublic(false, range, only_media)

/**
* GET /api/v1/timelines/tag/:tag
Expand Down