diff --git a/src/main/java/et/telebof/types/Audio.java b/src/main/java/et/telebof/types/Audio.java index 4c0f68f..fd0d378 100644 --- a/src/main/java/et/telebof/types/Audio.java +++ b/src/main/java/et/telebof/types/Audio.java @@ -3,7 +3,7 @@ import java.io.Serializable; public class Audio implements Serializable { - public String fileId, file_unique_id, performer, title, file_name, mime_type; + public String file_id, file_unique_id, performer, title, file_name, mime_type; public Integer duration; public Integer file_size; public PhotoSize thumbnail; diff --git a/src/main/java/et/telebof/types/ForumTopicCreated.java b/src/main/java/et/telebof/types/ForumTopicCreated.java index a768b1d..187d423 100644 --- a/src/main/java/et/telebof/types/ForumTopicCreated.java +++ b/src/main/java/et/telebof/types/ForumTopicCreated.java @@ -4,7 +4,7 @@ public class ForumTopicCreated extends JsonSerializable implements Serializable { - public String name, iconCustomEmojiId; - public Integer iconColor; + public String name, icon_custom_emoji_id; + public Integer icon_color; } diff --git a/src/main/java/et/telebof/types/ForumTopicEdited.java b/src/main/java/et/telebof/types/ForumTopicEdited.java index 01353cd..e337aea 100644 --- a/src/main/java/et/telebof/types/ForumTopicEdited.java +++ b/src/main/java/et/telebof/types/ForumTopicEdited.java @@ -4,5 +4,5 @@ public class ForumTopicEdited extends JsonSerializable implements Serializable { - public String name, iconCustomEmojiId; + public String name, icon_custom_emoji_id; } diff --git a/src/main/java/et/telebof/types/InlineKeyboardMarkup.java b/src/main/java/et/telebof/types/InlineKeyboardMarkup.java index 1a2c7c6..01f5e3a 100644 --- a/src/main/java/et/telebof/types/InlineKeyboardMarkup.java +++ b/src/main/java/et/telebof/types/InlineKeyboardMarkup.java @@ -7,8 +7,7 @@ import java.util.Arrays; import java.util.List; import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; + public class InlineKeyboardMarkup implements Markup, Serializable { private final List> inline_keyboard = new ArrayList<>(); @@ -69,7 +68,7 @@ public void addKeyboard(InlineKeyboardButton... buttons){ } } - public void setRowWidth(int rowWidth) { + public void rowWidth(int rowWidth) { this.rowWidth = rowWidth; } diff --git a/src/main/java/et/telebof/types/LoginUrl.java b/src/main/java/et/telebof/types/LoginUrl.java index 8fbad64..af5d307 100644 --- a/src/main/java/et/telebof/types/LoginUrl.java +++ b/src/main/java/et/telebof/types/LoginUrl.java @@ -4,11 +4,8 @@ public class LoginUrl implements Serializable { - private String url, forwardText, botUsername; - private Boolean requestWriteAccess; - - private String forward_text, bot_username; - private Boolean request_write_access; + public String url, forward_text, bot_username; + public Boolean request_write_access; public LoginUrl url(String url){ diff --git a/src/main/java/et/telebof/types/MaskPosition.java b/src/main/java/et/telebof/types/MaskPosition.java index 968e022..b14121a 100644 --- a/src/main/java/et/telebof/types/MaskPosition.java +++ b/src/main/java/et/telebof/types/MaskPosition.java @@ -4,8 +4,8 @@ public class MaskPosition implements Serializable { - private String point; - private Float x_shift, y_shift, scale; + public String point; + public Float x_shift, y_shift, scale; public MaskPosition point(String point){ this.point = point; diff --git a/src/main/java/et/telebof/types/MenuButtonWebApp.java b/src/main/java/et/telebof/types/MenuButtonWebApp.java index 2a7da25..4f40efb 100644 --- a/src/main/java/et/telebof/types/MenuButtonWebApp.java +++ b/src/main/java/et/telebof/types/MenuButtonWebApp.java @@ -3,7 +3,7 @@ import java.io.Serializable; public class MenuButtonWebApp extends MenuButton implements Serializable { - private WebAppInfo web_app; + public WebAppInfo web_app; public MenuButtonWebApp(String text, WebAppInfo webApp) { super("web_app"); this.web_app = webApp; diff --git a/src/main/java/et/telebof/types/OrderInfo.java b/src/main/java/et/telebof/types/OrderInfo.java index 04b3851..d94a4fd 100644 --- a/src/main/java/et/telebof/types/OrderInfo.java +++ b/src/main/java/et/telebof/types/OrderInfo.java @@ -3,7 +3,7 @@ import java.io.Serializable; public class OrderInfo extends JsonSerializable implements Serializable { - public String name, phoneNumber, email; - public ShippingAddress shippingAddress; + public String name, phone_number, email; + public ShippingAddress shipping_address; } diff --git a/src/main/java/et/telebof/types/UserShared.java b/src/main/java/et/telebof/types/UserShared.java index 6dcdf78..046a695 100644 --- a/src/main/java/et/telebof/types/UserShared.java +++ b/src/main/java/et/telebof/types/UserShared.java @@ -4,6 +4,6 @@ public class UserShared implements Serializable { public Integer request_id; - public Long userId; + public Long user_id; }