37fbd35e8f
Add trailing comma in handlers router inclusion
...
- Minor formatting adjustment in router configuration
- Ensure consistent code style with trailing comma
2025-01-31 02:44:48 +03:00
c41b77d365
Update database query and key handling in admin user editor
...
- Modify get_keys function to return all columns in keys table
- Update admin user editor to handle full key record instead of just email
- Cast tg_id to integer in user record processing
- Adjust key display and callback data generation to use full key record
2025-01-31 02:41:40 +03:00
b04bc4dca5
Remove user router and related blocking/unblocking logic
...
- Deleted handlers/user.py file
- Removed user_router from main handlers router
- Eliminated user blocking/unblocking event handlers
2025-01-31 00:14:56 +03:00
bf35156455
Remove check_online_users function and minor import reorganization
...
- Removed unused check_online_users function from notifications handler
- Reorganized imports in notifications.py and utils.py
- Fixed TimeoutError import in subscriptions.py
2025-01-31 00:08:31 +03:00
e6a1b55045
Merge branch 'main' of https://github.com/izzzzzi/Solo_bot
2025-01-30 23:37:28 +03:00
455ab76c8a
Minor text formatting in captcha generation message
2025-01-30 23:36:56 +03:00
720c145aa3
Auto-format code with Ruff using pyproject.toml
2025-01-30 20:36:20 +00:00
580ce90442
Remove unused is_bot_blocked function from notifications handler
2025-01-30 23:36:02 +03:00
239426f6d5
Merge branch 'main' of https://github.com/izzzzzi/Solo_bot
2025-01-30 23:35:50 +03:00
899da825cb
Refactor and improve security with cryptographically secure random generation
...
- Replace `random` module with `secrets` for cryptographically secure random choices
- Update type hints for async API methods in client.py
- Optimize file reading with aiofiles in multiple handlers
- Improve error handling and logging in various modules
- Update Python target version to 3.12 in pyproject.toml
- Remove unused imports and improve code quality
2025-01-30 22:35:09 +03:00
59e0d965da
Merge pull request #138 from Capybara-z/patch-2
...
Расчет времени для исекших уведомлений для DELETE_KEYS_DELAY
2025-01-30 21:58:33 +03:00
69dcef073e
Расчет времени для исекших уведомлений для DELETE_KEYS_DELAY
...
Добавлена format_time_until_deletion для расчета времени при уведомлении когда подписка истекала.
2025-01-30 21:50:29 +03:00
89394ef630
Задержка перед удалением подписки.
...
Добавлена переменная:
DELETE_KEYS_DELAY = 0 # Задержка в секундах перед удалением ключа после истечения. Установите 0, если функция не требуется.
При ее работе не удаляет ключ, а ждет опредленное время.
Поправлена работа def handle_expired_keys, ранее брался запас 45 мин для выгрузки, сейчас EXPIRED_KEYS_CHECK_INTERVAL * 1.5 для корректной проверки и запаса при повторных проверках.
При работе DELETE_KEYS_DELAY добавляется кнопка продления.
2025-01-30 21:48:19 +03:00
b1739cf4ea
Optimize import statements and remove unused imports across multiple files
...
This commit focuses on cleaning up import statements by:
- Removing unused imports
- Organizing import order
- Removing redundant imports
- Ensuring consistent import style across different modules
2025-01-29 07:15:20 +03:00
d47952fe3e
Auto-format code with Ruff using pyproject.toml
2025-01-29 04:01:20 +00:00
74d58ce310
Merge branch 'main' of https://github.com/izzzzzi/Solo_bot
2025-01-29 07:01:01 +03:00
f7c906f608
Merge branch 'main' into dev
2025-01-24 23:35:19 +03:00
e97e3060f7
Add inline button for user profile in admin panel message processing. Enhanced user interaction by including a button that directs users to their personal account, improving the overall user experience.
2025-01-23 14:43:39 +03:00
3d67311e61
Update button labels from " 🔙 Назад" to " ⬅️ Назад" across multiple admin handlers and key management files for improved user interface consistency. This change enhances the visual clarity of navigation options within the application.
2025-01-23 12:06:38 +03:00
7bfbf89054
Refactor trial management function names for clarity. Renamed set_trial to update_trial in database.py and updated all related handler calls in start.py, admin_user_editor.py, and trial_key.py to reflect this change. This improves code readability and consistency across the codebase.
2025-01-23 12:03:01 +03:00
bb803ab145
Implement new database functions for server and coupon management. Added check_server_name_by_cluster, get_coupon_details, get_referral_by_referred_id, and get_all_keys to enhance data retrieval capabilities. Updated handlers to utilize these new functions, improving code clarity and maintainability. Refactored existing database calls in start.py, utils.py, and keys.py for consistency and better session management.
2025-01-23 11:58:35 +03:00
56af0a7885
Merge branch 'main' of https://github.com/izzzzzi/Solo_bot
2025-01-23 11:40:25 +03:00
c2ba4e9ab6
Refactor server management and database interactions. Renamed get_servers_from_db to get_servers for clarity and updated related handlers to utilize session management. Refactored add_server_to_db to create_server for consistency. Improved code readability and maintainability across coupon and notification handlers by streamlining database calls and enhancing error handling.
2025-01-23 11:36:15 +03:00
7b372e095e
Auto-format code with Ruff using pyproject.toml
2025-01-23 08:28:39 +00:00
33f98276ce
Enhance database interaction in coupon and server management. Updated check_unique_server_name to accept session and cluster name parameters for improved uniqueness checks. Introduced new functions: get_coupon_by_code, delete_server, create_coupon_usage, check_coupon_usage, and update_coupon_usage_count for better coupon management. Refactored handlers to utilize these new functions, improving code clarity and maintainability.
2025-01-23 11:28:21 +03:00
8818d91232
Refactor database interaction in key management functions to utilize session objects for improved performance and consistency. Updated get_keys, get_keys_by_server, update_balance, and update_key_expiry functions to accept a session parameter, allowing for better session management across handlers. Adjusted related handler functions to pass the session, enhancing code clarity and maintainability.
2025-01-23 11:06:25 +03:00
0aab2096a5
Refactor database interaction functions in database.py and update related handlers. Renamed functions for clarity: save_temporary_data to create_temporary_data, add_blocked_user to create_blocked_user, remove_blocked_user to delete_blocked_user, and delete_coupon_from_db to delete_coupon. Updated trial management function from restore_trial to set_trial to better reflect its purpose. Adjusted corresponding calls in notifications, start, user, and admin handlers for consistency and improved readability.
2025-01-23 10:38:32 +03:00
5a3f54c3a7
Refactor client management in key_utils.py and trial_key.py to utilize ClientConfig dataclass for improved parameter handling. This change enhances code clarity and maintainability by consolidating client configuration parameters into a single structured object, streamlining the add_client function calls across multiple handlers.
2025-01-23 10:24:16 +03:00
6c323dc7df
Refactor client configuration and improve code clarity in client.py and admin_servers.py. Added a new line in ClientConfig for better readability and updated the extend_client_key function signature for consistency. Corrected a TODO comment format in admin_servers.py for improved code standards.
2025-01-23 08:50:04 +03:00
9437ee9c90
Refactor key retrieval and management logic across multiple handlers. Update get_key_details to include email in the fetched record and replace direct SQL queries with dedicated functions for improved code clarity and maintainability. Add a TODO comment in admin_servers.py for future enhancements.
2025-01-23 08:41:44 +03:00
4addb772a0
Add server management functionality by introducing add_server_to_db function for streamlined database interactions. Refactor server addition logic in sync_servers_with_db and admin handlers to utilize the new function, enhancing code clarity and session management.
2025-01-23 08:03:58 +03:00
a1d051a3f1
Refactor key management functions to improve database interactions by consolidating key deletion logic into a single function. Introduce timezone-aware expiry date calculations for keys and enhance key retrieval processes across various handlers. Update the start command to utilize a dedicated function for adding connections, ensuring cleaner code and better session management.
2025-01-23 07:49:21 +03:00
c4d3c921bd
Refactor code to utilize aiofiles for asynchronous file handling across multiple modules. Added a new function to remove blocked users from the database and updated user blocking/unblocking logic to use this new function. Improved database interaction in admin panel handlers by passing session objects instead of creating new connections. This enhances performance and maintains consistency in file operations.
2025-01-23 06:34:45 +03:00
1596c85bee
Auto-format code with Ruff using pyproject.toml
2025-01-23 03:15:11 +00:00
ad9c49f841
Merge branch 'main' of https://github.com/izzzzzi/Solo_bot
2025-01-23 06:14:33 +03:00
5a1d4c1b24
minor_fixes
2025-01-22 18:46:16 +03:00
b81a0f289f
location-selection/major_update_notifications/gifts and more fixes
2025-01-21 22:43:18 +03:00
44cadc29ba
Refactor file handling to use aiofiles for asynchronous operations
...
- Replaced synchronous file reading with asynchronous file handling using aiofiles in multiple handlers and the backup module.
- Improved performance and responsiveness when sending images and backups by utilizing async file operations.
- Ensured consistent use of BufferedInputFile across all relevant functions for better code maintainability.
2025-01-21 12:03:56 +03:00
a2c71a49f2
Refactor and clean up code formatting across multiple files
...
- Consolidated and simplified code formatting by removing unnecessary line breaks and improving readability in various functions.
- Updated the handling of backup file sending in backup.py for better clarity.
- Streamlined error handling and logging messages in several handlers to enhance consistency.
- Adjusted the Makefile to exclude specific files during Ruff checks and formatting.
- Made minor adjustments to function signatures and parameter handling for improved clarity and consistency.
This commit enhances code maintainability and readability without altering functionality.
2025-01-21 08:57:12 +03:00
1459bdacfa
Refactor captcha response handling in check_captcha function
...
- Removed the deletion of the original message upon correct captcha response.
- Changed the method of sending the captcha text and markup from edit_text to answer for better user experience.
2025-01-20 22:31:14 +03:00
a9e111bd4f
Add captcha functionality to start command handler
...
- Included captcha router in main handlers.
- Integrated captcha generation in the start command, conditional on CAPTCHA_ENABLE setting.
2025-01-20 22:27:39 +03:00
b63c3fb115
Update work from blocked_users
2025-01-20 03:47:16 +03:00
3d7684b72b
Small fix
2025-01-19 08:49:46 +03:00
eeb330b21f
Implement expiry time printing in key names
2025-01-19 06:05:22 +03:00
efff92b2b3
Fix some imports
2025-01-19 05:37:01 +03:00
4d5cc954b5
Introduce changing key expiry date keyboard
2025-01-19 05:35:20 +03:00
1e204a3e29
Remove get_key_details unused fields for now
2025-01-18 04:54:37 +03:00
98d0c03aee
Feat https://github.com/Vladless/Solo_bot/commit/b6184d4c90deed7162f618bdebefa44f3e0ee348
2025-01-18 04:36:59 +03:00
1a29bb6dd5
Fix bouncing messages while handle user input for changing balance
2025-01-18 04:21:40 +03:00
0959742f5b
Fix some telegram exceptions while editing the same content + add forward option to users search
2025-01-18 04:09:21 +03:00
Zakhar Izmaylov