Skip to content

Commit 70d3863

Browse files
committed
Fix SendPaidMedia attachments
1 parent 0832bf1 commit 70d3863

File tree

12 files changed

+54
-46
lines changed

12 files changed

+54
-46
lines changed

library/src/main/java/com/pengrad/telegrambot/model/paidmedia/PaidMediaPhoto.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ public int hashCode() {
3636
@Override
3737
public String toString() {
3838
return "PaidMediaPhoto{" +
39-
"type='" + type() + "\'," +
40-
", photo=" + Arrays.toString(photo) + "\'" +
39+
"photo=" + Arrays.toString(photo) +
4140
'}';
4241
}
43-
4442
}

library/src/main/java/com/pengrad/telegrambot/model/paidmedia/PaidMediaPreview.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,9 @@ public int hashCode() {
4747
@Override
4848
public String toString() {
4949
return "PaidMediaPreview{" +
50-
"type='" + type() + "\'," +
51-
", width=" + width + "\'," +
52-
", height=" + height + "\'," +
53-
", duration=" + duration + "\'" +
50+
"width=" + width +
51+
", height=" + height +
52+
", duration=" + duration +
5453
'}';
5554
}
56-
5755
}

library/src/main/java/com/pengrad/telegrambot/model/paidmedia/PaidMediaVideo.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ public int hashCode() {
3636
@Override
3737
public String toString() {
3838
return "PaidMediaVideo{" +
39-
"type='" + type() + "\'," +
40-
", video=" + video + "\'" +
39+
"video=" + video +
4140
'}';
4241
}
43-
4442
}

library/src/main/java/com/pengrad/telegrambot/model/request/InputPaidMedia.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,12 @@
77
import java.util.HashMap;
88
import java.util.Map;
99

10-
/**
11-
* Stas Parshin
12-
* 23 November 2017
13-
*/
1410
abstract public class InputPaidMedia implements Serializable {
1511
private final static long serialVersionUID = 0L;
1612

1713
private final String type;
1814
private final String media;
19-
private String thumbnail;
15+
transient protected Map<String, Object> attachments = new HashMap<>();
2016
transient private InputFile inputFile;
2117
transient private String inputFileAttachId;
2218
transient private String fileName;
@@ -39,6 +35,9 @@ abstract public class InputPaidMedia implements Serializable {
3935
}
4036
}
4137

38+
public Map<String, Object> getAttachments() {
39+
return attachments;
40+
}
4241

4342
public InputFile inputFile() {
4443
return inputFile;

library/src/main/java/com/pengrad/telegrambot/model/request/InputPaidMediaVideo.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import java.io.File;
77
import java.io.Serializable;
8-
import java.util.HashMap;
98
import java.util.Map;
109

1110
public class InputPaidMediaVideo extends InputPaidMedia implements Serializable {
@@ -14,12 +13,8 @@ public class InputPaidMediaVideo extends InputPaidMedia implements Serializable
1413

1514
private Integer width, height, duration;
1615
private Boolean supports_streaming;
17-
1816
private String thumbnail;
1917

20-
transient private Map<String, Object> attachments = new HashMap<>();
21-
22-
2318
public InputPaidMediaVideo(String media) {
2419
super("video", media);
2520
}
@@ -66,11 +61,6 @@ public InputPaidMediaVideo thumbnail(byte[] thumbnail) {
6661
return this;
6762
}
6863

69-
public Map<String, Object> getAttachments() {
70-
return attachments;
71-
}
72-
73-
7464
@Override
7565
public String getDefaultFileName() {
7666
return ContentTypes.VIDEO_FILE_NAME;

library/src/main/java/com/pengrad/telegrambot/model/stars/partner/TransactionPartnerFragment.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ public int hashCode() {
3535
@Override
3636
public String toString() {
3737
return "TransactionPartnerFragment{" +
38-
"type='" + type() + "\'," +
39-
", withdrawal_state=" + withdrawal_state + "\'" +
38+
"withdrawal_state=" + withdrawal_state +
4039
'}';
4140
}
42-
4341
}

library/src/main/java/com/pengrad/telegrambot/model/stars/partner/TransactionPartnerOther.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ public int hashCode() {
2626

2727
@Override
2828
public String toString() {
29-
return "TransactionPartnerOther{" +
30-
"type='" + type() + "\'" +
31-
'}';
29+
return "TransactionPartnerOther{}";
3230
}
33-
3431
}

library/src/main/java/com/pengrad/telegrambot/model/stars/partner/TransactionPartnerTelegramAds.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ public int hashCode() {
2626

2727
@Override
2828
public String toString() {
29-
return "TransactionPartnerTelegramAds{" +
30-
"type='" + type() + "\'" +
31-
'}';
29+
return "TransactionPartnerTelegramAds{}";
3230
}
33-
3431
}

library/src/main/java/com/pengrad/telegrambot/model/stars/partner/TransactionPartnerUser.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@ public int hashCode() {
4848
@Override
4949
public String toString() {
5050
return "TransactionPartnerUser{" +
51-
"type='" + type() + "\'," +
52-
", user=" + user + "\'," +
53-
", invoice_payload=" + invoice_payload + "\'," +
54-
", paid_media=" + paid_media + "\'" +
51+
"user=" + user +
52+
", invoice_payload='" + invoice_payload + '\'' +
53+
", paid_media=" + Arrays.toString(paid_media) +
5554
'}';
5655
}
57-
5856
}

library/src/main/java/com/pengrad/telegrambot/model/stars/withdrawal/RevenueWithdrawalStateSucceeded.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@ public int hashCode() {
3939
@Override
4040
public String toString() {
4141
return "RevenueWithdrawalStateSucceeded{" +
42-
"type='" + type() + "\'," +
43-
"date='" + date + "\'," +
44-
"url='" + url + "\'" +
42+
"date=" + date +
43+
", url='" + url + '\'' +
4544
'}';
4645
}
47-
4846
}

0 commit comments

Comments
 (0)