Escape all special characters for parse_mode MARKDOWN_V2 #42721
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jderusse
reviewed
Aug 25, 2021
| @@ -82,7 +82,7 @@ protected function doSend(MessageInterface $message): SentMessage | |||
|
|
|||
| if (!isset($options['parse_mode']) || TelegramOptions::PARSE_MODE_MARKDOWN_V2 === $options['parse_mode']) { | |||
| $options['parse_mode'] = TelegramOptions::PARSE_MODE_MARKDOWN_V2; | |||
| $options['text'] = str_replace('.', '\.', $message->getSubject()); | |||
| $options['text'] = preg_replace('/([\[_\*\[\]\(\)~`>#\+-=\|{}\.!])/m', '\\\\$1', $message->getSubject()); | |||
There was a problem hiding this comment.
\[ is referenced twice.
IIRC you don't have to escape everything
the m could be removed
There was a problem hiding this comment.
Oh, indeed, I will remove it.
src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php
Outdated
Show resolved
Hide resolved
fabpot
approved these changes
Aug 25, 2021
|
Thank you @thomas2411. |
bd4a9ba to
709981b
Compare
Merged
|
this PR broke the Telegram formatting entirely for markdown V2. Literally everything stays escaped. If I comment this preg_match the formatting is exactly as it should be. The current code gives this::
|
|
Fixed in #58636 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In the documentation of Telegram Bot API https://core.telegram.org/bots/api#markdownv2-style we can see that we need to escape more characters _ * [ ] ( ) ~ ` > # + - = | { } . !.
I have prepared a Regex for this and replaced https://github.com/symfony/telegram-notifier/blob/5.3/TelegramTransport.php#L85
I have also changed test used for escaping dot to a test that checks escaping all those characters.