Fix kotlin telegram bot issue #160: #248
Conversation
martin-petersen
commented
Jun 21, 2022
martin-petersen
commented
- Add possibility to specify the horizontal accuracy of a location
- Add possibility to specify the horizontal accuracy of a location
There was a problem hiding this comment.
Hi Martin! Thank you for your contribution. I merged some other PRs and there is conflicts, so if you could resolve them that would be cool!
I also left some other comments, all related to variable naming and styling so no biggie, if you change those + the conflicts this is ready to merge :D
| @@ -976,7 +976,8 @@ class Bot private constructor( | |||
| disableNotification: Boolean? = null, | |||
| replyToMessageId: Long? = null, | |||
| allowSendingWithoutReply: Boolean? = null, | |||
| replyMarkup: ReplyMarkup? = null | |||
| replyMarkup: ReplyMarkup? = null, | |||
| horizontal_accuracy: Float? = null | |||
There was a problem hiding this comment.
Use camel case like in other variables.
| @@ -985,7 +986,8 @@ class Bot private constructor( | |||
| disableNotification, | |||
| replyToMessageId, | |||
| allowSendingWithoutReply, | |||
| replyMarkup | |||
| replyMarkup, | |||
| horizontal_accuracy | |||
There was a problem hiding this comment.
Use camel case like in other variables.
| @@ -1066,14 +1068,16 @@ class Bot private constructor( | |||
| inlineMessageId: String? = null, | |||
| latitude: Float, | |||
| longitude: Float, | |||
| replyMarkup: ReplyMarkup? = null | |||
| replyMarkup: ReplyMarkup? = null, | |||
| horizontal_accuracy: Float? = null | |||
There was a problem hiding this comment.
Use camel case like in other variables.
| ) = apiClient.editMessageLiveLocation( | ||
| chatId, | ||
| messageId, | ||
| inlineMessageId, | ||
| latitude, | ||
| longitude, | ||
| replyMarkup | ||
| replyMarkup, | ||
| horizontal_accuracy |
There was a problem hiding this comment.
Use camel case like in other variables.
| @@ -2,5 +2,6 @@ package com.github.kotlintelegrambot.entities | |||
|
|
|||
| data class Location( | |||
| val longitude: Float, | |||
| val latitude: Float | |||
| val latitude: Float, | |||
| val horizontal_accuracy: Float?, | |||
There was a problem hiding this comment.
Use camel case like in other variables. In case you need to convert the field there is an example here https://github.com/kotlin-telegram-bot/kotlin-telegram-bot/pull/246/files#diff-a2f2723c9a12ea5c753ed62dc6c8c7f17869bd7e1c949b298ee726daa43ca9e7R8
| @@ -640,7 +642,8 @@ internal class ApiClient( | |||
| inlineMessageId: String?, | |||
| latitude: Float, | |||
| longitude: Float, | |||
| replyMarkup: ReplyMarkup? | |||
| replyMarkup: ReplyMarkup?, | |||
| horizontal_accuracy: Float? | |||
There was a problem hiding this comment.
Use camel case like in other variables.
| @@ -649,7 +652,8 @@ internal class ApiClient( | |||
| inlineMessageId, | |||
| latitude, | |||
| longitude, | |||
| replyMarkup | |||
| replyMarkup, | |||
| horizontal_accuracy | |||
There was a problem hiding this comment.
Use camel case like in other variables.
| @@ -373,7 +374,8 @@ internal interface ApiService { | |||
| @Field("inline_message_id") inlineMessageId: String?, | |||
| @Field("latitude") latitude: Float, | |||
| @Field("longitude") longitude: Float, | |||
| @Field(ApiConstants.REPLY_MARKUP) replyMarkup: ReplyMarkup? = null | |||
| @Field(ApiConstants.REPLY_MARKUP) replyMarkup: ReplyMarkup? = null, | |||
| @Field("horizontal_accuracy") horizontal_accuracy: Float? = null | |||
There was a problem hiding this comment.
Use camel case like in other variables.
| ): Location = Location( | ||
| longitude = longitude, | ||
| latitude = latitude | ||
| latitude = latitude, | ||
| horizontalAccuracy |
There was a problem hiding this comment.
Assign the variable like with the others
| horizontalAccuracy | |
| horizontalAccuracy = horizontalAccuracy |
| @@ -48,6 +48,7 @@ class GetChatIT : ApiClientIT() { | |||
| location = Location( | |||
| latitude = 20.425537f, | |||
| longitude = -3.604971f, | |||
| horizontal_accuracy = 2.3f | |||
There was a problem hiding this comment.
Use camel case like in other variables.
