Skip to content

Commit 3b5280f

Browse files
committed
Fix AddStickerToSet file uploading
1 parent dbd8e4e commit 3b5280f

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

library/src/main/java/com/pengrad/telegrambot/request/AddStickerToSet.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,18 @@ private AddStickerToSet(Long userId, String name, String emojis, String stickerP
5454
}
5555

5656
public AddStickerToSet(Long userId, String name, InputSticker sticker) {
57-
super(BaseResponse.class, "sticker", sticker);
57+
super(BaseResponse.class, attachName(sticker), attachment(sticker));
58+
add("user_id", userId);
5859
add("name", name);
60+
add("sticker", sticker);
61+
}
62+
63+
private static String attachName(InputSticker sticker) {
64+
return sticker.getAttachment() != null ? sticker.getAttachName() : "sticker_id";
65+
}
66+
67+
private static Object attachment(InputSticker sticker) {
68+
return sticker.getAttachment() != null ? sticker.getAttachment() : "sticker_id";
5969
}
6070

6171
public AddStickerToSet maskPosition(MaskPosition maskPosition) {

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,12 +1342,17 @@ public void uploadStickerFile() throws IOException {
13421342

13431343
@Test
13441344
public void createNewPngStickerSet() {
1345+
String name = "test" + System.currentTimeMillis() + "_by_pengrad_test_bot";
13451346
BaseResponse response = bot.execute(
1346-
CreateNewStickerSet.pngSticker(chatId, "test" + System.currentTimeMillis() + "_by_pengrad_test_bot",
1347-
"test1", "\uD83D\uDE00", stickerFile)
1347+
CreateNewStickerSet.pngSticker(chatId, name, "test1", "\uD83D\uDE00", stickerFile)
13481348
.stickerType(Sticker.Type.mask)
13491349
.maskPosition(new MaskPosition(MaskPosition.Point.forehead, 0f, 0f, 1f)));
13501350
assertTrue(response.isOk());
1351+
1352+
response = bot.execute(new AddStickerToSet(chatId, name,
1353+
new InputSticker(stickerFile, new String[]{"\uD83D\uDE00"}))
1354+
.maskPosition(new MaskPosition("eyes", 0f, 0f, 1f)));
1355+
assertTrue(response.isOk());
13511356
}
13521357

13531358
@Test
@@ -1442,6 +1447,9 @@ public void setStickerSetThumb() {
14421447
BaseResponse response = bot.execute(new SetStickerSetThumb(stickerSetAnim, chatId, thumbFile));
14431448
assertTrue(response.isOk());
14441449

1450+
response = bot.execute(new SetStickerSetThumbnail(stickerSetAnim, chatId, thumbFile));
1451+
assertTrue(response.isOk());
1452+
14451453
StickerSet set = bot.execute(new GetStickerSet(stickerSetAnim)).stickerSet();
14461454
assertTrue(set.isAnimated());
14471455
PhotoSize thumb = set.thumb();
@@ -1453,6 +1461,9 @@ public void setStickerSetThumb() {
14531461
// clear thumb by not sending it
14541462
response = bot.execute(new SetStickerSetThumb(stickerSetAnim, chatId));
14551463
assertTrue(response.isOk());
1464+
1465+
response = bot.execute(new SetStickerSetThumbnail(stickerSetAnim, chatId));
1466+
assertTrue(response.isOk());
14561467
}
14571468

14581469
@Test

0 commit comments

Comments
 (0)