Skip to content

Commit 13ebc2c

Browse files
pengradpengrad
authored
Merge pull request #431 from mircoianese/master
BOT API v9.4
2 parents 7b5e0b4 + 7fb1b76 commit 13ebc2c

20 files changed

Lines changed: 202 additions & 11 deletions

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ Java library for interacting with [Telegram Bot API](https://core.telegram.org/b
1313

1414
Gradle:
1515
```groovy
16-
implementation 'com.github.pengrad:java-telegram-bot-api:9.3.0'
16+
implementation 'com.github.pengrad:java-telegram-bot-api:9.4.0'
1717
```
1818
Maven:
1919
```xml
2020
<dependency>
2121
<groupId>com.github.pengrad</groupId>
2222
<artifactId>java-telegram-bot-api</artifactId>
23-
<version>9.3.0</version>
23+
<version>9.4.0</version>
2424
</dependency>
2525
```
2626
[JAR with all dependencies on release page](https://github.com/pengrad/java-telegram-bot-api/releases)

‎README_RU.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ Java библиотека, созданная для работы с [Telegram B
1313

1414
Gradle:
1515
```groovy
16-
implementation 'com.github.pengrad:java-telegram-bot-api:9.3.0'
16+
implementation 'com.github.pengrad:java-telegram-bot-api:9.4.0'
1717
```
1818
Maven:
1919
```xml
2020
<dependency>
2121
<groupId>com.github.pengrad</groupId>
2222
<artifactId>java-telegram-bot-api</artifactId>
23-
<version>9.3.0</version>
23+
<version>9.4.0</version>
2424
</dependency>
2525
```
2626
Также JAR со всеми зависимостями можно найти [в релизах](https://github.com/pengrad/java-telegram-bot-api/releases).

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
GROUP=com.github.pengrad
2-
VERSION_NAME=9.3.0
2+
VERSION_NAME=9.4.0
33

44
POM_DESCRIPTION=Java API for Telegram Bot API
55
POM_URL=https://github.com/pengrad/java-telegram-bot-api/

‎library/src/main/java/com/pengrad/telegrambot/model/ChatFullInfo.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public enum Type {
7878
private UserRating rating;
7979
private Integer paid_message_star_count;
8080
private UniqueGiftColors unique_gift_colors;
81+
private Audio first_profile_audio;
8182

8283
public Long id() {
8384
return id;
@@ -278,6 +279,10 @@ public UniqueGiftColors uniqueGiftColors() {
278279
return unique_gift_colors;
279280
}
280281

282+
public Audio firstProfileAudio() {
283+
return first_profile_audio;
284+
}
285+
281286
@Override
282287
public boolean equals(Object o) {
283288
if (this == o) return true;
@@ -332,7 +337,8 @@ public boolean equals(Object o) {
332337
Objects.equals(accepted_gift_types, chat.accepted_gift_types) &&
333338
Objects.equals(rating, chat.rating) &&
334339
Objects.equals(paid_message_star_count, chat.paid_message_star_count) &&
335-
Objects.equals(unique_gift_colors, chat.unique_gift_colors);
340+
Objects.equals(unique_gift_colors, chat.unique_gift_colors) &&
341+
Objects.equals(first_profile_audio, chat.first_profile_audio);
336342
}
337343

338344
@Override
@@ -393,6 +399,7 @@ public String toString() {
393399
", rating=" + rating +
394400
", paid_message_star_count=" + paid_message_star_count +
395401
", unique_gift_colors=" + unique_gift_colors +
402+
", first_profile_audio=" + first_profile_audio +
396403
'}';
397404
}
398405
}

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import com.pengrad.telegrambot.model.chatbackground.ChatBackground;
44
import com.pengrad.telegrambot.model.chatboost.ChatBoostAdded;
5+
import com.pengrad.telegrambot.model.chatowner.ChatOwnerChanged;
6+
import com.pengrad.telegrambot.model.chatowner.ChatOwnerLeft;
57
import com.pengrad.telegrambot.model.checklist.Checklist;
68
import com.pengrad.telegrambot.model.checklist.ChecklistTasksAdded;
79
import com.pengrad.telegrambot.model.checklist.ChecklistTasksDone;
@@ -131,6 +133,8 @@ public class Message extends MaybeInaccessibleMessage implements Serializable {
131133
private SuggestedPostRefunded suggested_post_refunded;
132134
private DirectMessagePriceChanged direct_message_price_changed;
133135
private Integer paid_star_count;
136+
private ChatOwnerLeft chat_owner_left;
137+
private ChatOwnerChanged chat_owner_changed;
134138

135139
public Long messageThreadId() {
136140
return message_thread_id;
@@ -533,6 +537,14 @@ public Integer paidStarCount() {
533537
return paid_star_count;
534538
}
535539

540+
public ChatOwnerLeft chatOwnerLeft() {
541+
return chat_owner_left;
542+
}
543+
544+
public ChatOwnerChanged chatOwnerChanged() {
545+
return chat_owner_changed;
546+
}
547+
536548
/**
537549
* Only for backwards-compatibility with MaybeInaccessibleMessage
538550
*/
@@ -661,7 +673,9 @@ public boolean equals(Object o) {
661673
Objects.equals(suggested_post_paid, message.suggested_post_paid) &&
662674
Objects.equals(suggested_post_refunded, message.suggested_post_refunded) &&
663675
Objects.equals(direct_message_price_changed, message.direct_message_price_changed) &&
664-
Objects.equals(paid_star_count, message.paid_star_count);
676+
Objects.equals(paid_star_count, message.paid_star_count) &&
677+
Objects.equals(chat_owner_left, message.chat_owner_left) &&
678+
Objects.equals(chat_owner_changed, message.chat_owner_changed);
665679
}
666680

667681
@Override
@@ -775,6 +789,8 @@ public String toString() {
775789
", suggested_post_refunded=" + suggested_post_refunded +
776790
", direct_message_price_changed=" + direct_message_price_changed +
777791
", paid_star_count=" + paid_star_count +
792+
", chat_owner_left=" + chat_owner_left +
793+
", chat_owner_changed=" + chat_owner_changed +
778794
'}';
779795
}
780796
}

‎library/src/main/java/com/pengrad/telegrambot/model/User.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public class User implements Serializable {
2424
private Boolean can_connect_to_business;
2525
private Boolean has_main_web_app;
2626
private Boolean has_topics_enabled;
27+
private Boolean allows_users_to_create_topics;
2728

2829
private User() {
2930
}
@@ -88,12 +89,22 @@ public Boolean hasTopicsEnabled() {
8889
return has_topics_enabled;
8990
}
9091

92+
public Boolean allowsUsersToCreateTopics() {
93+
return allows_users_to_create_topics;
94+
}
95+
9196
@Override
9297
public boolean equals(Object o) {
9398
if (this == o) return true;
9499
if (o == null || getClass() != o.getClass()) return false;
95100
User user = (User) o;
96-
return Objects.equals(id, user.id) && Objects.equals(is_bot, user.is_bot) && Objects.equals(first_name, user.first_name) && Objects.equals(last_name, user.last_name) && Objects.equals(username, user.username) && Objects.equals(language_code, user.language_code) && Objects.equals(is_premium, user.is_premium) && Objects.equals(added_to_attachment_menu, user.added_to_attachment_menu) && Objects.equals(can_join_groups, user.can_join_groups) && Objects.equals(can_read_all_group_messages, user.can_read_all_group_messages) && Objects.equals(supports_inline_queries, user.supports_inline_queries) && Objects.equals(can_connect_to_business, user.can_connect_to_business) && Objects.equals(has_main_web_app, user.has_main_web_app) && Objects.equals(has_topics_enabled, user.has_topics_enabled);
101+
return Objects.equals(id, user.id) && Objects.equals(is_bot, user.is_bot) && Objects.equals(first_name, user.first_name)
102+
&& Objects.equals(last_name, user.last_name) && Objects.equals(username, user.username) && Objects.equals(language_code, user.language_code)
103+
&& Objects.equals(is_premium, user.is_premium) && Objects.equals(added_to_attachment_menu, user.added_to_attachment_menu)
104+
&& Objects.equals(can_join_groups, user.can_join_groups) && Objects.equals(can_read_all_group_messages, user.can_read_all_group_messages)
105+
&& Objects.equals(supports_inline_queries, user.supports_inline_queries) && Objects.equals(can_connect_to_business, user.can_connect_to_business)
106+
&& Objects.equals(has_main_web_app, user.has_main_web_app) && Objects.equals(has_topics_enabled, user.has_topics_enabled)
107+
&& Objects.equals(allows_users_to_create_topics, user.allows_users_to_create_topics);
97108
}
98109

99110
@Override
@@ -118,6 +129,7 @@ public String toString() {
118129
", can_connect_to_business=" + can_connect_to_business +
119130
", has_main_web_app=" + has_main_web_app +
120131
", has_topics_enabled=" + has_topics_enabled +
132+
", allows_users_to_create_topics=" + allows_users_to_create_topics +
121133
'}';
122134
}
123135
}

‎library/src/main/java/com/pengrad/telegrambot/model/UserProfileAudios.kt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.pengrad.telegrambot.model
2+
3+
data class UserProfileAudios(
4+
@get:JvmName("totalCount") val totalCount: Int,
5+
@get:JvmName("audios") val audios: Array<Audio>
6+
) {
7+
8+
override fun equals(other: Any?): Boolean {
9+
if (this === other) return true
10+
if (other !is UserProfileAudios) return false
11+
12+
return totalCount == other.totalCount &&
13+
audios contentEquals other.audios
14+
}
15+
16+
override fun hashCode(): Int {
17+
var result = totalCount.hashCode()
18+
result = 31 * result + audios.contentHashCode()
19+
return result
20+
}
21+
22+
}

‎library/src/main/java/com/pengrad/telegrambot/model/Video.kt‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ data class Video(
1717

1818
@get:JvmName("fileName") val fileName: String? = null,
1919
@get:JvmName("mimeType") val mimeType: String? = null,
20-
@get:JvmName("fileSize") val fileSize: Long? = null
20+
@get:JvmName("fileSize") val fileSize: Long? = null,
21+
22+
@get:JvmName("qualities") val qualities: Array<VideoQuality>? = null
2123
) {
2224

2325
/**
@@ -35,4 +37,38 @@ data class Video(
3537
*/
3638
fun duration() = duration as JavaInteger
3739

40+
override fun equals(other: Any?): Boolean {
41+
if (this === other) return true
42+
if (other !is Video) return false
43+
44+
return fileId == other.fileId &&
45+
fileUniqueId == other.fileUniqueId &&
46+
width == other.width &&
47+
height == other.height &&
48+
duration == other.duration &&
49+
thumbnail == other.thumbnail &&
50+
cover == other.cover &&
51+
startTimestamp == other.startTimestamp &&
52+
fileName == other.fileName &&
53+
mimeType == other.mimeType &&
54+
fileSize == other.fileSize &&
55+
qualities contentEquals other.qualities
56+
}
57+
58+
override fun hashCode(): Int {
59+
var result = fileId.hashCode()
60+
result = 31 * result + fileUniqueId.hashCode()
61+
result = 31 * result + width.hashCode()
62+
result = 31 * result + height.hashCode()
63+
result = 31 * result + duration.hashCode()
64+
result = 31 * result + (thumbnail?.hashCode() ?: 0)
65+
result = 31 * result + (cover?.hashCode() ?: 0)
66+
result = 31 * result + (startTimestamp?.hashCode() ?: 0)
67+
result = 31 * result + (fileName?.hashCode() ?: 0)
68+
result = 31 * result + (mimeType?.hashCode() ?: 0)
69+
result = 31 * result + (fileSize?.hashCode() ?: 0)
70+
result = 31 * result + (qualities?.contentHashCode() ?: 0)
71+
return result
72+
}
73+
3874
}

‎library/src/main/java/com/pengrad/telegrambot/model/VideoQuality.kt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.pengrad.telegrambot.model
2+
3+
data class VideoQuality(
4+
@get:JvmName("fileId") val fileId: String,
5+
@get:JvmName("fileUniqueId") val fileUniqueId: String,
6+
@get:JvmName("width") val width: Int,
7+
@get:JvmName("height") val height: Int,
8+
@get:JvmName("codec") val codec: String,
9+
@get:JvmName("fileSize") val fileSize: Long? = null
10+
)

‎library/src/main/java/com/pengrad/telegrambot/model/chatowner/ChatOwnerChanged.kt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package com.pengrad.telegrambot.model.chatowner
2+
3+
import com.pengrad.telegrambot.model.User
4+
5+
data class ChatOwnerChanged(
6+
@get:JvmName("newOwner") val newOwner: User
7+
) {
8+
}

0 commit comments

Comments
 (0)