yasirarism/pyrofork
1
0
Fork 0
mirror of https://github.com/Mayuri-Chan/pyrofork.git synced 2025-12-29 12:04:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pyrofork: Implement entities in Poll question and options

Browse source 
Signed-off-by: wulan17 <wulan17@nusantararom.org>
This commit is contained in:
wulan17 2024-06-02 00:16:05 +07:00
parent 59461adc55
commit 7328ccdf7c
No known key found for this signature in database
GPG key ID: 318CD6CD3A6AC0A5
3 changed files with 46 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pyrogram/methods/messages/send_poll.py
View file

@ -30,7 +30,8 @@ class SendPoll:
self: "pyrogram.Client",
chat_id: Union[int, str],
question: str,
options: List[str],
options: List["types.PollOption"],
question_entities: List["types.MessageEntity"] = None,
is_anonymous: bool = True,
type: "enums.PollType" = enums.PollType.REGULAR,
allows_multiple_answers: bool = None,
@ -73,8 +74,11 @@ class SendPoll:
question (``str``):
Poll question, 1-255 characters.
options (List of ``str``):
List of answer options, 2-10 strings 1-100 characters each.
options (List of :obj:`~pyrogram.types.PollOption`):
List of PollOption.
question_entities (List of :obj:`~pyrogram.types.MessageEntity`, *optional*):
List of special entities that appear in the poll question, which can be specified instead of *parse_mode*.
is_anonymous (``bool``, *optional*):
True, if the poll needs to be anonymous.
@ -185,16 +189,17 @@ class SendPoll:
solution, solution_entities = (await utils.parse_text_entities(
self, explanation, explanation_parse_mode, explanation_entities
)).values()
q, q_entities = (await pyrogram.utils.parse_text_entities(self, question, None, question_entities)).values()
rpc = raw.functions.messages.SendMedia(
peer=await self.resolve_peer(chat_id),
media=raw.types.InputMediaPoll(
poll=raw.types.Poll(
id=self.rnd_id(),
question=question,
question=raw.types.TextWithEntities(text=q, entities=q_entities or []),
answers=[
raw.types.PollAnswer(text=text, option=bytes([i]))
for i, text in enumerate(options)
await types.PollOption(text=option.text,entities=option.entities).write(self,i)
for i, option in enumerate(options)
],
closed=is_closed,
public_voters=not is_anonymous,

17
pyrogram/types/messages_and_media/poll.py
View file

@ -40,6 +40,9 @@ class Poll(Object, Update):
options (List of :obj:`~pyrogram.types.PollOption`):
List of poll options.
question_entities (List of :obj:`~pyrogram.types.MessageEntity`, *optional*):
Special entities like usernames, URLs, bot commands, etc. that appear in the poll question.
total_voter_count (``int``):
Total number of users that voted in the poll.
@ -84,6 +87,7 @@ class Poll(Object, Update):
id: str,
question: str,
options: List["types.PollOption"],
question_entities: List["types.MessageEntity"] = None,
total_voter_count: int,
is_closed: bool,
is_anonymous: bool = None,
@ -101,6 +105,7 @@ class Poll(Object, Update):
self.id = id
self.question = question
self.options = options
self.question_entities = question_entities
self.total_voter_count = total_voter_count
self.is_closed = is_closed
self.is_anonymous = is_anonymous
@ -136,19 +141,27 @@ class Poll(Object, Update):
if result.correct:
correct_option_id = i
o_entities = [types.MessageEntity._parse(client, entity, {}) for entity in answer.text.entities] if answer.text.entities else []
option_entities = types.List(filter(lambda x: x is not None, o_entities))
options.append(
types.PollOption(
text=answer.text,
text=answer.text.text,
voter_count=voter_count,
data=answer.option,
entities=option_entities,
client=client
)
)
q_entities = [types.MessageEntity._parse(client, entity, {}) for entity in poll.question.entities] if poll.question.entities else []
question_entities = types.List(filter(lambda x: x is not None, q_entities))
return Poll(
id=str(poll.id),
question=poll.question,
question=poll.question.text,
options=options,
question_entities=question_entities,
total_voter_count=media_poll.results.total_voters,
is_closed=poll.closed,
is_anonymous=not poll.public_voters,

24
pyrogram/types/messages_and_media/poll_option.py
View file

@ -19,6 +19,7 @@
import pyrogram
from ..object import Object
from typing import List, Optional
class PollOption(Object):
@ -28,12 +29,15 @@ class PollOption(Object):
text (``str``):
Option text, 1-100 characters.
voter_count (``int``):
voter_count (``int``, *optional*):
Number of users that voted for this option.
Equals to 0 until you vote.
data (``bytes``):
data (``bytes``, *optional*):
The data this poll option is holding.
entities (List of :obj:`~pyrogram.types.MessageEntity`, *optional*):
Special entities like usernames, URLs, bot commands, etc. that appear in the option text.
"""
def __init__(
@ -41,11 +45,23 @@ class PollOption(Object):
*,
client: "pyrogram.Client" = None,
text: str,
voter_count: int,
data: bytes
voter_count: int = 0,
data: bytes = None,
entities: Optional[List["pyrogram.types.MessageEntity"]] = None,
):
super().__init__(client)
self.text = text
self.voter_count = voter_count
self.data = data
self.entities = entities
async def write(self, client, i):
option, entities = (await pyrogram.utils.parse_text_entities(client, self.text, None, self.entities)).values()
return pyrogram.raw.types.PollAnswer(
text=pyrogram.raw.types.TextWithEntities(
text=option,
entities=entities or []
),
option=bytes([i])
)