fixed magic constants

Author: dariakhaetskaya

helperBot/Client.py

@@ -78,9 +78,6 @@ def keyboard_markup(self):
         if self.next_action == action.MESSAGE:
             return self.picked_keyboard()
         return [['/friends']] + [['/download']] + [['/files']]
-               # + [['/pick ' + user.get_name()]
-               #  for user in self.interacted_with
-               #  if not user.should_fetch()]
 
     def picked_keyboard(self):
         return [['/unpick ' + self.next_recepient.get_name()],

helperBot/Constants.py

@@ -92,5 +92,16 @@ def FIRST_PICK_USER():
     def PARTICIPANTS(participants):
         return '*In chat:* ' + participants
 
+    @constant
+    def HELLO():
+        return 'Hello! This is your helper bot, authenticate to start messaging or use /download command to get file by link'
+
+    @constant
+    def ENTER_LINK():
+        return 'Please, eneter the link'
+
+    @constant
+    def CHOOSE_OPTION():
+        return 'Choose from the following'
 
 message = _Message()

helperBot/TelegramController.py

@@ -38,7 +38,7 @@ def __init__(self, tg_bot_token, vk_client_id):
 
         start_command_handler = CommandHandler('start', self.start_command_callback)
         dispatcher.add_handler(start_command_handler)
-        start_command_handler = CommandHandler('auth', self.auth_command_callback)
+        start_command_handler = CommandHandler('authenticate', self.auth_command_callback)
         dispatcher.add_handler(start_command_handler)
         start_command_handler = CommandHandler('downloadByLink', self.downloadByLink_callback)
         dispatcher.add_handler(start_command_handler)
@@ -69,20 +69,21 @@ def __init__(self, tg_bot_token, vk_client_id):
 
     def button(self, update: Update, context: CallbackContext) -> None:
         """Parses the CallbackQuery and updates the message text."""
+        buttons_to_display = 16
         query = update.callback_query
         query.answer()
 
         client = self.clients[query.message.chat_id]
         client.seen_now()
 
         if query.data.startswith("<-Friends"):
-            if client.offset_friends >= 16:
+            if client.offset_friends >= buttons_to_display:
                 client.prev_message_id_friends = query.message.message_id
-                client.offset_friends -= 16
+                client.offset_friends -= buttons_to_display
                 self.friends_command_callback(update, context, client.chat_id)
         elif query.data.startswith("->Friends"):
             client.prev_message_id_friends = query.message.message_id
-            client.offset_friends += 16
+            client.offset_friends += buttons_to_display
             self.friends_command_callback(update, context, client.chat_id)
 
         if query.data.startswith("['user id'"):
@@ -95,13 +96,13 @@ def button(self, update: Update, context: CallbackContext) -> None:
                                           reply_markup=TelegramController.keyboard(client.keyboard_markup()))
 
         if query.data.startswith("<-Files"):
-            if client.offset_files >= 16:
+            if client.offset_files >= buttons_to_display:
                 client.prev_message_id_files = query.message.message_id
-                client.offset_files -= 16
+                client.offset_files -= buttons_to_display
                 self.list_files_callback(update, context, client.chat_id)
         elif query.data.startswith("->Files"):
             client.prev_message_id_files = query.message.message_id
-            client.offset_files += 16
+            client.offset_files += buttons_to_display
             self.list_files_callback(update, context, client.chat_id)
 
         if query.data.startswith("['file id'"):
@@ -148,8 +149,8 @@ def restore(self):
     def start_command_callback(self, update, context: CallbackContext):
         chat_id = update.message.chat_id
         self.updater.bot.sendMessage(chat_id=chat_id,
-                                     text="Hello! Can yoe choose button from th list?",
-                                     reply_markup=TelegramController.keyboard([["/downloadByLink"]] + [["/auth"]])
+                                     text=message.HELLO,
+                                     reply_markup=TelegramController.keyboard([["/downloadByLink"]] + [["/authenticate"]])
                                      )
 
     def auth_command_callback(self, update, context: CallbackContext):
@@ -187,7 +188,7 @@ def downloadByLink_callback(self, update, context: CallbackContext):
         chat_id = update.message.chat_id
         self.flagNotAuth = True
         self.updater.bot.sendMessage(chat_id=chat_id,
-                                     text="Please, eneter the link")
+                                     text=message.ENTER_LINK)
 
     def download_file_callback(self, update, context: CallbackContext):
         """
@@ -251,13 +252,13 @@ def friends_command_callback(self, update, context: CallbackContext, chatID=None
         reply_markup = InlineKeyboardMarkup(self.build_menu(button_list))
         if chatID is None:
             self.updater.bot.sendMessage(chat_id=chat_id,
-                                     text='Choose from the following',
+                                     text=message.CHOOSE_OPTION,
                                      parse_mode=ParseMode.MARKDOWN,
                                      reply_markup=reply_markup)
         else:
             self.updater.bot.edit_message_text(chat_id=chat_id,
                                                message_id=client.prev_message_id_friends,
-                                               text='Choose from the following',
+                                               text=message.CHOOSE_OPTION,
                                                parse_mode=ParseMode.MARKDOWN,
                                                reply_markup=reply_markup)