fix: Fix 'EMBED_MENTION_RE' expression

botx/models/messages/sending/message.py

@@ -24,13 +24,13 @@
     "{0} can not be passed along with manual validated_values for it"
 )
 
-EMBED_MENTION_TEMPATE = (
+EMBED_MENTION_TEMPLATE = (
     "<embed_mention:{mention_type}:"
     "{mentioned_entity_id}:{mention_id}:{mention_name}>"  # noqa: WPS326
 )
 EMBED_MENTION_RE: Final = re.compile(
-    "<embed_mention:(?P<mention_type>.+?):(?P<mentioned_entity_id>.+?)"
-    ":(?P<mention_id>.+?):(?P<name>.+?)?>",  # noqa: WPS326 C812
+    r"<embed_mention:(?P<mention_type>.+?):(?P<mentioned_entity_id>[0-9a-f\-]+?):"
+    r"(?P<mention_id>[0-9a-f\-]+?):(?P<name>.+?)??>",  # noqa: WPS326 C812
 )
 
 
@@ -175,7 +175,7 @@ def make_mention_embeddable(cls, mention: Mention) -> str:
 
         mention_name = mention.mention_data.name or ""
 
-        return EMBED_MENTION_TEMPATE.format(
+        return EMBED_MENTION_TEMPLATE.format(
             mention_type=mention.mention_type,
             mentioned_entity_id=mentioned_entity_id,
             mention_id=mention.mention_id,

docs/changelog.md

@@ -1,3 +1,11 @@
+## 0.22.1 (Aug 23, 2021)
+
+### Fixed
+
+* Add `embed_mentions` argument in `SendingMessage.from_message` method.
+* Fix `EMBED_MENTION_RE` expression.
+
+
 ## 0.22.0 (Aug 19, 2021)
 
 Tested on BotX 1.44.0-rc2

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "botx"
-version = "0.22.0"
+version = "0.22.1"
 description = "A little python framework for building bots for eXpress"
 license = "MIT"
 authors = [

tests/test_models/test_messages/test_messages.py

@@ -83,6 +83,24 @@ def incoming_message() -> IncomingMessage:
     )
 
 
+@pytest.fixture()
+def embed_mention_with_name() -> str:
+    user_huid = uuid.uuid4()
+    return f"<embed_mention:contact:{user_huid}:{user_huid}:Test User>"
+
+
+@pytest.fixture()
+def embed_mention_without_name() -> str:
+    user_huid = uuid.uuid4()
+    return f"<embed_mention:contact:{user_huid}:{user_huid}:>"
+
+
+@pytest.fixture()
+def embed_mention_with_wrong_type() -> str:
+    user_huid = uuid.uuid4()
+    return f"<embed_mention:wrong_type:{user_huid}:{user_huid}:Test User>"
+
+
 def test_setting_ui_flag_property_for_common_message() -> None:
     msg = Message.from_dict(
         {
@@ -508,6 +526,62 @@ def test_build_embeddable_channel_mention(self) -> None:
                 f"<embed_mention:channel:{channel_id}:",
             )
 
+    class TestParseEmbedMentions:
+        def test_replace_embed_mention_with_name(
+            self,
+            sending_message: SendingMessage,
+            embed_mention_with_name: str,
+        ) -> None:
+            _, found_mentions = sending_message._find_and_replace_embed_mentions(
+                embed_mention_with_name,
+            )
+
+            assert len(found_mentions) == 1
+
+        def test_replace_embed_mention_without_name(
+            self,
+            sending_message: SendingMessage,
+            embed_mention_without_name: str,
+        ) -> None:
+            _, found_mentions = sending_message._find_and_replace_embed_mentions(
+                embed_mention_without_name,
+            )
+
+            assert len(found_mentions) == 1
+
+        @pytest.mark.parametrize(
+            ("embed_mention_with_name", "embed_mention_without_name"),
+            [
+                (embed_mention_with_name, embed_mention_without_name),
+                (embed_mention_without_name, embed_mention_with_name),
+            ],
+            indirect=True,
+        )
+        def test_replace_group_embed_mentions(
+            self,
+            sending_message: SendingMessage,
+            embed_mention_with_name: str,
+            embed_mention_without_name: str,
+        ) -> None:
+            embed_mentions = ", ".join(
+                [embed_mention_with_name, embed_mention_without_name],
+            )
+            _, found_mentions = sending_message._find_and_replace_embed_mentions(
+                embed_mentions,
+            )
+
+            assert len(found_mentions) == 2
+
+        def test_replace_embed_mention_with_wrong_type(
+            self,
+            sending_message: SendingMessage,
+            embed_mention_with_wrong_type: str,
+        ) -> None:
+            with pytest.raises(ValueError):
+                _, found_mentions = sending_message._find_and_replace_embed_mentions(
+                    embed_mention_with_wrong_type,
+                )
+
     class TestAddingRecipients:
         def test_adding_recipients_separately(
             self,