Procházet zdrojové kódy

Improve messages and code

JoostSijm před 5 roky
rodič
revize
c270a2c690
2 změnil soubory, kde provedl 10 přidání a 6 odebrání
  1. 3 3
      app/commands.py
  2. 7 3
      app/conversations/add.py

+ 3 - 3
app/commands.py

@@ -9,7 +9,7 @@ def cmd_start(update, context):
     """Start command"""
     """Start command"""
     LOGGER.info('"@%s" start bot', update.message.from_user.username)
     LOGGER.info('"@%s" start bot', update.message.from_user.username)
     update.message.reply_text(
     update.message.reply_text(
-        'Hello {}, use /add to add an player, use /help for a list of commands.'.format(
+        'Hello {}, use /add to add an account, use /help for a list of commands.'.format(
             update.message.from_user.first_name
             update.message.from_user.first_name
         )
         )
     )
     )
@@ -23,14 +23,14 @@ def cmd_help(update, context):
     message_list = [
     message_list = [
         '**Command list**',
         '**Command list**',
         '/add - add account to list',
         '/add - add account to list',
-        '/players - list of accounts',
+        '/accounts - list of accounts',
     ]
     ]
     message = '\n'.join(message_list)
     message = '\n'.join(message_list)
     update.message.reply_text(message, parse_mode=ParseMode.MARKDOWN)
     update.message.reply_text(message, parse_mode=ParseMode.MARKDOWN)
 
 
 def cmd_accounts(update, context):
 def cmd_accounts(update, context):
     """Return player list"""
     """Return player list"""
-    message_list = ['Accounts verified to this Telgeram player:']
+    message_list = ['Accounts verified to this Telgeram account:']
     telegram_player = database.get_telegram_player(update.message.from_user.id)
     telegram_player = database.get_telegram_player(update.message.from_user.id)
     if telegram_player:
     if telegram_player:
         players = database.get_rr_players(telegram_player)
         players = database.get_rr_players(telegram_player)

+ 7 - 3
app/conversations/add.py

@@ -14,7 +14,10 @@ PLAYER_ID, CHOOSE, CONFIRM, VERIFICATION = range(4)
 def conv_ask_player_id(update, context):
 def conv_ask_player_id(update, context):
     """Ask player id"""
     """Ask player id"""
     LOGGER.info('"@%s" start add player conversation', update.message.from_user.username)
     LOGGER.info('"@%s" start add player conversation', update.message.from_user.username)
-    update.message.reply_text('Send me your Rival Regions player name or ID.')
+    update.message.reply_text(
+        'Starting add account conversation, use /cancel to stop.' +
+        ' Send me your Rival Regions account name or ID.'
+    )
     return PLAYER_ID
     return PLAYER_ID
 
 
 def conv_player_choose(update, context):
 def conv_player_choose(update, context):
@@ -25,12 +28,13 @@ def conv_player_choose(update, context):
         update.message.from_user.username,
         update.message.from_user.username,
         player_name
         player_name
     )
     )
+    update.message.reply_text('searching for \'{}\', this may take some time'.format(player_name))
     players = api.get_players_by_name(player_name)
     players = api.get_players_by_name(player_name)
     if len(players) == 0:
     if len(players) == 0:
-        update.message.reply_text('No players found witht that name, try again')
+        update.message.reply_text('No accounts found witht that name, try again')
         return PLAYER_ID
         return PLAYER_ID
     context.user_data['player_list'] = players
     context.user_data['player_list'] = players
-    message = 'Chose from list:\n'
+    message = 'Choose from list:\n'
     for num, player in enumerate(players, start=1):
     for num, player in enumerate(players, start=1):
         message += '{}) {} ({})\n'.format(num, player['name'], player['level'])
         message += '{}) {} ({})\n'.format(num, player['name'], player['level'])
     update.message.reply_text(message)
     update.message.reply_text(message)