Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve develop conflicts #307

Merged
merged 32 commits into from
Feb 15, 2020
Merged

Resolve develop conflicts #307

merged 32 commits into from
Feb 15, 2020

Conversation

zhuharev
Copy link
Contributor

@zhuharev zhuharev commented Feb 15, 2020

fix conflicts for #202

733amir and others added 30 commits June 30, 2018 11:01
Addressing too many open files error
Add cached result types.
Since BotAPI 3.3:
getChat now also returns pinned messages in supergroups, if present. Added the new field pinned_message to the Chat object.

Signed-off-by: Maxim Zhukov <mussitantesmortem@gmail.com>
caption_entities are using for messages with a caption, special entities like usernames, URLs, bot commands, etc. that appear in the caption.
Add support for caption_entities in Message type.
Add type helpers to message entities.
…-gif-result

Mark optional fields in InlineQueryResultGif as omitempty
added PinnedMessage in Chat struct
Added IsAnimated to Sticker struct
Add `is_animated` field to Sticker struct
@zhuharev zhuharev requested a review from Syfaro February 15, 2020 13:15
@zhuharev zhuharev merged commit b16df76 into develop Feb 15, 2020
@Syfaro Syfaro deleted the resolve-develop-conflicts branch November 5, 2020 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants