Skip to content

Commit 232c62b

Browse files
rubenlagusrubenlagus
committed
Api version 7.5
1 parent 65c33e0 commit 232c62b

32 files changed

Lines changed: 777 additions & 77 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>org.telegram</groupId>
88
<artifactId>Bots</artifactId>
99
<packaging>pom</packaging>
10-
<version>7.4.2</version>
10+
<version>7.5.0</version>
1111

1212
<modules>
1313
<module>telegrambots-meta</module>

‎telegrambots-abilities/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.telegram</groupId>
99
<artifactId>Bots</artifactId>
10-
<version>7.4.2</version>
10+
<version>7.5.0</version>
1111
</parent>
1212

1313
<artifactId>telegrambots-abilities</artifactId>
@@ -104,12 +104,12 @@
104104
<dependency>
105105
<groupId>org.telegram</groupId>
106106
<artifactId>telegrambots-webhook</artifactId>
107-
<version>7.4.2</version>
107+
<version>7.5.0</version>
108108
</dependency>
109109
<dependency>
110110
<groupId>org.telegram</groupId>
111111
<artifactId>telegrambots-longpolling</artifactId>
112-
<version>7.4.2</version>
112+
<version>7.5.0</version>
113113
</dependency>
114114

115115
<dependency>

‎telegrambots-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.telegram</groupId>
99
<artifactId>Bots</artifactId>
10-
<version>7.4.2</version>
10+
<version>7.5.0</version>
1111
</parent>
1212

1313
<name>Telegram Bots Client</name>

‎telegrambots-client/src/main/java/org/telegram/telegrambots/client/okhttp/OkHttpTelegramClient.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ public CompletableFuture<Serializable> executeAsync(EditMessageMedia editMessage
422422
builder.addPart(EditMessageMedia.CHAT_ID_FIELD, editMessageMedia.getChatId())
423423
.addPart(EditMessageMedia.MESSAGE_ID_FIELD, editMessageMedia.getMessageId())
424424
.addPart(EditMessageMedia.INLINE_MESSAGE_ID_FIELD, editMessageMedia.getInlineMessageId())
425+
.addPart(EditMessageMedia.BUSINESS_CONNECTION_ID_FIELD, editMessageMedia.getBusinessConnectionId())
425426
.addJsonPart(EditMessageMedia.REPLY_MARKUP_FIELD, editMessageMedia.getReplyMarkup());
426427

427428
addInputData(builder, EditMessageMedia.MEDIA_FIELD, editMessageMedia.getMedia(), true);

‎telegrambots-extensions/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ Just import add the library to your project with one of these options:
1616
<dependency>
1717
<groupId>org.telegram</groupId>
1818
<artifactId>telegrambots-extensions</artifactId>
19-
<version>7.4.2</version>
19+
<version>7.5.0</version>
2020
</dependency>
2121
```
2222

2323
2. Using Gradle:
2424

2525
```gradle
26-
implementation 'org.telegram:telegrambots-extensions:7.4.2'
26+
implementation 'org.telegram:telegrambots-extensions:7.5.0'
2727
```

‎telegrambots-extensions/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.telegram</groupId>
99
<artifactId>Bots</artifactId>
10-
<version>7.4.2</version>
10+
<version>7.5.0</version>
1111
</parent>
1212

1313
<artifactId>telegrambots-extensions</artifactId>
@@ -89,12 +89,12 @@
8989
<dependency>
9090
<groupId>org.telegram</groupId>
9191
<artifactId>telegrambots-webhook</artifactId>
92-
<version>7.4.2</version>
92+
<version>7.5.0</version>
9393
</dependency>
9494
<dependency>
9595
<groupId>org.telegram</groupId>
9696
<artifactId>telegrambots-longpolling</artifactId>
97-
<version>7.4.2</version>
97+
<version>7.5.0</version>
9898
</dependency>
9999

100100
<dependency>

‎telegrambots-longpolling/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.telegram</groupId>
88
<artifactId>Bots</artifactId>
9-
<version>7.4.2</version>
9+
<version>7.5.0</version>
1010
</parent>
1111

1212
<artifactId>telegrambots-longpolling</artifactId>

‎telegrambots-meta/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.telegram</groupId>
99
<artifactId>Bots</artifactId>
10-
<version>7.4.2</version>
10+
<version>7.5.0</version>
1111
</parent>
1212

1313
<artifactId>telegrambots-meta</artifactId>

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/StopMessageLiveLocation.java‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,40 @@
3737
public class StopMessageLiveLocation extends BotApiMethodSerializable {
3838
public static final String PATH = "stopMessageLiveLocation";
3939

40-
private static final String CHATID_FIELD = "chat_id";
41-
private static final String MESSAGEID_FIELD = "message_id";
40+
private static final String CHAT_ID_FIELD = "chat_id";
41+
private static final String MESSAGE_ID_FIELD = "message_id";
4242
private static final String INLINE_MESSAGE_ID_FIELD = "inline_message_id";
43-
private static final String REPLYMARKUP_FIELD = "reply_markup";
43+
private static final String REPLY_MARKUP_FIELD = "reply_markup";
44+
private static final String BUSINESS_CONNECTION_ID_FIELD = "business_connection_id";
4445

4546
/**
4647
* Required if inline_message_id is not specified. Unique identifier for the chat to send the
4748
* message to (Or username for channels)
4849
*/
49-
@JsonProperty(CHATID_FIELD)
50+
@JsonProperty(CHAT_ID_FIELD)
5051
private String chatId;
5152
/**
5253
* Required if inline_message_id is not specified. Unique identifier of the sent message
5354
*/
54-
@JsonProperty(MESSAGEID_FIELD)
55+
@JsonProperty(MESSAGE_ID_FIELD)
5556
private Integer messageId;
5657
/**
5758
* Required if chat_id and message_id are not specified. Identifier of the inline message
5859
*/
5960
@JsonProperty(INLINE_MESSAGE_ID_FIELD)
6061
private String inlineMessageId;
61-
@JsonProperty(REPLYMARKUP_FIELD)
62-
private InlineKeyboardMarkup replyMarkup; ///< Optional. A JSON-serialized object for an inline keyboard.
62+
/**
63+
* Optional.
64+
* A JSON-serialized object for an inline keyboard.
65+
*/
66+
@JsonProperty(REPLY_MARKUP_FIELD)
67+
private InlineKeyboardMarkup replyMarkup;
68+
/**
69+
* Optional
70+
* Unique identifier of the business connection on behalf of which the message to be edited was sent
71+
*/
72+
@JsonProperty(BUSINESS_CONNECTION_ID_FIELD)
73+
private String businessConnectionId;
6374

6475
@Tolerate
6576
public void setChatId(Long chatId) {

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/payments/star/GetStarTransactions.java‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
package org.telegram.telegrambots.meta.api.methods.payments.star;
2+
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
5+
import lombok.EqualsAndHashCode;
6+
import lombok.Getter;
7+
import lombok.RequiredArgsConstructor;
8+
import lombok.Setter;
9+
import lombok.ToString;
10+
import lombok.experimental.SuperBuilder;
11+
import lombok.extern.jackson.Jacksonized;
12+
import org.telegram.telegrambots.meta.api.methods.botapimethods.BotApiMethod;
13+
import org.telegram.telegrambots.meta.api.objects.payments.star.StarTransactions;
14+
import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException;
15+
import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException;
16+
17+
/**
18+
* @author Ruben Bermudez
19+
* @version 7.5
20+
*
21+
* Returns the bot's Telegram Star transactions in chronological order.
22+
* On success, returns a StarTransactions object.
23+
*/
24+
@EqualsAndHashCode(callSuper = false)
25+
@Getter
26+
@Setter
27+
@ToString
28+
@RequiredArgsConstructor
29+
@SuperBuilder
30+
@Jacksonized
31+
@JsonIgnoreProperties(ignoreUnknown = true)
32+
public class GetStarTransactions extends BotApiMethod<StarTransactions> {
33+
public static final String PATH = "getStarTransactions";
34+
35+
private static final String OFFSET_FIELD = "offset";
36+
private static final String LIMIT_FIELD = "limit";
37+
38+
/**
39+
* Optional
40+
* Number of transactions to skip in the response
41+
*/
42+
@JsonProperty(OFFSET_FIELD)
43+
private Integer offset;
44+
/**
45+
* Optional
46+
* The maximum number of transactions to be retrieved.
47+
* Values between 1-100 are accepted.
48+
* Defaults to 100.
49+
*/
50+
@JsonProperty(LIMIT_FIELD)
51+
private Integer limit;
52+
53+
@Override
54+
public StarTransactions deserializeResponse(String answer) throws TelegramApiRequestException {
55+
return deserializeResponse(answer, StarTransactions.class);
56+
}
57+
58+
@Override
59+
public String getMethod() {
60+
return PATH;
61+
}
62+
63+
@Override
64+
public void validate() throws TelegramApiValidationException {
65+
if (limit != null && (limit > 100 || limit < 0)) {
66+
throw new TelegramApiValidationException("Limit parameters must be between 0 and 100", this);
67+
}
68+
}
69+
}

0 commit comments

Comments
 (0)