Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package dev.usbharu.multim.misskey.v12.common

import dev.usbharu.multim.model.*
import kotlinx.datetime.Clock
import kotlinx.datetime.Instant

@Suppress("LongParameterList")
class MisskeyStatus(
Expand All @@ -17,6 +19,7 @@ class MisskeyStatus(
language: String? = null,
poll: Poll? = null,
files: Files? = null,
createdAt:Instant = Clock.System.now()
) : Status(
id,
account,
Expand All @@ -30,5 +33,6 @@ class MisskeyStatus(
tags,
language,
poll,
files
files,
createdAt
)
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package dev.usbharu.multim.misskey.v12.converter.misskey.v12

import dev.usbharu.multim.misskey.v12.common.*
import dev.usbharu.multim.misskey.v12.converter.misskey.v12.ReactionConverter.toReactions
import dev.usbharu.multim.misskey.v12.model.components.Note
import dev.usbharu.multim.misskey.v12.model.components.UserLite
import dev.usbharu.multim.model.Status
Expand All @@ -18,7 +19,12 @@ object NoteConverter {
),
content = MisskeyContent(text.orEmpty()),
files = files?.map { MisskeyFile(byteArrayOf(), it.type, it.url.orEmpty()) }
?.let { MisskeyFiles(it) }
?.let { MisskeyFiles(it) },
reactions = reactions.toReactions(this),
repostCount = renoteCount,
repliesCount = repliesCount,
reposted = false,
createdAt = createdAt
)
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package dev.usbharu.multim.misskey.v12.converter.misskey.v12

import com.github.michaelbull.result.getOrElse
import com.github.michaelbull.result.map
import dev.usbharu.multim.api.EmojiApi
import dev.usbharu.multim.misskey.v12.common.MisskeyReaction
import dev.usbharu.multim.misskey.v12.model.components.Note
import dev.usbharu.multim.misskey.v12.model.components.NoteReaction
import dev.usbharu.multim.misskey.v12.model.components.Reactions
import dev.usbharu.multim.model.Emoji
import dev.usbharu.multim.model.Reaction

object ReactionConverter {
Expand All @@ -23,4 +27,17 @@ object ReactionConverter {
) to it.value
}.toMap()
}

suspend fun Reactions.toReactions(emojiApi: EmojiApi): Map<MisskeyReaction, Int> {
return map { entries ->
emojiApi.get(entries.key)
.map { emoji: Emoji ->
MisskeyReaction(emoji.name, emoji.url)
}.map { misskeyReaction ->
misskeyReaction to entries.value
}
}.map {
it.getOrElse { null }
}.filterNotNull().toMap()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,6 @@ class MeDetailed(
val emailNotificationTypes: List<String>,
val email: String? = null,
val emailVerified: Boolean? = null,
val securityKeysList: List<SecurityKey>,
val securityKeysList: List<SecurityKey> = emptyList(),

) : UserDetailed()
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.usbharu.multim.misskey.v12.model.components

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable

@Serializable
Expand All @@ -21,8 +22,12 @@ data class UserLite(
) : User()

enum class OnlineStatus(val string: String) {
@SerialName("unknown")
UNKNOWN("unknown"),
@SerialName("online")
ONLINE("online"),
@SerialName("active")
ACTIVE("active"),
@SerialName("offline")
OFFLINE("offline")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package dev.usbharu.multim.misskey.v12.api

import dev.usbharu.multim.MultiM
import dev.usbharu.multim.TestUtil.failOnError
import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient
import dev.usbharu.multim.model.SingleTokenAuth
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.test.runTest
import org.junit.jupiter.api.Test

class ITestE2E {

val misskeyApiClient = MisskeyApiClient(
SingleTokenAuth(System.getProperty("multim_misskey_token")),
System.getProperty("multim_misskey_instance"),
MultiM.httpClientWithJson.config {}
)

@Test
fun iTest() = runTest {
val failOnError = I(misskeyApiClient).i().failOnError()
println(failOnError)
}
}