mirror of
https://github.com/TeamPGM/pyrogram.git
synced 2024-11-28 00:56:19 +00:00
Add new Restriction object and make User and Chat objects use it
This commit is contained in:
parent
8db3d90c52
commit
5ce62bd79c
@ -309,6 +309,7 @@ def pyrogram_api():
|
|||||||
ChatMember
|
ChatMember
|
||||||
ChatPermissions
|
ChatPermissions
|
||||||
Dialog
|
Dialog
|
||||||
|
Restriction
|
||||||
""",
|
""",
|
||||||
messages_media="""
|
messages_media="""
|
||||||
Messages & Media
|
Messages & Media
|
||||||
|
@ -16,12 +16,13 @@
|
|||||||
# You should have received a copy of the GNU Lesser General Public License
|
# You should have received a copy of the GNU Lesser General Public License
|
||||||
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
|
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from typing import Union
|
from typing import Union, List
|
||||||
|
|
||||||
import pyrogram
|
import pyrogram
|
||||||
from pyrogram.api import types
|
from pyrogram.api import types
|
||||||
from .chat_permissions import ChatPermissions
|
from .chat_permissions import ChatPermissions
|
||||||
from .chat_photo import ChatPhoto
|
from .chat_photo import ChatPhoto
|
||||||
|
from .restriction import Restriction
|
||||||
from ..object import Object
|
from ..object import Object
|
||||||
from ...ext import utils
|
from ...ext import utils
|
||||||
|
|
||||||
@ -87,8 +88,8 @@ class Chat(Object):
|
|||||||
members_count (``int``, *optional*):
|
members_count (``int``, *optional*):
|
||||||
Chat members count, for groups, supergroups and channels only.
|
Chat members count, for groups, supergroups and channels only.
|
||||||
|
|
||||||
restriction_reason (``str``, *optional*):
|
restrictions (List of :obj:`Restriction`, *optional*):
|
||||||
The reason why this chat might be unavailable to some users.
|
The list of reasons why this chat might be unavailable to some users.
|
||||||
This field is available only in case *is_restricted* is True.
|
This field is available only in case *is_restricted* is True.
|
||||||
|
|
||||||
permissions (:obj:`ChatPermissions` *optional*):
|
permissions (:obj:`ChatPermissions` *optional*):
|
||||||
@ -120,7 +121,7 @@ class Chat(Object):
|
|||||||
sticker_set_name: str = None,
|
sticker_set_name: str = None,
|
||||||
can_set_sticker_set: bool = None,
|
can_set_sticker_set: bool = None,
|
||||||
members_count: int = None,
|
members_count: int = None,
|
||||||
restriction_reason: str = None,
|
restrictions: List[Restriction] = None,
|
||||||
permissions: "pyrogram.ChatPermissions" = None,
|
permissions: "pyrogram.ChatPermissions" = None,
|
||||||
distance: int = None
|
distance: int = None
|
||||||
):
|
):
|
||||||
@ -143,7 +144,7 @@ class Chat(Object):
|
|||||||
self.sticker_set_name = sticker_set_name
|
self.sticker_set_name = sticker_set_name
|
||||||
self.can_set_sticker_set = can_set_sticker_set
|
self.can_set_sticker_set = can_set_sticker_set
|
||||||
self.members_count = members_count
|
self.members_count = members_count
|
||||||
self.restriction_reason = restriction_reason
|
self.restrictions = restrictions
|
||||||
self.permissions = permissions
|
self.permissions = permissions
|
||||||
self.distance = distance
|
self.distance = distance
|
||||||
|
|
||||||
@ -162,7 +163,7 @@ class Chat(Object):
|
|||||||
first_name=user.first_name,
|
first_name=user.first_name,
|
||||||
last_name=user.last_name,
|
last_name=user.last_name,
|
||||||
photo=ChatPhoto._parse(client, user.photo, peer_id),
|
photo=ChatPhoto._parse(client, user.photo, peer_id),
|
||||||
restriction_reason=user.restriction_reason,
|
restrictions=pyrogram.List([Restriction._parse(r) for r in user.restriction_reason]) or None,
|
||||||
client=client
|
client=client
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -183,6 +184,7 @@ class Chat(Object):
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def _parse_channel_chat(client, channel: types.Channel) -> "Chat":
|
def _parse_channel_chat(client, channel: types.Channel) -> "Chat":
|
||||||
peer_id = utils.get_channel_id(channel.id)
|
peer_id = utils.get_channel_id(channel.id)
|
||||||
|
restriction_reason = getattr(channel, "restriction_reason", [])
|
||||||
|
|
||||||
return Chat(
|
return Chat(
|
||||||
id=peer_id,
|
id=peer_id,
|
||||||
@ -193,7 +195,7 @@ class Chat(Object):
|
|||||||
title=channel.title,
|
title=channel.title,
|
||||||
username=getattr(channel, "username", None),
|
username=getattr(channel, "username", None),
|
||||||
photo=ChatPhoto._parse(client, getattr(channel, "photo", None), peer_id),
|
photo=ChatPhoto._parse(client, getattr(channel, "photo", None), peer_id),
|
||||||
restriction_reason=getattr(channel, "restriction_reason", None),
|
restrictions=pyrogram.List([Restriction._parse(r) for r in restriction_reason]) or None,
|
||||||
permissions=ChatPermissions._parse(getattr(channel, "default_banned_rights", None)),
|
permissions=ChatPermissions._parse(getattr(channel, "default_banned_rights", None)),
|
||||||
members_count=getattr(channel, "participants_count", None),
|
members_count=getattr(channel, "participants_count", None),
|
||||||
client=client
|
client=client
|
||||||
|
50
pyrogram/client/types/user_and_chats/restriction.py
Normal file
50
pyrogram/client/types/user_and_chats/restriction.py
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
# Pyrogram - Telegram MTProto API Client Library for Python
|
||||||
|
# Copyright (C) 2017-2019 Dan Tès <https://github.com/delivrance>
|
||||||
|
#
|
||||||
|
# This file is part of Pyrogram.
|
||||||
|
#
|
||||||
|
# Pyrogram is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Lesser General Public License as published
|
||||||
|
# by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# Pyrogram is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Lesser General Public License for more details.
|
||||||
|
#
|
||||||
|
# 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 pyrogram.api import types
|
||||||
|
from ..object import Object
|
||||||
|
|
||||||
|
|
||||||
|
class Restriction(Object):
|
||||||
|
"""A restriction applied to bots or chats.
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
platform (``str``):
|
||||||
|
The platform the restriction is applied to, e.g. "ios", "android"
|
||||||
|
|
||||||
|
reason (``str``):
|
||||||
|
The restriction reason, e.g. "porn", "copyright".
|
||||||
|
|
||||||
|
text (``str``):
|
||||||
|
The restriction text.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, *, platform: str, reason: str, text: str):
|
||||||
|
super().__init__(None)
|
||||||
|
|
||||||
|
self.platform = platform
|
||||||
|
self.reason = reason
|
||||||
|
self.text = text
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _parse(restriction: types.RestrictionReason) -> "Restriction":
|
||||||
|
return Restriction(
|
||||||
|
platform=restriction.platform,
|
||||||
|
reason=restriction.reason,
|
||||||
|
text=restriction.text
|
||||||
|
)
|
@ -17,10 +17,12 @@
|
|||||||
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
|
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
import html
|
import html
|
||||||
|
from typing import List
|
||||||
|
|
||||||
import pyrogram
|
import pyrogram
|
||||||
from pyrogram.api import types
|
from pyrogram.api import types
|
||||||
from .chat_photo import ChatPhoto
|
from .chat_photo import ChatPhoto
|
||||||
|
from .restriction import Restriction
|
||||||
from ..object import Object
|
from ..object import Object
|
||||||
from ..update import Update
|
from ..update import Update
|
||||||
|
|
||||||
@ -101,8 +103,8 @@ class User(Object, Update):
|
|||||||
photo (:obj:`ChatPhoto <pyrogram.ChatPhoto>`, *optional*):
|
photo (:obj:`ChatPhoto <pyrogram.ChatPhoto>`, *optional*):
|
||||||
User's or bot's current profile photo. Suitable for downloads only.
|
User's or bot's current profile photo. Suitable for downloads only.
|
||||||
|
|
||||||
restriction_reason (``str``, *optional*):
|
restrictions (List of :obj:`Restriction`, *optional*):
|
||||||
The reason why this bot might be unavailable to some users.
|
The list of reasons why this bot might be unavailable to some users.
|
||||||
This field is available only in case *is_restricted* is True.
|
This field is available only in case *is_restricted* is True.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@ -130,7 +132,7 @@ class User(Object, Update):
|
|||||||
dc_id: int = None,
|
dc_id: int = None,
|
||||||
phone_number: str = None,
|
phone_number: str = None,
|
||||||
photo: ChatPhoto = None,
|
photo: ChatPhoto = None,
|
||||||
restriction_reason: str = None
|
restrictions: List[Restriction] = None
|
||||||
):
|
):
|
||||||
super().__init__(client)
|
super().__init__(client)
|
||||||
|
|
||||||
@ -154,7 +156,7 @@ class User(Object, Update):
|
|||||||
self.dc_id = dc_id
|
self.dc_id = dc_id
|
||||||
self.phone_number = phone_number
|
self.phone_number = phone_number
|
||||||
self.photo = photo
|
self.photo = photo
|
||||||
self.restriction_reason = restriction_reason
|
self.restrictions = restrictions
|
||||||
|
|
||||||
def __format__(self, format_spec):
|
def __format__(self, format_spec):
|
||||||
if format_spec == "mention":
|
if format_spec == "mention":
|
||||||
@ -186,7 +188,7 @@ class User(Object, Update):
|
|||||||
dc_id=getattr(user.photo, "dc_id", None),
|
dc_id=getattr(user.photo, "dc_id", None),
|
||||||
phone_number=user.phone,
|
phone_number=user.phone,
|
||||||
photo=ChatPhoto._parse(client, user.photo, user.id),
|
photo=ChatPhoto._parse(client, user.photo, user.id),
|
||||||
restriction_reason=user.restriction_reason,
|
restrictions=pyrogram.List([Restriction._parse(r) for r in user.restriction_reason]) or None,
|
||||||
client=client
|
client=client
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user