Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-02-16 11:41:21 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1257 from Xefir/1038

Browse Source 
Backport #1038 : Mastodon's API doesn't have `/api/direct_messages.json`
This commit is contained in:
Tlaster 2020-04-21 16:10:42 +08:00 committed by GitHub
commit 3687330bee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountDetailsExtensions.kt
View File

@ -40,6 +40,9 @@ val AccountExtras.official: Boolean
return false
}
val AccountDetails.hasDm: Boolean
get() = type in arrayOf(AccountType.FANFOU, AccountType.TWITTER)
fun <T> AccountDetails.newMicroBlogInstance(context: Context, cls: Class<T>): T {
return credentials.newMicroBlogInstance(context, type, cls)
}

2
twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/message/GetMessagesTask.kt
View File

@ -37,6 +37,7 @@ import org.mariotaku.sqliteqb.library.Expression
import org.mariotaku.twidere.R
import org.mariotaku.twidere.TwidereConstants.QUERY_PARAM_SHOW_NOTIFICATION
import org.mariotaku.twidere.annotation.AccountType
import org.mariotaku.twidere.exception.APINotSupportedException
import org.mariotaku.twidere.extension.findFieldByTypes
import org.mariotaku.twidere.extension.model.*
import org.mariotaku.twidere.extension.model.api.target
@ -85,6 +86,7 @@ class GetMessagesTask(
}
val microBlog = details.newMicroBlogInstance(context, cls = MicroBlog::class.java)
val messages = try {
if (!details.hasDm) throw APINotSupportedException(details.type)
getMessages(microBlog, details, param, i)
} catch (e: MicroBlogException) {
return@forEachIndexed