Minor changes

Author: immmdreza

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = telegrambots-custom
-version = 0.0.7rc1
+version = 0.0.7rc2
 author = immmdreza
 author_email = ir310022@gmail.com
 description = A custom extension packages for telegrambots.

src/telegrambots/custom/contexts/_contexts/message_context.py

@@ -27,6 +27,12 @@ def __init__(
     ) -> None:
         super().__init__(dp, update, Message, handler_tag, *args, **kwargs)
 
+    @final
+    @property
+    def message_id(self) -> int:
+        """Returns the message id"""
+        return self.update.message_id
+
     @property
     @final
     def sender(self):

src/telegrambots/custom/extensions/context.py

@@ -115,9 +115,9 @@ def decorator(
                     [self._context.handler_tag] + (other_continue_with or []),
                     allow_continue_after_self,
                 )
-            self._context.continue_with.callback_query(
+            self._context.continue_with.callback_query_from(
                 _tag,
-                [CallbackQuerySenderId(user_id)],
+                user_id,
                 0,
                 include_ctx_data,
                 *args,
@@ -150,9 +150,10 @@ def decorator(
                     [self._context.handler_tag] + (other_continue_with or []),
                     allow_continue_after_self,
                 )
-            self._context.continue_with.callback_query(
+            self._context.continue_with.callback_query_same_message_from(
                 _tag,
-                [CallbackQuerySenderId(user_id), CallbackQueryMessageId(message_id)],
+                message_id,
+                user_id,
                 0,
                 include_ctx_data,
                 *args,
@@ -184,9 +185,9 @@ def decorator(
                     [self._context.handler_tag] + (other_continue_with or []),
                     allow_continue_after_self,
                 )
-            self._context.continue_with.callback_query(
+            self._context.continue_with.callback_query_same_message(
                 _tag,
-                [CallbackQueryMessageId(message_id)],
+                message_id,
                 0,
                 include_ctx_data,
                 *args,
@@ -253,8 +254,8 @@ def decorator(
                     allow_continue_after_self,
                 )
             self._context.continue_with.message_from(
-                user_id,
                 _tag,
+                user_id,
                 0,
                 include_ctx_data,
                 *args,
@@ -394,8 +395,8 @@ def message(
 
     def message_from(
         self,
-        user_id: int,
         target_tag: str,
+        user_id: int,
         priority: int = 0,
         include_ctx_data: bool = True,
         *args: Any,
@@ -430,6 +431,64 @@ def callback_query(
             **kwargs,
         )
 
+    def callback_query_from(
+        self,
+        target_tag: str,
+        user_id: int,
+        priority: int = 0,
+        include_ctx_data: bool = True,
+        *args: Any,
+        **kwargs: Any,
+    ) -> NoReturn:
+        self.any(
+            target_tag,
+            CallbackQuery,
+            [CallbackQuerySenderId(user_id)],
+            priority,
+            include_ctx_data,
+            *args,
+            **kwargs,
+        )
+
+    def callback_query_same_message_from(
+        self,
+        target_tag: str,
+        message_id: int,
+        user_id: int,
+        priority: int = 0,
+        include_ctx_data: bool = True,
+        *args: Any,
+        **kwargs: Any,
+    ) -> NoReturn:
+        self.any(
+            target_tag,
+            CallbackQuery,
+            [CallbackQuerySenderId(user_id), CallbackQueryMessageId(message_id)],
+            priority,
+            include_ctx_data,
+            *args,
+            **kwargs,
+        )
+
+    def callback_query_same_message(
+        self,
+        target_tag: str,
+        message_id: int,
+        priority: int = 0,
+        include_ctx_data: bool = True,
+        *args: Any,
+        **kwargs: Any,
+    ) -> NoReturn:
+        self.any(
+            target_tag,
+            CallbackQuery,
+            [CallbackQueryMessageId(message_id)],
+            priority,
+            include_ctx_data,
+            *args,
+            **kwargs,
+        )
+
     def self(
         self,
         keys: Sequence[AbstractKeyResolver[CallbackQuery, Any]],