Rename account to player in code

app/__main__.py

@@ -3,7 +3,7 @@
 from telegram.ext import CommandHandler
 
 from app import LOGGER, UPDATER, commands
-from app.conversations.add_account import ADD_ACCOUNT_CONV
+from app.conversations.add import ADD_CONV
 
 
 def main():
@@ -16,7 +16,7 @@ def main():
     dispatcher.add_handler(CommandHandler('accounts', commands.cmd_accounts))
 
     # conversations
-    dispatcher.add_handler(ADD_ACCOUNT_CONV)
+    dispatcher.add_handler(ADD_CONV)
 
     UPDATER.start_polling()
     UPDATER.idle()

app/api.py

@@ -9,14 +9,14 @@ from dateutil import parser
 from app import BASE_URL, HEADERS
 
 
-def get_rr_account(account_id):
-    """Get Rival Region account"""
+def get_rr_player(player_id):
+    """Get Rival Region player"""
     response = requests.get(
-        '{}slide/profile/{}'.format(BASE_URL, account_id),
+        '{}slide/profile/{}'.format(BASE_URL, player_id),
         headers=HEADERS
     )
     soup = BeautifulSoup(response.text, 'html.parser')
-    account = {
+    player = {
         'name': None,
         'region': None,
         'residency': None,
@@ -25,40 +25,40 @@ def get_rr_account(account_id):
     table = soup.find('table')
     name = soup.find('h1')
     if name:
-        account['name'] = re.sub(r'.*:\s', '', name.text)
+        player['name'] = re.sub(r'.*:\s', '', name.text)
     for row in table.find_all('tr'):
         label = row.find('td').text.strip() 
         if label == 'Region:':
             span = row.find('span', {'class': 'dot'})
             if span:
-                account['region'] = span.text
+                player['region'] = span.text
         if label == 'Residency:':
             span = row.find('span', {'class': 'dot'})
             if span:
-                account['residency'] = span.text
+                player['residency'] = span.text
         if label == 'Registration date:':
             element = row.find('td', {'class': 'imp'})
             if element:
-                account['registation_date'] = parser.parse(element.text)
+                player['registation_date'] = parser.parse(element.text)
 
-    return account
+    return player
 
-def get_accounts_by_name(account_name):
-    """Get account list by name"""
+def get_players_by_name(player_name):
+    """Get player list by name"""
     response = requests.get(
-        '{}listed/region/0/{}/0'.format(BASE_URL, account_name),
+        '{}listed/region/0/{}/0'.format(BASE_URL, player_name),
         headers=HEADERS,
     )
     soup = BeautifulSoup(response.text, 'html.parser')
-    accounts = []
-    account_items = soup.find_all('tr', {'class': 'list_link'})
-    for account_item in account_items:
-        accounts.append({
-            'id': int(account_item.get('user')),
-            'name': account_item.find('td', {'class': 'list_name'}).text.strip(),
-            'level': int(account_item.find('td', {'class': 'list_level'}).text),
+    players = []
+    player_items = soup.find_all('tr', {'class': 'list_link'})
+    for player_item in player_items:
+        players.append({
+            'id': int(player_item.get('user')),
+            'name': player_item.find('td', {'class': 'list_name'}).text.strip(),
+            'level': int(player_item.find('td', {'class': 'list_level'}).text),
         })
-    return accounts
+    return players
 
 def send_personal_message(user_id, message):
     """Send personal message to player"""

app/commands.py

@@ -9,41 +9,41 @@ def cmd_start(update, context):
     """Start command"""
     LOGGER.info('"@%s" start bot', update.message.from_user.username)
     update.message.reply_text(
-        'Hello {}, use /add_account to add an account, use /help for a list of commands.'.format(
+        'Hello {}, use /add to add an player, use /help for a list of commands.'.format(
             update.message.from_user.first_name
         )
     )
-    telegram_account = database.get_telegram_account(update.message.from_user.id)
-    if not telegram_account:
-        database.add_telegram_account(update)
+    telegram_player = database.get_telegram_player(update.message.from_user.id)
+    if not telegram_player:
+        database.add_telegram_player(update)
 
 
 def cmd_help(update, context):
     """Help command"""
     message_list = [
         '**Command list**',
-        '/add\\_account - add account to list',
-        '/accounts - list of accounts',
+        '/add - add account to list',
+        '/players - list of accounts',
     ]
     message = '\n'.join(message_list)
     update.message.reply_text(message, parse_mode=ParseMode.MARKDOWN)
 
 def cmd_accounts(update, context):
-    """Return account list"""
-    message_list = ['Accounts verified to this Telgeram account:']
-    telegram_account = database.get_telegram_account(update.message.from_user.id)
-    if telegram_account:
-        accounts = database.get_rr_accounts(telegram_account)
+    """Return player list"""
+    message_list = ['Accounts verified to this Telgeram player:']
+    telegram_player = database.get_telegram_player(update.message.from_user.id)
+    if telegram_player:
+        players = database.get_rr_players(telegram_player)
     else:
-        accounts = []
-    if not accounts:
+        players = []
+    if not players:
         message_list.append('• none')
-    for account in accounts:
-        desktop_link = '[desktop](https://rivalregions.com/#slide/profile/{})'.format(account.id)
-        mobile_link = '[mobile](https://m.rivalregions.com/#slide/profile/{})'.format(account.id)
+    for player in players:
+        desktop_link = '[desktop](https://rivalregions.com/#slide/profile/{})'.format(player.id)
+        mobile_link = '[mobile](https://m.rivalregions.com/#slide/profile/{})'.format(player.id)
         message_list.append(
             '• {} {} - {}'.format(
-                functions.escape_text(account.name),
+                functions.escape_text(player.name),
                 desktop_link,
                 mobile_link,
             )

app/conversations/add_account.py → app/conversations/add.py

@@ -144,7 +144,7 @@ def conv_finish(update, context):
     )
     database.verify_rr_player(update.message.from_user.id, player_id)
     update.message.reply_text(
-        'Verificated your Rival Region player to Telegram. Type /players to see your players',
+        'Verificated your Rival Region player to Telegram. Type /accounts to see your accounts',
         parse_mode=ParseMode.MARKDOWN
     )
     context.user_data.clear()
@@ -167,8 +167,8 @@ def conv_cancel(update, context):
     return ConversationHandler.END
 
 # announcement conversation
-ADD_ACCOUNT_CONV = ConversationHandler(
-    entry_points=[CommandHandler('add_account', conv_ask_player_id)],
+ADD_CONV = ConversationHandler(
+    entry_points=[CommandHandler('add', conv_ask_player_id)],
     states={
         PLAYER_ID: [
             MessageHandler(Filters.regex(r'^\d*$'), conv_player_id_confirm),