mir/pyrogram
2
0
Fork 0
mirror of https://github.com/pyrogram/pyrogram synced 2025-08-28 12:57:52 +00:00
Code Issues Releases Wiki Activity

Allow passing raw

Browse Source
This commit is contained in:
Dan 2018-12-16 17:10:55 +01:00
parent cffafa8c61
commit 66cd896a99
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pyrogram/client/types/user_and_chats/chat_member.py
View File

@ -84,7 +84,7 @@ class ChatMember(PyrogramType):
can_delete_messages: bool = None, can_invite_users: bool = None, can_restrict_members: bool = None, can_delete_messages: bool = None, can_invite_users: bool = None, can_restrict_members: bool = None,
can_pin_messages: bool = None, can_promote_members: bool = None, can_send_messages: bool = None, can_pin_messages: bool = None, can_promote_members: bool = None, can_send_messages: bool = None,
can_send_media_messages: bool = None, can_send_other_messages: bool = None, can_send_media_messages: bool = None, can_send_other_messages: bool = None,
can_add_web_page_previews: bool = None, client=None): can_add_web_page_previews: bool = None, client, raw):
self.user = user self.user = user
self.status = status self.status = status
self.until_date = until_date self.until_date = until_date
@ -102,18 +102,19 @@ class ChatMember(PyrogramType):
self.can_send_other_messages = can_send_other_messages self.can_send_other_messages = can_send_other_messages
self.can_add_web_page_previews = can_add_web_page_previews self.can_add_web_page_previews = can_add_web_page_previews
self.client = client self._client = client
self._raw = raw
@staticmethod @staticmethod
def parse(client, member, user) -> "ChatMember": def parse(client, member, user) -> "ChatMember":
if isinstance(member, (types.ChannelParticipant, types.ChannelParticipantSelf, types.ChatParticipant)): if isinstance(member, (types.ChannelParticipant, types.ChannelParticipantSelf, types.ChatParticipant)):
return ChatMember(user=user, status="member", client=client) return ChatMember(user=user, status="member", client=client, raw=member)
if isinstance(member, (types.ChannelParticipantCreator, types.ChatParticipantCreator)): if isinstance(member, (types.ChannelParticipantCreator, types.ChatParticipantCreator)):
return ChatMember(user=user, status="creator", client=client) return ChatMember(user=user, status="creator", client=client, raw=member)
if isinstance(member, types.ChatParticipantAdmin): if isinstance(member, types.ChatParticipantAdmin):
return ChatMember(user=user, status="administrator", client=client) return ChatMember(user=user, status="administrator", client=client, raw=member)
if isinstance(member, types.ChannelParticipantAdmin): if isinstance(member, types.ChannelParticipantAdmin):
rights = member.admin_rights rights = member.admin_rights
@ -130,7 +131,7 @@ class ChatMember(PyrogramType):
can_restrict_members=rights.ban_users, can_restrict_members=rights.ban_users,
can_pin_messages=rights.pin_messages, can_pin_messages=rights.pin_messages,
can_promote_members=rights.add_admins, can_promote_members=rights.add_admins,
client=client client=client, raw=member
) )
if isinstance(member, types.ChannelParticipantBanned): if isinstance(member, types.ChannelParticipantBanned):
@ -140,7 +141,7 @@ class ChatMember(PyrogramType):
user=user, user=user,
status="kicked" if rights.view_messages else "restricted", status="kicked" if rights.view_messages else "restricted",
until_date=0 if rights.until_date == (1 << 31) - 1 else rights.until_date, until_date=0 if rights.until_date == (1 << 31) - 1 else rights.until_date,
client=client client=client, raw=member
) )
if chat_member.status == "restricted": if chat_member.status == "restricted":

17
pyrogram/client/types/user_and_chats/chat_members.py
View File

@ -17,8 +17,9 @@
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
from pyrogram.api import types from pyrogram.api import types
from .chat_member import ChatMember
from .user import User
from ..pyrogram_type import PyrogramType from ..pyrogram_type import PyrogramType
from ..user_and_chats import ChatMember, User
class ChatMembers(PyrogramType): class ChatMembers(PyrogramType):
@ -32,14 +33,18 @@ class ChatMembers(PyrogramType):
Requested chat members. Requested chat members.
""" """
def __init__(self, *, total_count: int, chat_members: list, client=None): def __init__(self, *, total_count: int, chat_members: list, client, raw):
self.total_count = total_count self.total_count = total_count
self.chat_members = chat_members self.chat_members = chat_members
self.client = client self._client = client
self._raw = raw
@staticmethod @staticmethod
def parse(client, members, users: dict): def parse(client, members):
users = {i.id: i for i in members.users}
chat_members = []
if isinstance(members, types.channels.ChannelParticipants): if isinstance(members, types.channels.ChannelParticipants):
total_count = members.count total_count = members.count
members = members.participants members = members.participants
@ -47,8 +52,6 @@ class ChatMembers(PyrogramType):
members = members.full_chat.participants.participants members = members.full_chat.participants.participants
total_count = len(members) total_count = len(members)
chat_members = []
for member in members: for member in members:
user = User.parse(client, users[member.user_id]) user = User.parse(client, users[member.user_id])
chat_members.append(ChatMember.parse(client, member, user)) chat_members.append(ChatMember.parse(client, member, user))
@ -56,5 +59,5 @@ class ChatMembers(PyrogramType):
return ChatMembers( return ChatMembers(
total_count=total_count, total_count=total_count,
chat_members=chat_members, chat_members=chat_members,
client=client client=client, raw=members
) )