diff --git a/davtelepot/authorization.py b/davtelepot/authorization.py index 0b1341d..9f0bbf2 100644 --- a/davtelepot/authorization.py +++ b/davtelepot/authorization.py @@ -61,7 +61,7 @@ DEFAULT_ROLES[100] = { 'can_be_appointed_by': [1, 2, 3] } -max_records_per_query = 30 +max_records_per_query = 15 class Role: @@ -200,8 +200,16 @@ class Role: """ if user_role is None: user_role = cls.get_user_role(user_record=user_record) + long_name = ' '.join( + [user_record[key] + for key in ('first_name', 'last_name') + if key in user_record + and user_record[key]] + ) + if long_name: + long_name = f" ({long_name})" return ( - f"""👤 {get_user(record=user_record)}\n""" + f"👤 {get_user(record=user_record)}{long_name}\n" f"🔑 {user_role.singular.capitalize()} {user_role.symbol}" ) @@ -230,6 +238,7 @@ class Role: make_button( f"{role.symbol} {role.singular.capitalize()}", prefix='auth:///', + delimiter='|', data=['set', user_record['id'], code] ) for code, role in cls.roles.items() @@ -344,6 +353,7 @@ async def _authorization_command(bot: Bot, text = get_cleaned_text(bot=bot, update=update, replace=[mode]) reply_markup = None admin_record = user_record.copy() + query_id = None user_record = None admin_role = bot.Role.get_user_role(user_record=admin_record) result = bot.get_message( @@ -376,6 +386,36 @@ async def _authorization_command(bot: Bot, telegram_id=update['from']['id'] ) else: # Get users matching the input text + query_text = ( + "SELECT * " + "FROM users " + "WHERE COALESCE(" + " first_name || last_name || username," + " last_name || username," + " first_name || username," + " username," + " first_name || last_name," + " last_name," + " first_name" + f") LIKE '%{text}%' " + "ORDER BY COALESCE(" + " username || first_name || last_name," + " username || last_name," + " username || first_name," + " username," + " first_name || last_name," + " first_name," + " last_name" + ")" + ) + query_id = bot.db['queries'].upsert( + dict(query=query_text), + ['query'] + ) + if query_id is True: + query_id = bot.db['queries'].find_one( + query=query_text + )['id'] user_record = list( db.query( "SELECT * " @@ -399,28 +439,19 @@ async def _authorization_command(bot: Bot, update=update, user_record=admin_record ) elif type(user_record) is list and len(user_record) > 1: # If many users match - result = bot.get_message( - 'authorization', 'auth_command', 'choose_user', - update=update, user_record=admin_record, - n=len(user_record) - ) - reply_markup = make_inline_keyboard( - [ - make_button( - f"👤 {get_user(user, link_profile=False)}", - prefix='auth:///', - data=['show', user['id']] - ) - for user in user_record[:30] - ], - 3 - ) + browse_panel = await _authorization_button(bot=bot, + update=update, + user_record=admin_record, + language=language, + data=['browse', query_id]) + if 'edit' in browse_panel: + return browse_panel['edit'] elif type(user_record) is list and len(user_record) == 0: # If query was provided but no user matches result = bot.get_message( 'authorization', 'auth_command', 'no_match', update=update, user_record=admin_record, ) - elif type(user_record) is list and len(user_record) == 1 or isinstance(user_record, dict): # If 1 user matches + elif (type(user_record) is list and len(user_record) == 1) or isinstance(user_record, dict): # If 1 user matches if type(user_record) is list: user_record = user_record[0] # Ban user if admin can do it @@ -447,8 +478,8 @@ async def _authorization_command(bot: Bot, data=['picture', user_record['id']] ) ) - buttons += get_browse_buttons(bot=bot, language=language) reply_markup = make_inline_keyboard(buttons, 1) + reply_markup['inline_keyboard'].append(get_browse_buttons(bot=bot, language=language)) return dict( text=result, reply_markup=reply_markup, @@ -470,32 +501,68 @@ async def _authorization_button(bot: Bot, else: other_user_id = None result, text, reply_markup = '', '', None - db = bot.db + query_text = None if command in ['browse'] and len(arguments) >= 1: mode = arguments[0] offset = arguments[1] if len(arguments) > 1 else 0 - if mode == 'az': + user_records = [] + if mode == 'choose': + update['text'] = '' + answer_update = await _authorization_command(bot=bot, + update=update, + user_record=user_record, + language=language, + mode='auth') + text = answer_update['text'] + reply_markup = answer_update['reply_markup'] + elif isinstance(mode, int) or (isinstance(mode, str) and mode.isnumeric()): + query_record = bot.db['queries'].find_one(id=int(mode)) + if query_record: + query_text = query_record['query'] + elif mode == 'az': + query_text = ( + "SELECT * " + "FROM users " + "ORDER BY COALESCE(" + " username || first_name || last_name," + " username || last_name," + " username || first_name," + " username," + " first_name || last_name," + " first_name," + " last_name" + ")" + ) + elif mode == 'role': + query_text = ( + "SELECT * " + "FROM users " + "ORDER BY (" + " CASE WHEN privileges = 0 THEN 5000 " + " ELSE privileges END) " + "ASC, COALESCE( " + " username || first_name || last_name," + " username || last_name," + " username || first_name," + " username," + " first_name || last_name," + " first_name," + " last_name" + ") " + ) + n = 0 + if query_text: user_records = list( bot.db.query( - "SELECT * " - "FROM users " - "ORDER BY COALESCE(" - " username || first_name || last_name," - " username || last_name," - " username || first_name," - " username," - " first_name || last_name," - " first_name," - " last_name" - f")" + f"{query_text} " f"LIMIT {max_records_per_query + 1} " - f"OFFSET {offset} " + f"OFFSET {offset * max_records_per_query} " ) ) - n = 0 for record in bot.db.query("SELECT COUNT(*) n " - "FROM users"): + f"FROM ({query_text})"): n = record['n'] + if user_records: text = bot.get_message( 'authorization', 'auth_command', 'choose_user', update=update, user_record=user_record, @@ -504,16 +571,40 @@ async def _authorization_button(bot: Bot, reply_markup = make_inline_keyboard( [ make_button( - f"👤 {get_user(user, link_profile=False)}", + f"{bot.Role.get_user_role(user_record=user).symbol} {get_user(user, link_profile=False)}", prefix='auth:///', - data=['show', user['id']] + delimiter='|', + data=['show', user['id'], command, mode, offset] ) - for user in user_records[:30] + for user in user_records[:max_records_per_query] ], 3 ) + if n > max_records_per_query: + reply_markup['inline_keyboard'].append( + [ + make_button( + text='◀ī¸', + prefix='auth:///', + delimiter='|', + data=['browse', mode, offset - 1 if offset else n // max_records_per_query] + ), + make_button( + text='↩ī¸', + prefix='auth:///', + delimiter='|', + data=['browse', 'choose'] + ), + make_button( + text='â–ļī¸', + prefix='auth:///', + delimiter='|', + data=['browse', mode, offset + 1 if n > (offset + 1) * max_records_per_query else 0] + ) + ] + ) elif command in ['show']: - other_user_record = db['users'].find_one(id=other_user_id) + other_user_record = bot.db['users'].find_one(id=other_user_id) text, buttons = bot.Role.get_user_role_text_and_buttons( user_record=other_user_record, admin_record=user_record @@ -529,6 +620,15 @@ async def _authorization_button(bot: Bot, data=['picture', user_record['id']] ) ) + if len(arguments) > 2: + buttons.append( + make_button( + text='↩ī¸', + prefix='auth:///', + delimiter='|', + data=data[2:] + ) + ) reply_markup = make_inline_keyboard(buttons, 1) elif command in ['set'] and len(arguments) > 1: other_user_id, new_privileges, *_ = arguments @@ -540,7 +640,7 @@ async def _authorization_button(bot: Bot, 'authorization', 'auth_button', 'confirm', update=update, user_record=user_record, ) - other_user_record = db['users'].find_one(id=other_user_id) + other_user_record = bot.db['users'].find_one(id=other_user_id) user_role = bot.Role.get_user_role(user_record=user_record) other_user_role = bot.Role.get_user_role(user_record=other_user_record) if other_user_role.code == new_privileges: @@ -561,6 +661,7 @@ async def _authorization_button(bot: Bot, update=update, user_record=user_record ), prefix='auth:///', + delimiter='|', data=['show', other_user_id] ) ], @@ -579,20 +680,21 @@ async def _authorization_button(bot: Bot, update=update, user_record=user_record ), prefix='auth:///', + delimiter='|', data=['show', other_user_id] ) ], 1 ) else: - db['users'].update( + bot.db['users'].update( dict( id=other_user_id, privileges=new_privileges ), ['id'] ) - other_user_record = db['users'].find_one(id=other_user_id) + other_user_record = bot.db['users'].find_one(id=other_user_id) result = bot.get_message( 'authorization', 'auth_button', 'appointed', update=update, user_record=user_record