Fix: minor changes (safer)

Author: Mortafix

autoconv/autoconv_handler.py

@@ -91,13 +91,13 @@ def _change_state(self, data, state=None):
             data_context.update({"error": False, "error-counter": 0})
         elif data_context.get("error") is not None:
             data_context.pop("error")
-            data_context.pop("error-counter")
+            data_context.pop("error-counter", 0)
         self._restore_basic_routes()
         return new_state
 
     def _wrong_message(self, text, data):
         """Handler for wrong message"""
-        self.tData.update.message.delete()
+        self.safe_delete_message(self.tData.update.message)
         state = self.conversation.get_state(self.tData.context.user_data.get("state"))
         self._restore_basic_routes()
         # save data
@@ -122,7 +122,7 @@ def _wrong_message(self, text, data):
     def _update_dynamic_list(self, state):
         """Update i and routes backup for dynamic list"""
         data = self.tData.context.user_data
-        if (state_l := data.get("list")) :
+        if state_l := data.get("list"):
             i = int(data.get("list_i"))
             new_i = i
             if state.list_all:
@@ -297,12 +297,20 @@ def _send_message(self, state, send_func, elements=None, save=True, post_func=st
         return new_msg
 
     def _do_operations(self, state, data):
+        """Apply operations if exists in this state and button"""
         if isinstance(data, int):
             data = data - len(self.tData.context.user_data.get("list", []))
         if state.operations and data in state.operations:
             return state.operations.get(data)(self.tData.prepare())
         return False
 
+    def safe_delete_message(self, message):
+        """Safe delete messages (for group and channel)"""
+        try:
+            message.delete()
+        except BadRequest:
+            pass
+
     # -------- Public functions ---------
 
     # ---- async
@@ -338,7 +346,7 @@ def send_message(tdata):
             chat_id = tdata.update.effective_chat.id
             msg_id = tdata.context.bot.send_message(chat_id, msg, **kwargs)
             sleep(seconds)
-            msg_id.delete()
+            self.safe_delete_message(msg_id)
 
         self.set_timed_function(0, function=send_message)
 
@@ -370,8 +378,8 @@ def force_state(self, state, update):
     def restart(self, update, context):
         """Restart handler to initial configuration"""
         if self.tData.context:
-            self.tData.context.user_data.get("data").clear()
-            self.tData.context.user_data.pop("bot-msg")
+            self.tData.context.user_data.get("data", {}).clear()
+            self.tData.context.user_data.pop("bot-msg", 0)
             self.tData.prepare()
         else:
             self.tData.update_telegram_data(update, context)
@@ -386,19 +394,18 @@ def manage_conversation(self, update, context, delete_first=False):
                 context.user_data.get("prev_state")
             )
             self.tData.update_telegram_data(update, context)
-            telegram_id = self.tData.update.effective_chat.id
             # ---- check authorization
             if (
                 self.conversation.users_list is not None
-                and telegram_id not in self.conversation.users_list
+                and update.effective_user.id not in self.conversation.users_list
             ):
-                if (fbs := self.conversation.no_auth_state) :
+                if fbs := self.conversation.no_auth_state:
                     return self.force_state(fbs, update)
                 return self.NEXT
             # ---- start | first message
             if not self.tData.context.user_data:
                 if delete_first:
-                    update.message.delete()
+                    self.safe_delete_message(update.message)
                 state = self.conversation.start
                 self._init_context(state)
                 self._send_message(state, self.tData.update.message.reply_text)
@@ -412,7 +419,7 @@ def manage_conversation(self, update, context, delete_first=False):
                 to_reply = self.tData.update.callback_query.edit_message_text
             else:
                 if not state.regex and not state.handler:
-                    self.tData.update.message.delete()
+                    self.safe_delete_message(self.tData.update.message)
                     return self.NEXT
                 data = (
                     state.handler
@@ -422,7 +429,7 @@ def manage_conversation(self, update, context, delete_first=False):
                 if state.regex and not match(state.regex, str(data)) or not data:
                     return self._wrong_message(state.regex, data)
                 to_reply = self.tData.context.user_data.get("bot-msg").edit_text
-                self.tData.update.message.delete()
+                self.safe_delete_message(self.tData.update.message)
             # ---- next stage
             typed_data = state.data_type(data) if data != "BACK" else "BACK"
             if not self._do_operations(state, typed_data) == self.EXIT_SIGNAL:

autoconv/conversation.py

@@ -6,7 +6,7 @@
 from autoconv.state import State
 from pydantic import validate_arguments
 from toml import load as tload
-from yaml import load as yload
+from yaml import safe_load as yload
 
 
 class Conversation:

autoconv/utils/telegram_data.py

@@ -7,6 +7,7 @@ def __init__(self, autoconv, users):
         self.udata = None
         self.sdata = None
         self.message = None
+        self.chat_type = None
         self.exception = None
         self.users = users
 
@@ -23,11 +24,15 @@ def __str__(self):
     # ---- Update functions
 
     def update_telegram_data(self, update, context):
+        """Simple info update in TelegramData"""
         self.update = update
         self.context = context
 
     def prepare(self):
-        self.telegram_id = self.update.effective_chat.id
+        """Preparing all the update info for dynamic stuff in handler"""
+        self.message = self.update.message or self.update.callback_query.message
+        self.telegram_id = self.update.effective_user.id
+        self.chat_type = self.message.chat.type
         self.udata = self.context.user_data
         self.sdata = self.udata.get("data") if self.udata else None
         self.message = self.update.message
@@ -36,16 +41,25 @@ def prepare(self):
     # ---- Public function
 
     def save(self, *args, **kwargs):
+        """Save key:value in user_data space"""
         self.context.user_data.update(*args, **kwargs)
         self.prepare()
 
     def add(self, key, value):
+        """Add some value to a already stored key in user_data"""
         prev_value = self.udata.get(key)
         self.context.user_data.update({key: prev_value + value})
         self.prepare()
         return prev_value + value
 
     def get_or_set(self, key, set_value):
+        """Get or set a value associated to a key in user_data"""
         if key not in self.udata:
             self.save({key: set_value})
         return self.udata.get(key)
+
+    def delete(self, key, pop_value=None):
+        """Delete a key in user_data"""
+        value = self.context.user_data.pop(key, pop_value)
+        self.prepare()
+        return value

requirements.txt

@@ -4,7 +4,9 @@ certifi==2021.5.30
 pydantic==1.8.2
 python-telegram-bot==13.6
 pytz==2021.1
+PyYAML==6.0
 six==1.16.0
+toml==0.10.2
 tornado==6.1
 typing-extensions==3.10.0.0
 tzlocal==2.1

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="telegram-autoconv",
-    version="0.0.71",
+    version="0.0.72",
     author="Moris Doratiotto",
     author_email="[email protected]",
     description="A python module to auto build conversation for a Telegram bot",
@@ -16,7 +16,7 @@
     install_requires=[
         "python-telegram-bot==13.7",
         "pydantic==1.8.2",
-        "pyyaml==5.4.1",
+        "pyyaml==6.0",
         "toml==0.10.2",
     ],
     classifiers=[