Skip to content

Commit a54250e

Browse files
committed
Fix Message.business_connection_id #400
1 parent 790c8d8 commit a54250e

File tree

2 files changed

+33
-9
lines changed

2 files changed

+33
-9
lines changed

library/src/main/java/com/pengrad/telegrambot/model/Message.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class Message extends MaybeInaccessibleMessage implements Serializable {
3030
private Chat sender_chat;
3131
private Integer sender_boost_count;
3232
private User sender_business_bot;
33-
private BusinessConnection business_connection;
33+
private String business_connection_id;
3434
private MessageOrigin forward_origin;
3535
private Boolean is_topic_message;
3636
private Boolean is_automatic_forward;
@@ -129,8 +129,8 @@ public User senderBusinessBot() {
129129
return sender_business_bot;
130130
}
131131

132-
public BusinessConnection businessConnection() {
133-
return business_connection;
132+
public String businessConnectionId() {
133+
return business_connection_id;
134134
}
135135

136136
public MessageOrigin forwardOrigin() {
@@ -223,9 +223,11 @@ public Boolean isAutomaticForward() {
223223
public Message replyToMessage() {
224224
return reply_to_message;
225225
}
226+
226227
public ExternalReplyInfo externalReply() {
227228
return external_reply;
228229
}
230+
229231
public TextQuote quote() {
230232
return quote;
231233
}
@@ -546,13 +548,13 @@ public boolean equals(Object o) {
546548
if (o == null || getClass() != o.getClass()) return false;
547549
Message message = (Message) o;
548550
return Objects.equals(message_id, message.message_id) &&
549-
Objects.equals(message_thread_id , message.message_thread_id ) &&
551+
Objects.equals(message_thread_id, message.message_thread_id) &&
550552
Objects.equals(from, message.from) &&
551553
Objects.equals(sender_chat, message.sender_chat) &&
552554
Objects.equals(sender_boost_count, message.sender_boost_count) &&
553555
Objects.equals(date, message.date) &&
554556
Objects.equals(sender_business_bot, message.sender_business_bot) &&
555-
Objects.equals(business_connection, message.business_connection) &&
557+
Objects.equals(business_connection_id, message.business_connection_id) &&
556558
Objects.equals(chat, message.chat) &&
557559
Objects.equals(forward_origin, message.forward_origin) &&
558560
Objects.equals(is_topic_message, message.is_topic_message) &&
@@ -648,7 +650,7 @@ public String toString() {
648650
", sender_boost_count=" + sender_boost_count +
649651
", date=" + date +
650652
", sender_business_bot=" + sender_business_bot +
651-
", business_connection=" + business_connection +
653+
", business_connection_id=" + business_connection_id +
652654
", chat=" + chat +
653655
", forward_origin=" + forward_origin +
654656
", is_topic_message=" + is_topic_message +
@@ -659,9 +661,9 @@ public String toString() {
659661
", reply_to_story=" + reply_to_story +
660662
", via_bot=" + via_bot +
661663
", edit_date=" + edit_date +
662-
", has_protected_content=" + has_protected_content+
664+
", has_protected_content=" + has_protected_content +
663665
", is_from_offline=" + is_from_offline +
664-
", has_media_spoiler=" + has_media_spoiler+
666+
", has_media_spoiler=" + has_media_spoiler +
665667
", media_group_id='" + media_group_id + '\'' +
666668
", author_signature='" + author_signature + '\'' +
667669
", text='" + text + '\'' +

library/src/test/java/com/pengrad/telegrambot/checks/MessageTest.java

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ public static void checkMessage(Message message) {
1919
public static void checkTextMessage(Message message) {
2020
checkMessage(message);
2121
assertNotNull(message.text());
22+
assertNull(message.messageThreadId());
23+
assertNull(message.senderBoostCount());
24+
assertNull(message.senderBusinessBot());
25+
assertNull(message.businessConnectionId());
26+
assertNull(message.forwardOrigin());
2227
assertNull(message.newChatMembers());
2328
assertNull(message.leftChatMember());
2429
assertNull(message.newChatTitle());
@@ -32,19 +37,36 @@ public static void checkTextMessage(Message message) {
3237
assertNull(message.pinnedMessage());
3338
assertNull(message.successfulPayment());
3439
assertNull(message.connectedWebsite());
35-
assertNull(message.messageThreadId());
3640
assertFalse(message.isTopicMessage());
3741
assertNull(message.isAutomaticForward());
42+
assertNull(message.replyToMessage());
43+
assertNull(message.externalReply());
44+
assertNull(message.quote());
45+
assertNull(message.replyToStory());
46+
assertFalse(message.isFromOffline());
3847
assertFalse(message.hasMediaSpoiler());
48+
assertNull(message.showCaptionAboveMedia());
49+
assertNull(message.linkPreviewOptions());
50+
assertNull(message.effectId());
3951
assertNull(message.messageAutoDeleteTimerChanged());
52+
assertNull(message.refundedPayment());
53+
assertNull(message.story());
54+
assertNull(message.usersShared());
55+
assertNull(message.userShared());
4056
assertNull(message.chatShared());
4157
assertNull(message.proximityAlertTriggered());
58+
assertNull(message.boostAdded());
59+
assertNull(message.chatBackgroundSet());
4260
assertNull(message.forumTopicCreated());
4361
assertNull(message.forumTopicEdited());
4462
assertNull(message.forumTopicClosed());
4563
assertNull(message.forumTopicReopened());
4664
assertNull(message.generalForumTopicHidden());
4765
assertNull(message.generalForumTopicUnhidden());
66+
assertNull(message.giveawayCreated());
67+
assertNull(message.giveaway());
68+
assertNull(message.giveawayWinners());
69+
assertNull(message.giveawayCompleted());
4870
assertNull(message.writeAccessAllowed());
4971
assertNull(message.videoChatStarted());
5072
assertNull(message.videoChatEnded());

0 commit comments

Comments
 (0)