Skip to content

Commit a8dfe61

Browse files
committed
Merge develop -> asyncio
2 parents fd3c8cf + f16ca8b commit a8dfe61

File tree

93 files changed

+2161
-1083
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+2161
-1083
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ about: Create a bug report affecting the library
44
labels: "bug"
55
---
66

7-
<!-- WARNING: Ignoring this template will lead to the issue being closed as incomplete -->
7+
<!-- WARNING: Ignoring this template could lead to the issue being closed as incomplete -->
88

99
## Checklist
1010
- [ ] I am sure the error is coming from Pyrogram's code and not elsewhere.
@@ -15,7 +15,7 @@ labels: "bug"
1515
A clear and concise description of the problem.
1616

1717
## Steps to Reproduce
18-
[A minimal, complete and verifiable example](https://stackoverflow.com/help/mcve).
18+
[A minimal, reproducible example](https://stackoverflow.com/help/minimal-reproducible-example).
1919

2020
## Traceback
2121
The full traceback (if applicable).

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ about: Suggest ideas, new features or enhancements
44
labels: "enhancement"
55
---
66

7-
<!-- WARNING: Ignoring this template will lead to the issue being closed as incomplete -->
7+
<!-- WARNING: Ignoring this template could lead to the issue being closed as incomplete -->
88

99
## Checklist
1010
- [ ] I believe the idea is awesome and would benefit the library.

.github/ISSUE_TEMPLATE/question.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ title: For Q&A purposes, please read this template body
55
labels: "question"
66
---
77

8-
<!-- WARNING: Ignoring this template will lead to the issue being closed as incomplete -->
8+
<!-- WARNING: Ignoring this template could lead to the issue being closed as incomplete -->
99

1010
# Important
1111
This place is for issues about Pyrogram, it's **not a forum**.
1212

13-
If you'd like to post a question, please move to https://stackoverflow.com or join the Telegram community by following the description in https://t.me/pyrogram.
13+
If you'd like to post a question, please move to https://stackoverflow.com or join the Telegram community at https://t.me/pyrogram. Useful information on how to ask good questions can be found here: https://stackoverflow.com/help/how-to-ask.
1414

15-
Thanks.
15+
Thanks.

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Include
22
include README.md COPYING COPYING.lesser NOTICE requirements.txt
33
recursive-include compiler *.py *.tl *.tsv *.txt
4-
recursive-include pyrogram mime.types
4+
recursive-include pyrogram mime.types schema.sql
55

66
## Exclude
77
prune pyrogram/api/errors/exceptions

compiler/error/source/400_BAD_REQUEST.tsv

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,10 @@ RESULT_ID_DUPLICATE The result contains items with duplicated identifiers
9999
ACCESS_TOKEN_INVALID The bot access token is invalid
100100
INVITE_HASH_EXPIRED The chat invite link is no longer valid
101101
USER_BANNED_IN_CHANNEL You are limited, check @SpamBot for details
102-
MESSAGE_EDIT_TIME_EXPIRED You can no longer edit this message
102+
MESSAGE_EDIT_TIME_EXPIRED You can no longer edit this message
103+
FOLDER_ID_INVALID The folder id is invalid
104+
MEGAGROUP_PREHISTORY_HIDDEN The action failed because the supergroup has the pre-history hidden
105+
CHAT_LINK_EXISTS The action failed because the supergroup is linked to a channel
106+
LINK_NOT_MODIFIED The chat link was not modified because you tried to link to the same target
107+
BROADCAST_ID_INVALID The channel is invalid
108+
MEGAGROUP_ID_INVALID The supergroup is invalid

compiler/error/source/500_INTERNAL_SERVER_ERROR.tsv

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ HISTORY_GET_FAILED Telegram is having internal problems. Please try again later
77
REG_ID_GENERATE_FAILED Telegram is having internal problems. Please try again later
88
RANDOM_ID_DUPLICATE Telegram is having internal problems. Please try again later
99
WORKER_BUSY_TOO_LONG_RETRY Telegram is having internal problems. Please try again later
10-
INTERDC_X_CALL_ERROR Telegram is having internal problems. Please try again later
11-
INTERDC_X_CALL_RICH_ERROR Telegram is having internal problems. Please try again later
10+
INTERDC_X_CALL_ERROR Telegram is having internal problems at DC{x}. Please try again later
11+
INTERDC_X_CALL_RICH_ERROR Telegram is having internal problems at DC{x}. Please try again later
12+
FOLDER_DEAC_AUTOFIX_ALL Telegram is having internal problems. Please try again later

docs/releases.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
When upgrading to a new version of Pyrogram, you will need to check all the breaking changes in order to find
3636
incompatible code in your application, but also to take advantage of new features and improvements.
3737
38-
Releases
39-
--------
38+
**Contents**
4039
4140
""".lstrip("\n")
4241

docs/robots.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
User-agent: *
2+
23
Allow: /
4+
5+
Disallow: /dev/*
6+
Disallow: /old/*
7+
38
Sitemap: https://docs.pyrogram.org/sitemap.xml

docs/source/api/bound-methods.rst

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ Message
3434
- :meth:`~Message.click`
3535
- :meth:`~Message.delete`
3636
- :meth:`~Message.download`
37-
- :meth:`~Message.edit`
37+
- :meth:`~Message.forward`
38+
- :meth:`~Message.pin`
39+
- :meth:`~Message.edit_text`
3840
- :meth:`~Message.edit_caption`
3941
- :meth:`~Message.edit_media`
4042
- :meth:`~Message.edit_reply_markup`
41-
- :meth:`~Message.forward`
42-
- :meth:`~Message.pin`
43-
- :meth:`~Message.reply`
43+
- :meth:`~Message.reply_text`
4444
- :meth:`~Message.reply_animation`
4545
- :meth:`~Message.reply_audio`
4646
- :meth:`~Message.reply_cached_media`
@@ -59,13 +59,35 @@ Message
5959
- :meth:`~Message.reply_video_note`
6060
- :meth:`~Message.reply_voice`
6161

62+
Chat
63+
^^^^
64+
65+
.. hlist::
66+
:columns: 2
67+
68+
- :meth:`~Chat.archive`
69+
- :meth:`~Chat.unarchive`
70+
71+
User
72+
^^^^
73+
74+
.. hlist::
75+
:columns: 2
76+
77+
- :meth:`~User.archive`
78+
- :meth:`~User.unarchive`
79+
6280
CallbackQuery
6381
^^^^^^^^^^^^^
6482

6583
.. hlist::
66-
:columns: 2
84+
:columns: 4
6785

6886
- :meth:`~CallbackQuery.answer`
87+
- :meth:`~CallbackQuery.edit_text`
88+
- :meth:`~CallbackQuery.edit_caption`
89+
- :meth:`~CallbackQuery.edit_media`
90+
- :meth:`~CallbackQuery.edit_reply_markup`
6991

7092
InlineQuery
7193
^^^^^^^^^^^
@@ -84,13 +106,13 @@ Details
84106
.. automethod:: Message.click()
85107
.. automethod:: Message.delete()
86108
.. automethod:: Message.download()
87-
.. automethod:: Message.edit()
109+
.. automethod:: Message.forward()
110+
.. automethod:: Message.pin()
111+
.. automethod:: Message.edit_text()
88112
.. automethod:: Message.edit_caption()
89113
.. automethod:: Message.edit_media()
90114
.. automethod:: Message.edit_reply_markup()
91-
.. automethod:: Message.forward()
92-
.. automethod:: Message.pin()
93-
.. automethod:: Message.reply()
115+
.. automethod:: Message.reply_text()
94116
.. automethod:: Message.reply_animation()
95117
.. automethod:: Message.reply_audio()
96118
.. automethod:: Message.reply_cached_media()
@@ -109,8 +131,20 @@ Details
109131
.. automethod:: Message.reply_video_note()
110132
.. automethod:: Message.reply_voice()
111133

134+
.. Chat
135+
.. automethod:: Chat.archive()
136+
.. automethod:: Chat.unarchive()
137+
138+
.. User
139+
.. automethod:: User.archive()
140+
.. automethod:: User.unarchive()
141+
112142
.. CallbackQuery
113143
.. automethod:: CallbackQuery.answer()
144+
.. automethod:: CallbackQuery.edit_text()
145+
.. automethod:: CallbackQuery.edit_caption()
146+
.. automethod:: CallbackQuery.edit_media()
147+
.. automethod:: CallbackQuery.edit_reply_markup()
114148

115149
.. InlineQuery
116150
.. automethod:: InlineQuery.answer()

docs/source/api/client.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,7 @@ This is the Client class. It exposes high-level methods for an easy access to th
1313
with app:
1414
app.send_message("me", "Hi!")
1515
16+
Details
17+
-------
18+
1619
.. autoclass:: pyrogram.Client()

0 commit comments

Comments
 (0)