TeamPGM/pyrogram
2
0
Fork 0
mirror of https://github.com/TeamPGM/pyrogram.git synced 2024-11-17 21:22:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into asyncio

Browse Source 
# Conflicts:
#	pyrogram/client/methods/messages/forward_messages.py
#	pyrogram/client/methods/messages/send_contact.py
#	pyrogram/client/types/messages_and_media/message.py
This commit is contained in:
Dan 2019-03-21 14:02:35 +01:00
commit 03707fd312
10 changed files with 2107 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pyrogram/client/client.py
View File

@ -182,6 +182,8 @@ class Client(Methods, BaseClient):
Defaults to False (normal session).
"""
terms_of_service_displayed = False
def __init__(self,
session_name: str,
api_id: Union[int, str] = None,
@ -602,8 +604,9 @@ class Client(Methods, BaseClient):
phone_code_hash = r.phone_code_hash
terms_of_service = r.terms_of_service
if terms_of_service:
if terms_of_service and not Client.terms_of_service_displayed:
print("\n" + terms_of_service.text + "\n")
Client.terms_of_service_displayed = True
if self.force_sms:
await self.send(

43
pyrogram/client/methods/messages/forward_messages.py
View File

@ -29,7 +29,9 @@ class ForwardMessages(BaseClient):
chat_id: Union[int, str],
from_chat_id: Union[int, str],
message_ids: Iterable[int],
disable_notification: bool = None
disable_notification: bool = None,
as_copy: bool = False,
remove_caption: bool = False
) -> "pyrogram.Messages":
"""Use this method to forward messages of any kind.
@ -52,6 +54,15 @@ class ForwardMessages(BaseClient):
Sends the message silently.
Users will receive a notification with no sound.
as_copy (``bool``, *optional*):
Pass True to forward messages without the forward header (i.e.: send a copy of the message content).
Defaults to False.
remove_caption (``bool``, *optional*):
If set to True and *as_copy* is enabled as well, media captions are not preserved when copying the
message. Has no effect if *as_copy* is not enabled.
Defaults to False.
Returns:
On success and in case *message_ids* was an iterable, the returned value will be a list of the forwarded
:obj:`Messages <pyrogram.Message>` even if a list contains just one element, otherwise if
@ -61,9 +72,29 @@ class ForwardMessages(BaseClient):
Raises:
:class:`Error <pyrogram.Error>` in case of a Telegram RPC error.
"""
is_iterable = not isinstance(message_ids, int)
message_ids = list(message_ids) if is_iterable else [message_ids]
if as_copy:
sent_messages = []
for chunk in [message_ids[i:i + 200] for i in range(0, len(message_ids), 200)]:
messages = await self.get_messages(chat_id=from_chat_id, message_ids=chunk) # type: pyrogram.Messages
for message in messages.messages:
sent_messages.append(
await message.forward(
chat_id,
disable_notification=disable_notification,
as_copy=True,
remove_caption=remove_caption
)
)
return pyrogram.Messages(
client=self,
total_count=len(sent_messages),
messages=sent_messages
) if is_iterable else sent_messages[0]
else:
r = await self.send(
functions.messages.ForwardMessages(
to_peer=await self.resolve_peer(chat_id),
@ -74,14 +105,14 @@ class ForwardMessages(BaseClient):
)
)
messages = []
forwarded_messages = []
users = {i.id: i for i in r.users}
chats = {i.id: i for i in r.chats}
for i in r.updates:
if isinstance(i, (types.UpdateNewMessage, types.UpdateNewChannelMessage)):
messages.append(
forwarded_messages.append(
await pyrogram.Message._parse(
self, i.message,
users, chats
@ -90,6 +121,6 @@ class ForwardMessages(BaseClient):
return pyrogram.Messages(
client=self,
total_count=len(messages),
messages=messages
) if is_iterable else messages[0]
total_count=len(forwarded_messages),
messages=forwarded_messages
) if is_iterable else forwarded_messages[0]

8
pyrogram/client/methods/messages/send_contact.py
View File

@ -29,8 +29,8 @@ class SendContact(BaseClient):
chat_id: Union[int, str],
phone_number: str,
first_name: str,
last_name: str = "",
vcard: str = "", disable_notification: bool = None,
last_name: str = None,
vcard: str = None, disable_notification: bool = None,
reply_to_message_id: int = None,
reply_markup: Union[
"pyrogram.InlineKeyboardMarkup",
@ -82,8 +82,8 @@ class SendContact(BaseClient):
media=types.InputMediaContact(
phone_number=phone_number,
first_name=first_name,
last_name=last_name,
vcard=vcard
last_name=last_name or "",
vcard=vcard or ""
),
message="",
silent=disable_notification or None,

2
pyrogram/client/methods/messages/send_document.py
View File

@ -59,7 +59,7 @@ class SendDocument(BaseClient):
pass an HTTP URL as a string for Telegram to get a file from the Internet, or
pass a file path as string to upload a new file that exists on your local machine.
thumb (``str``):
thumb (``str``, *optional*):
Thumbnail of the file sent.
The thumbnail should be in JPEG format and less than 200 KB in size.
A thumbnail's width and height should not exceed 90 pixels.

4
pyrogram/client/methods/messages/send_poll.py
View File

@ -24,8 +24,8 @@ from pyrogram.client.ext import BaseClient
class SendPoll(BaseClient):
def send_poll \
(self,
def send_poll(
self,
chat_id: Union[int, str],
question: str,
options: List[str],

2
pyrogram/client/style/html.py
View File

@ -40,7 +40,7 @@ class HTML:
def parse(self, message: str):
entities = []
message = utils.add_surrogates(str(message))
message = utils.add_surrogates(str(message or ""))
offset = 0
for match in self.HTML_RE.finditer(message):

2
pyrogram/client/style/markdown.py
View File

@ -56,7 +56,7 @@ class Markdown:
self.peers_by_id = peers_by_id
def parse(self, message: str):
message = utils.add_surrogates(str(message)).strip()
message = utils.add_surrogates(str(message or "")).strip()
entities = []
offset = 0

1988
pyrogram/client/types/messages_and_media/message.py
View File

File diff suppressed because it is too large Load Diff

54
pyrogram/client/types/messages_and_media/messages.py
View File

@ -16,7 +16,7 @@
# You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
from typing import List
from typing import List, Union
import pyrogram
from pyrogram.api import types
@ -120,3 +120,55 @@ class Messages(PyrogramType, Update):
messages=parsed_messages,
client=client
)
def forward(
self,
chat_id: Union[int, str],
disable_notification: bool = None,
as_copy: bool = False,
remove_caption: bool = False
):
"""Bound method *forward* of :obj:`Message <pyrogram.Messages>`.
Args:
chat_id (``int`` | ``str``):
Unique identifier (int) or username (str) of the target chat.
For your personal cloud (Saved Messages) you can simply use "me" or "self".
For a contact that exists in your Telegram address book you can use his phone number (str).
disable_notification (``bool``, *optional*):
Sends messages silently.
Users will receive a notification with no sound.
as_copy (``bool``, *optional*):
Pass True to forward messages without the forward header (i.e.: send a copy of the message content).
Defaults to False.
remove_caption (``bool``, *optional*):
If set to True and *as_copy* is enabled as well, media captions are not preserved when copying the
message. Has no effect if *as_copy* is not enabled.
Defaults to False.
Returns:
On success, a :class:`Messages <pyrogram.Messages>` containing forwarded messages is returned.
Raises:
:class:`Error <pyrogram.Error>`
"""
forwarded_messages = []
for message in self.messages:
forwarded_messages.append(
message.forward(
chat_id=chat_id,
as_copy=as_copy,
disable_notification=disable_notification,
remove_caption=remove_caption
)
)
return Messages(
total_count=len(forwarded_messages),
messages=forwarded_messages,
client=self._client
)

4
pyrogram/client/types/pyrogram_type.py
View File

@ -19,11 +19,13 @@
from collections import OrderedDict
from json import dumps
import pyrogram
class PyrogramType:
__slots__ = ["_client"]
def __init__(self, client):
def __init__(self, client: "pyrogram.client.ext.BaseClient"):
self._client = client
def __str__(self):