python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2026-04-08 16:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added possibility to use HashTag/CashTag elements without prefixing content, added sep: str argument to the as_line function.

Browse source
This commit is contained in:
Alex Root Junior 2023-07-16 23:04:06 +03:00
parent afeb659b82
commit 853b72f38d
No known key found for this signature in database
GPG key ID: 074C1D455EBEA4AC
2 changed files with 75 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

31
aiogram/utils/formatting.py
View file

@ -226,6 +226,15 @@ class HashTag(Text):
type = MessageEntityType.HASHTAG
def __init__(self, *body: NodeType, **params: Any) -> None:
if len(body) != 1:
raise ValueError("Hashtag can contain only one element")
if not isinstance(body[0], str):
raise ValueError("Hashtag can contain only string")
if not body[0].startswith("#"):
body = ("#" + body[0],)
super().__init__(*body, **params)
class CashTag(Text):
"""
@ -241,6 +250,15 @@ class CashTag(Text):
type = MessageEntityType.CASHTAG
def __init__(self, *body: NodeType, **params: Any) -> None:
if len(body) != 1:
raise ValueError("Cashtag can contain only one element")
if not isinstance(body[0], str):
raise ValueError("Cashtag can contain only string")
if not body[0].startswith("$"):
body = ("$" + body[0],)
super().__init__(*body, **params)
class BotCommand(Text):
"""
@ -474,15 +492,24 @@ def _unparse_entities(
yield remove_surrogates(text[offset:length])
def as_line(*items: NodeType, end: str = "\n") -> Text:
def as_line(*items: NodeType, end: str = "\n", sep: str = "") -> Text:
"""
Wrap multiple nodes into line with :code:`\\\\n` at the end of line.
:param items: Text or Any
:param end: ending of the line, by default is :code:`\\\\n`
:param sep: separator between items, by default is empty string
:return: Text
"""
return Text(*items, end)
if sep:
nodes = []
for item in items[:-1]:
nodes.extend([item, sep])
nodes.append(items[-1])
nodes.append(end)
else:
nodes = [*items, end]
return Text(*nodes)
def as_list(*items: NodeType, sep: str = "\n") -> Text: