Code refactor (#178)

Co-authored-by: Stefano Pigozzi <me@steffo.eu>

database.py

@@ -130,17 +130,10 @@ class Product(TableDeclarativeBase):
     def send_as_message(self, w: "worker.Worker", chat_id: int) -> dict:
         """Send a message containing the product data."""
         if self.image is None:
-            r = requests.get(f"https://api.telegram.org/bot{w.cfg['Telegram']['token']}/sendMessage",
+            msg = w.bot.send_message(chat_id, self.text(w))
-                             params={"chat_id": chat_id,
-                                     "text": self.text(w),
-                                     "parse_mode": "HTML"})
         else:
-            r = requests.post(f"https://api.telegram.org/bot{w.cfg['Telegram']['token']}/sendPhoto",
+            msg = w.bot.send_photo(chat_id, self.image, caption=self.text(w))
-                              files={"photo": self.image},
+        return msg.to_dict()
-                              params={"chat_id": chat_id,
-                                      "caption": self.text(w),
-                                      "parse_mode": "HTML"})
-        return r.json()
 
     def set_image(self, file: telegram.File):
         """Download an image from Telegram and store it in the image column.

duckbot.py

@@ -67,6 +67,10 @@ def factory(cfg: nuconfig.NuConfig):
             # All messages are sent in HTML parse mode
             return self.bot.send_message(parse_mode="HTML", *args, **kwargs)
 
+        @catch_telegram_errors
+        def send_photo(self, *args, **kwargs):
+            return self.bot.send_photo(parse_mode="HTML", *args, **kwargs)
+
         @catch_telegram_errors
         def edit_message_text(self, *args, **kwargs):
             # All messages are sent in HTML parse mode

strings/en.py

@@ -243,6 +243,9 @@ text_completed = "completed"
 # Text: refunded order
 text_refunded = "refunded"
 
+# Text: product not for sale
+text_not_for_sale = "Not for sale"
+
 # Add product: name?
 ask_product_name = "What should the product name be?"
 

strings/es_mx.py

@@ -242,6 +242,9 @@ text_completed = "Completada"
 # Text: refunded order
 text_refunded = "Reembolsada"
 
+# Text: product not for sale
+text_not_for_sale = "No para la venta"
+
 # Add product: name?
 ask_product_name = "¿Cuál debería ser el nombre del producto?"
 

strings/he.py

@@ -239,6 +239,9 @@ text_completed = "הסתיים"
 # Text: refunded order
 text_refunded = "כסף הוחזר"
 
+# Text: product not for sale
+text_not_for_sale = "לא למכירה"
+
 # Add product: name?
 ask_product_name = "איזה שם תרצה לתת למוצר?"
 

strings/it.py

@@ -244,6 +244,9 @@ text_completed = "completato"
 # Text: refunded order
 text_refunded = "rimborsato"
 
+# Text: product not for sale
+text_not_for_sale = "Non in vendita"
+
 # Add product: name?
 ask_product_name = "Come si deve chiamare il prodotto?"
 

strings/pt_br.py

@@ -243,6 +243,9 @@ text_completed = "completo"
 # Text: refunded order
 text_refunded = "devolvido"
 
+# Text: product not for sale
+text_not_for_sale = "Não está a venda"
+
 # Add product: name?
 ask_product_name = "Qual deve ser o nome do produto?"
 

strings/ru.py

@@ -238,6 +238,9 @@ text_completed = "выполнен"
 # Text: refunded order
 text_refunded = "возмещен"
 
+# Text: product not for sale
+text_not_for_sale = "Не продаётся"
+
 # Add product: name?
 ask_product_name = "Как назовем продукт?"
 

strings/uk.py

@@ -239,6 +239,9 @@ text_completed = "завершено"
 # Text: refunded order
 text_refunded = "повернуто"
 
+# Text: product not for sale
+text_not_for_sale = "Не продається"
+
 # Add product: name?
 ask_product_name = "Як назвати продукт?"
 

strings/zh_cn.py

@@ -244,6 +244,9 @@ text_completed = "已完成"
 # Text: refunded order
 text_refunded = "已退还"
 
+# Text: product not for sale
+text_not_for_sale = "不出售"
+
 # Add product: name?
 ask_product_name = "产品名称应为?"
 

worker.py

@@ -507,7 +507,7 @@ class Worker(threading.Thread):
             # Send the message without the keyboard to get the message id
             message = product.send_as_message(w=self, chat_id=self.chat.id)
             # Add the product to the cart
-            cart[message['result']['message_id']] = [product, 0]
+            cart[message['message_id']] = [product, 0]
             # Create the inline keyboard to add the product to the cart
             inline_keyboard = telegram.InlineKeyboardMarkup(
                 [[telegram.InlineKeyboardButton(self.loc.get("menu_add_to_cart"), callback_data="cart_add")]]
@@ -515,12 +515,12 @@ class Worker(threading.Thread):
             # Edit the sent message and add the inline keyboard
             if product.image is None:
                 self.bot.edit_message_text(chat_id=self.chat.id,
-                                           message_id=message['result']['message_id'],
+                                           message_id=message['message_id'],
                                            text=product.text(w=self),
                                            reply_markup=inline_keyboard)
             else:
                 self.bot.edit_message_caption(chat_id=self.chat.id,
-                                              message_id=message['result']['message_id'],
+                                              message_id=message['message_id'],
                                               caption=product.text(w=self),
                                               reply_markup=inline_keyboard)
         # Create the keyboard with the cancel button
@@ -1024,11 +1024,15 @@ class Worker(threading.Thread):
                               self.loc.get("ask_product_price"))
         # Display the current name if you're editing an existing product
         if product:
-            self.bot.send_message(self.chat.id,
+            if product.price is not None:
-                                  self.loc.get("edit_current_value",
+                value_text = str(self.Price(product.price))
-                                               value=(str(self.Price(product.price))
+            else:
-                                                      if product.price is not None else 'Non in vendita')),
+                value_text = self.loc.get("text_not_for_sale")
-                                  reply_markup=cancel)
+            self.bot.send_message(
+                self.chat.id,
+                self.loc.get("edit_current_value", value=value_text),
+                reply_markup=cancel
+            )
         # Wait for an answer
         price = self.__wait_for_regex(r"([0-9]+(?:[.,][0-9]{1,2})?|[Xx])",
                                       cancellable=True)