From e4ce6f8fc7c2eebb873259459daaff98b55f0797 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 12 Nov 2020 17:44:33 +0600 Subject: [PATCH] fixes in events --- CHANGELOG.md | 2 ++ .../types/message/ChatEvents/abstracts/SupergroupEvent.kt | 2 +- .../tgbotapi/types/message/abstracts/GroupEventMessage.kt | 6 +++++- .../types/message/abstracts/SupergroupEventMessage.kt | 6 +++++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7c5e4c7ca..05fd2c1807 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ * `TextContent#fullEntitiesList` has been deprecated * Now `TextContent` implements `TextedInput` * `TextContent#entities` has been deprecated + * `GroupEventMessage` now overrides `chatEvent` with type `GroupEvent` + * `SupergroupEventMessage` now overrides `chatEvent` with type `SupergroupEvent` ## 0.30.3 diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/SupergroupEvent.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/SupergroupEvent.kt index d57d4a969f..cd0bfe9b53 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/SupergroupEvent.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/SupergroupEvent.kt @@ -1,3 +1,3 @@ package dev.inmo.tgbotapi.types.message.ChatEvents.abstracts -interface SupergroupEvent: ChatEvent \ No newline at end of file +interface SupergroupEvent: GroupEvent \ No newline at end of file diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupEventMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupEventMessage.kt index 2cc84379d1..2ca03698de 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupEventMessage.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/GroupEventMessage.kt @@ -1,3 +1,7 @@ package dev.inmo.tgbotapi.types.message.abstracts -interface GroupEventMessage : ChatEventMessage, FromUserMessage +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent + +interface GroupEventMessage : ChatEventMessage, FromUserMessage { + override val chatEvent: GroupEvent +} diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/SupergroupEventMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/SupergroupEventMessage.kt index b0fdfd456d..d923fd0904 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/SupergroupEventMessage.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/abstracts/SupergroupEventMessage.kt @@ -1,3 +1,7 @@ package dev.inmo.tgbotapi.types.message.abstracts -interface SupergroupEventMessage : GroupEventMessage +import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.SupergroupEvent + +interface SupergroupEventMessage : GroupEventMessage { + override val chatEvent: SupergroupEvent +}