mirror of
https://github.com/eternnoir/pyTelegramBotAPI.git
synced 2023-08-10 21:12:57 +03:00
Merge branch 'master' of https://github.com/coder2020official/pyTelegramBotAPI
This commit is contained in:
commit
0bdf925fbe
@ -386,7 +386,7 @@ class TeleBot:
|
|||||||
new_poll_answers = None
|
new_poll_answers = None
|
||||||
new_my_chat_members = None
|
new_my_chat_members = None
|
||||||
new_chat_members = None
|
new_chat_members = None
|
||||||
chat_join_request = None
|
new_chat_join_request = None
|
||||||
|
|
||||||
for update in updates:
|
for update in updates:
|
||||||
if apihelper.ENABLE_MIDDLEWARE:
|
if apihelper.ENABLE_MIDDLEWARE:
|
||||||
@ -443,8 +443,8 @@ class TeleBot:
|
|||||||
if new_chat_members is None: new_chat_members = []
|
if new_chat_members is None: new_chat_members = []
|
||||||
new_chat_members.append(update.chat_member)
|
new_chat_members.append(update.chat_member)
|
||||||
if update.chat_join_request:
|
if update.chat_join_request:
|
||||||
if chat_join_request is None: chat_join_request = []
|
if new_chat_join_request is None: new_chat_join_request = []
|
||||||
chat_join_request.append(update.chat_join_request)
|
new_chat_join_request.append(update.chat_join_request)
|
||||||
|
|
||||||
if new_messages:
|
if new_messages:
|
||||||
self.process_new_messages(new_messages)
|
self.process_new_messages(new_messages)
|
||||||
@ -472,8 +472,8 @@ class TeleBot:
|
|||||||
self.process_new_my_chat_member(new_my_chat_members)
|
self.process_new_my_chat_member(new_my_chat_members)
|
||||||
if new_chat_members:
|
if new_chat_members:
|
||||||
self.process_new_chat_member(new_chat_members)
|
self.process_new_chat_member(new_chat_members)
|
||||||
if chat_join_request:
|
if new_chat_join_request:
|
||||||
self.process_new_chat_join_request(chat_join_request)
|
self.process_new_chat_join_request(new_chat_join_request)
|
||||||
|
|
||||||
def process_new_messages(self, new_messages):
|
def process_new_messages(self, new_messages):
|
||||||
self._notify_next_handlers(new_messages)
|
self._notify_next_handlers(new_messages)
|
||||||
|
@ -17,15 +17,14 @@ PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|||||||
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||||
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
|
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
|
||||||
OR OTHER DEALINGS IN THE SOFTWARE.
|
OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
|
||||||
|
This file was added during the pull request. The maintainers overlooked that it was copied
|
||||||
|
"as is" from another project and they do not consider it as a right way to develop a project.
|
||||||
|
However, due to backward compatibility we had to leave this file in the project with the above
|
||||||
|
copyright added, as it is required by the original project license.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
"""
|
|
||||||
This file was added during the pull request. The maintainers overlooked that
|
|
||||||
it was copied "as is" from another project and they do not consider it as a
|
|
||||||
right way to develop a project. However, due to backward compatibility we had
|
|
||||||
to leave this file in the project with the above copyright added,
|
|
||||||
as it is required by the original project license.
|
|
||||||
"""
|
|
||||||
import typing
|
import typing
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user