From 75fbe544c326b3aa1551ae0fa2ac5edba413bf58 Mon Sep 17 00:00:00 2001 From: VoVcHiC <74859502+vovchic17@users.noreply.github.com> Date: Tue, 14 Jan 2025 15:03:25 +0300 Subject: [PATCH 1/3] fix typo in ukrainian docs (#1629) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix typo in ukrainian docs * remove "якісь" --- docs/locale/uk_UA/LC_MESSAGES/index.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/locale/uk_UA/LC_MESSAGES/index.po b/docs/locale/uk_UA/LC_MESSAGES/index.po index 496a6c50..fbfb3e14 100644 --- a/docs/locale/uk_UA/LC_MESSAGES/index.po +++ b/docs/locale/uk_UA/LC_MESSAGES/index.po @@ -173,7 +173,7 @@ msgstr "" #: ../../../README.rst:71 msgid "If you have any questions, you can visit our community chats on Telegram:" -msgstr "Якщо є якість додаткові запитання, ласкаво просимо до онлайн-спільнот:" +msgstr "Якщо є додаткові запитання, ласкаво просимо до онлайн-спільнот:" #: ../../../README.rst:73 msgid "🇺🇸 `@aiogram `_" From a516b7f03f6a32796f5f3721f0cab8bcf78e4821 Mon Sep 17 00:00:00 2001 From: Anton Trotsenko <37223374+antos07@users.noreply.github.com> Date: Fri, 17 Jan 2025 00:29:50 +0100 Subject: [PATCH 2/3] Bump redis max version to <5.3.0 (#1631) * Bump redis max version to <5.3.0 * Describe changes --- CHANGES/1631.misc.rst | 1 + pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 CHANGES/1631.misc.rst diff --git a/CHANGES/1631.misc.rst b/CHANGES/1631.misc.rst new file mode 100644 index 00000000..76e2fa47 --- /dev/null +++ b/CHANGES/1631.misc.rst @@ -0,0 +1 @@ + Increased max :code:`redis` version support from “<5.1.0” to “<5.3.0” diff --git a/pyproject.toml b/pyproject.toml index 1e2f2572..a5b7cd8d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ fast = [ "aiodns>=3.0.0", ] redis = [ - "redis[hiredis]>=5.0.1,<5.1.0", + "redis[hiredis]>=5.0.1,<5.3.0", ] mongo = [ "motor>=3.3.2,<3.7.0", From bbdc43b737d4cefaa7eed2ff3c1971339ecbbd66 Mon Sep 17 00:00:00 2001 From: AmirSoroush Date: Fri, 17 Jan 2025 02:35:23 +0300 Subject: [PATCH 3/3] Fix `BAD_PATTERN` regex in deeplinking process. (#1630) * add test payload in `test_deep_linking` to demonstrate the bug * fix the `BAD_PATTERN` regex * add changes file --- CHANGES/1630.bugfix.rst | 1 + aiogram/utils/deep_linking.py | 2 +- tests/test_utils/test_deep_linking.py | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 CHANGES/1630.bugfix.rst diff --git a/CHANGES/1630.bugfix.rst b/CHANGES/1630.bugfix.rst new file mode 100644 index 00000000..e083dc1f --- /dev/null +++ b/CHANGES/1630.bugfix.rst @@ -0,0 +1 @@ +Fix the regex pattern that finds the "bad characters" for deeplink payload. \ No newline at end of file diff --git a/aiogram/utils/deep_linking.py b/aiogram/utils/deep_linking.py index 19cc64c6..fe2764f7 100644 --- a/aiogram/utils/deep_linking.py +++ b/aiogram/utils/deep_linking.py @@ -18,7 +18,7 @@ from aiogram.utils.payload import decode_payload, encode_payload if TYPE_CHECKING: from aiogram import Bot -BAD_PATTERN = re.compile(r"[^A-z0-9-]") +BAD_PATTERN = re.compile(r"[^a-zA-Z0-9-_]") async def create_start_link( diff --git a/tests/test_utils/test_deep_linking.py b/tests/test_utils/test_deep_linking.py index 85a6027b..c5f5259a 100644 --- a/tests/test_utils/test_deep_linking.py +++ b/tests/test_utils/test_deep_linking.py @@ -10,12 +10,14 @@ PAYLOADS = [ "aaBBccDDeeFF5544332211", -12345678901234567890, 12345678901234567890, + "underscore_and-dash", ] WRONG_PAYLOADS = [ "@BotFather", "Some:special$characters#=", "spaces spaces spaces", 1234567890123456789.0, + "has`backtick", ]