Skip to content
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

[NEW] Add method for new API endpoint users.requestDataDownload #247

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

[NEW] Add method for new API endpoint users.requestDataDownload #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
018ccfd
Merge pull request #242 from RocketChat/develop
philipbrito Mar 27, 2019
88a4c2d
Add directory endpoint functions.
philipbrito Apr 17, 2019
d348a56
Merge pull request #243 from RocketChat/new/directory
philipbrito Apr 18, 2019
22fdf29
Update kotlin version.
philipbrito Apr 26, 2019
4c11fbf
Adds prid attibute.
philipbrito Apr 28, 2019
cf11e94
Update Kotlinter version.
philipbrito Apr 28, 2019
9a91ab3
Merge pull request #244 from RocketChat/new/discussion
philipbrito Apr 28, 2019
4f3a062
Maps the names property
philipbrito May 1, 2019
83d9c62
Add test without names property
philipbrito May 1, 2019
217d1c3
Fix wrong indentation
philipbrito May 1, 2019
b9aa0c7
AddsMessageListAdapterFactory
philipbrito May 2, 2019
ebeaa66
Merge pull request #245 from RocketChat/hotfix/chat-list-not-showing
philipbrito May 3, 2019
a692490
Add method for new API endpoint users.requestDataDownload
ubarsaiyan May 8, 2019
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
4 changes: 4 additions & 0 deletions compat/src/main/kotlin/chat/rocket/core/compat/Server.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ import chat.rocket.core.RocketChatClient
import chat.rocket.core.compat.internal.callback
import chat.rocket.core.internal.rest.serverInfo
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.InternalCoroutinesApi

/**
* Returns the current logged server information.
* Must be used with a coroutine context (async, launch, etc)
*/
@ExperimentalCoroutinesApi
@InternalCoroutinesApi
fun RocketChatClient.serverInfo(future: Callback<ServerInfo>): Call = callback(Dispatchers.IO, future) { serverInfo() }
4 changes: 4 additions & 0 deletions compat/src/main/kotlin/chat/rocket/core/compat/User.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ import chat.rocket.core.compat.internal.callback
import chat.rocket.core.internal.rest.me
import chat.rocket.core.model.Myself
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.InternalCoroutinesApi

/**
* Returns the current logged user information, useful to check if the Token from TokenProvider
* is still valid. Must be used with a coroutine context (async, launch, etc)
*/
@ExperimentalCoroutinesApi
@InternalCoroutinesApi
fun RocketChatClient.me(future: Callback<Myself>): Call = callback(Dispatchers.IO, future) { me() }
5 changes: 4 additions & 1 deletion compat/src/main/kotlin/chat/rocket/core/compat/internal/Callback.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ import chat.rocket.core.compat.Callback
import kotlinx.coroutines.AbstractCoroutine
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.InternalCoroutinesApi
import kotlinx.coroutines.Job
import kotlinx.coroutines.newCoroutineContext
import kotlin.coroutines.CoroutineContext
import kotlin.coroutines.startCoroutine

@ExperimentalCoroutinesApi
@InternalCoroutinesApi
@JvmOverloads
fun <T> callback(
context: CoroutineContext = Dispatchers.Default,
Expand All @@ -26,7 +29,7 @@ fun <T> callback(
return Call(job)
}

@UseExperimental(InternalCoroutinesApi::class)
@InternalCoroutinesApi
private class CallbackCoroutine<in T>(
parentContext: CoroutineContext,
private val callback: Callback<T>
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/kotlin/chat/rocket/core/RocketChatClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import chat.rocket.core.internal.SettingsAdapter
import chat.rocket.core.internal.AttachmentAdapterFactory
import chat.rocket.core.internal.RoomListAdapterFactory
import chat.rocket.core.internal.CoreJsonAdapterFactory
import chat.rocket.core.internal.MessageListAdapterFactory
import chat.rocket.core.internal.ReactionsAdapter
import chat.rocket.core.internal.model.Subscription
import chat.rocket.core.internal.realtime.socket.Socket
Expand Down Expand Up @@ -53,6 +54,7 @@ class RocketChatClient private constructor(
.add(SettingsAdapter())
.add(AttachmentAdapterFactory(logger))
.add(RoomListAdapterFactory(logger))
.add(MessageListAdapterFactory(logger))
.add(MetaJsonAdapter.ADAPTER_FACTORY)
.add(java.lang.Long::class.java, ISO8601Date::class.java, TimestampAdapter(CalendarISO8601Converter()))
.add(Long::class.java, ISO8601Date::class.java, TimestampAdapter(CalendarISO8601Converter()))
Expand Down
Loading