From fca84e6c67f756097ca131d377aa42f7909632a4 Mon Sep 17 00:00:00 2001
From: Wagner Macedo <wagnerluis1982@gmail.com>
Date: Sat, 11 Aug 2018 00:12:03 -0300
Subject: [PATCH] =?UTF-8?q?Refatorando=20c=C3=B3digo=20do=20comando=20de?=
 =?UTF-8?q?=20obter=20livro?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gdgajubot/bot.py | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/gdgajubot/bot.py b/gdgajubot/bot.py
index 347e99c..927ebc4 100644
--- a/gdgajubot/bot.py
+++ b/gdgajubot/bot.py
@@ -358,7 +358,7 @@ def warn_auto_message(self, chat_id):
         ))
         self.bot.send_message(chat_id, random_text(), parse_mode="Markdown")
 
-    # used to keep track of self.states access
+    # used to keep track of self.states access and know what states must be dumped in `dump_states` task
     def __getattribute__(self, name):
         access = super().__getattribute__('state_access')
 
@@ -373,32 +373,38 @@ def packtpub_free_learning(self, message, now=None, reply=True):
         """Retorna o livro disponível no free-learning da editora PacktPub."""
         if reply:
             logging.info("%s: %s", message.from_user.name, "/book")
-            send_message = self._send_smart_reply
+            send_message_fn = self._send_smart_reply
         else:
-            send_message = self.send_text_photo
+            send_message_fn = self.send_text_photo
+
+        def send_message(*args, **kwargs):
+            has_sent = send_message_fn(*args, **kwargs)
+
+            if has_sent:
+                state = self.get_state('daily_book', message.chat_id)
+                state['last_time'] = now
+                state['messages_since'] = 0
+                state.dump()
 
         if now is None:
             now = datetime.datetime.now(tz=AJU_TZ)
 
+        # obtém o livro do dia, a resposta formatada e quanto tempo falta para acabar a oferta
         book, response, left = self.__get_book(now)
-        if left is not None:
+
+        # adiciona à resposta uma frase de que a oferta está acabando
+        if left >= 0:
             warning = "⌛️ Menos de %s!" % TIME_LEFT[left]
             response += warning
 
         cover = book['cover'] if book else None
 
-        has_sent = send_message(
+        send_message(
             message, response,
             parse_mode="Markdown", disable_web_page_preview=True,
             picture=cover
         )
 
-        if has_sent:
-            state = self.get_state('daily_book', message.chat_id)
-            state['last_time'] = now
-            state['messages_since'] = 0
-            state.dump()
-
     def __get_book(self, now):
         # Faz duas tentativas para obter o livro do dia, por questões de possível cache antigo.
         for _ in range(2):
@@ -422,7 +428,7 @@ def __get_book(self, now):
                 if delta <= left:
                     return book, response, left
             else:
-                left = None
+                left = -1
 
             break
 
@@ -432,7 +438,7 @@ def __get_book(self, now):
             book = None
             response = "Parece que não tem um livro grátis hoje 😡\n\n" \
                        "Se acha que é um erro meu, veja com seus próprios olhos em " + Resources.BOOK_URL
-            left = None
+            left = -1
 
         return book, response, left