InsanusMokrassar/tgbotapi
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/TelegramBotAPI.git synced 2025-09-03 23:29:33 +00:00
Code Releases Activity

replace joda-time dependency by soywiz klock

Browse Source
This commit is contained in:
InsanusMokrassar
2019-12-03 09:47:53 +06:00
parent 498efc2ec3
commit 24d11d2c2b
13 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDate.kt
View File

@@ -1,7 +1,7 @@
package com.github.insanusmokrassar.TelegramBotAPI.types
import kotlinx.serialization.*
import org.joda.time.DateTime
import com.soywiz.klock.DateTime
import java.util.concurrent.TimeUnit
@Serializable(TelegramDateSerializer::class)
@@ -12,7 +12,7 @@ data class TelegramDate(
private val date: Long
) {
constructor(dateTime: DateTime) : this(
TimeUnit.MILLISECONDS.toSeconds(dateTime.millis)
TimeUnit.MILLISECONDS.toSeconds(dateTime.unixMillisLong)
)
@Transient
@@ -27,7 +27,7 @@ fun DateTime.toTelegramDate(): TelegramDate = TelegramDate(this)
internal object TelegramDateSerializer : KSerializer<TelegramDate> {
override fun serialize(encoder: Encoder, obj: TelegramDate) {
encoder.encodeLong(
TimeUnit.MILLISECONDS.toSeconds(obj.asDate.millis)
TimeUnit.MILLISECONDS.toSeconds(obj.asDate.unixMillisLong)
)
}

2
src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelEventMessage.kt
View File

@@ -4,7 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.ChannelChat
import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.ChannelEvent
import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ChatEventMessage
import org.joda.time.DateTime
import com.soywiz.klock.DateTime
data class ChannelEventMessage(
override val messageId: MessageIdentifier,

2
src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMediaGroupMessage.kt
View File

@@ -7,7 +7,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage
import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaGroupContent
import org.joda.time.DateTime
import com.soywiz.klock.DateTime
data class ChannelMediaGroupMessage(
override val messageId: MessageIdentifier,

2
src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMessage.kt
View File

@@ -7,7 +7,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.CommonMessage
import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent
import org.joda.time.DateTime
import com.soywiz.klock.DateTime
data class ChannelMessage<T: MessageContent>(
override val messageId: MessageIdentifier,

2
src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMediaGroupMessage.kt
View File

@@ -5,7 +5,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMa
import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.*
import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaGroupContent
import org.joda.time.DateTime
import com.soywiz.klock.DateTime
data class CommonMediaGroupMessage(
override val messageId: MessageIdentifier,

2
src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMessageImpl.kt
View File

@@ -7,7 +7,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.*
import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent
import com.github.insanusmokrassar.TelegramBotAPI.types.message.payments.abstracts.PaymentInfo
import org.joda.time.DateTime
import com.soywiz.klock.DateTime
data class CommonMessageImpl<T: MessageContent>(
override val messageId: MessageIdentifier,

2
src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/GroupEventMessage.kt
View File

@@ -4,7 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.GroupChat
import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.GroupEvent
import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ChatEventMessage
import org.joda.time.DateTime
import com.soywiz.klock.DateTime
data class GroupEventMessage(
override val messageId: MessageIdentifier,

2
src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/SupergroupEventMessage.kt
View File

@@ -4,7 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.SupergroupChat
import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.SupergroupEvent
import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ChatEventMessage
import org.joda.time.DateTime
import com.soywiz.klock.DateTime
data class SupergroupEventMessage(
override val messageId: MessageIdentifier,

2
src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/AbleToBeEditedMessage.kt
View File

@@ -1,6 +1,6 @@
package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts
import org.joda.time.DateTime
import com.soywiz.klock.DateTime
interface AbleToBeEditedMessage : Message {
val editDate: DateTime?

2
src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/Message.kt
View File

@@ -5,7 +5,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
import kotlinx.serialization.*
import kotlinx.serialization.internal.StringDescriptor
import org.joda.time.DateTime
import com.soywiz.klock.DateTime
interface Message {
val messageId: MessageIdentifier

2
src/test/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDateTests.kt
View File

@@ -1,9 +1,9 @@
package com.github.insanusmokrassar.TelegramBotAPI.types
import com.soywiz.klock.DateTime
import kotlinx.serialization.ImplicitReflectionSerializer
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
import org.joda.time.DateTime
import java.util.concurrent.TimeUnit
import kotlin.test.Test
import kotlin.test.assertEquals