Skip to content

Commit d235350

Browse files
committed
Added the field forward_sender_name to the Message object, containing name of the sender who has opted to hide their account
1 parent 721e7eb commit d235350

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public class Message implements Serializable {
2020
private Chat forward_from_chat;
2121
private Integer forward_from_message_id;
2222
private String forward_signature;
23+
private String forward_sender_name;
2324
private Integer forward_date;
2425
private Message reply_to_message;
2526
private Integer edit_date;
@@ -91,6 +92,10 @@ public String forwardSignature() {
9192
return forward_signature;
9293
}
9394

95+
public String forwardSenderName() {
96+
return forward_sender_name;
97+
}
98+
9499
public Integer forwardDate() {
95100
return forward_date;
96101
}
@@ -265,6 +270,8 @@ public boolean equals(Object o) {
265270
return false;
266271
if (forward_signature != null ? !forward_signature.equals(message.forward_signature) : message.forward_signature != null)
267272
return false;
273+
if (forward_sender_name != null ? !forward_sender_name.equals(message.forward_sender_name) : message.forward_sender_name != null)
274+
return false;
268275
if (forward_date != null ? !forward_date.equals(message.forward_date) : message.forward_date != null) return false;
269276
if (reply_to_message != null ? !reply_to_message.equals(message.reply_to_message) : message.reply_to_message != null)
270277
return false;
@@ -341,6 +348,7 @@ public String toString() {
341348
", forward_from_chat=" + forward_from_chat +
342349
", forward_from_message_id=" + forward_from_message_id +
343350
", forward_signature='" + forward_signature + '\'' +
351+
", forward_sender_name='" + forward_sender_name + '\'' +
344352
", forward_date=" + forward_date +
345353
", reply_to_message=" + reply_to_message +
346354
", edit_date=" + edit_date +

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ public static void checkMessage(Message message) {
1616
ChatTest.checkChat(message.chat());
1717
}
1818

19-
public static void checkForwardedMessage(Message message) {
20-
checkMessage(message);
21-
assertNotNull(message.forwardDate());
22-
UserTest.checkUser(message.forwardFrom());
23-
}
24-
2519
public static void checkTextMessage(Message message) {
2620
checkMessage(message);
2721
assertNotNull(message.text());

library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,15 +473,25 @@ public void sendMessageToChannelId() {
473473
@Test
474474
public void forwardMessage() {
475475
SendResponse response = bot.execute(new ForwardMessage(chatId, chatId, forwardMessageId).disableNotification(true));
476-
MessageTest.checkForwardedMessage(response.message());
476+
Message message = response.message();
477+
MessageTest.checkMessage(message);
478+
assertNotNull(message.forwardDate());
479+
assertNotNull(message.forwardSenderName());
480+
assertNull(message.forwardFrom());
477481

478-
Message message = bot.execute(new ForwardMessage(channelName, channelName, 651)).message();
482+
message = bot.execute(new ForwardMessage(channelName, channelName, 651)).message();
479483
assertNotNull(message.authorSignature());
480484
assertNotNull(message.forwardSignature());
485+
assertEquals(Integer.valueOf(651), message.forwardFromMessageId());
486+
Chat chat = message.forwardFromChat();
487+
assertEquals(channelName, "@" + chat.username());
488+
assertEquals(Chat.Type.channel, chat.type());
489+
assertNull(message.forwardSenderName());
481490

482491
message = bot.execute(new ForwardMessage(chatId, groupId, 352)).message();
483492
assertEquals(MessageEntity.Type.text_mention, message.entities()[0].type());
484493
assertNotNull(message.entities()[0].user());
494+
assertNotNull(message.forwardSenderName());
485495
}
486496

487497
@Test

0 commit comments

Comments
 (0)