ceb3e160da
Merge pull request #141 from izzzzzi/main
...
Fix key
2025-01-31 14:30:13 +03:00
007f3a7bcf
Merge branch 'main' of https://github.com/izzzzzi/Solo_bot
2025-01-31 11:01:40 +03:00
cc42900142
Update server name input handler with session parameter
...
- Add session parameter to server name input handler
- Modify server name uniqueness check to use session and cluster name
- Improve data retrieval and validation in server creation flow
2025-01-31 10:54:42 +03:00
3d6acf51f6
Auto-format code with Ruff using pyproject.toml
2025-01-31 03:45:45 +00:00
c379011fd2
Fix key renewal and expiry update function signatures
...
- Update `change_expiry_time` to pass session to `update_key_expiry`
- Adjust `complete_key_renewal` connection closing order
- Minor code structure improvements in key handling functions
2025-01-31 06:44:36 +03:00
45b9c56282
Merge branch 'main' of https://github.com/izzzzzi/Solo_bot
2025-01-31 03:14:14 +03:00
88c4d940e8
Merge branch 'Vladless:main' into main
2025-01-31 03:09:45 +03:00
3741e4f3bf
Standardize import order in handler modules
...
- Reorder imports in multiple handler files to follow a consistent pattern
- Move type-specific imports like Message and CallbackQuery to be more organized
- Ensure clean and uniform import statements across admin and handler modules
2025-01-31 03:01:46 +03:00
28e7c78601
Update type hints in admin and handler modules
...
- Replace types.Message and types.CallbackQuery with explicit Message and CallbackQuery imports
- Improve type annotations in multiple handler files
- Ensure consistent type hinting across admin and handler modules
2025-01-31 02:59:57 +03:00
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
1d19d8b744
Auto-format code with Ruff using pyproject.toml
2025-01-30 21:15:14 +00: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
4dd4d829d7
Merge pull request #139 from izzzzzi/main
...
Fix
2025-01-31 00:09:44 +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
3c4ae34997
Merge branch 'main' of https://github.com/izzzzzi/Solo_bot
2025-01-30 22:36:10 +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
b70e27932d
Merge pull request #137 from Capybara-z/patch-1
...
Задержка перед удалением подписки.
2025-01-30 21:58:22 +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
79a9a95ffc
Auto-format code with Ruff using pyproject.toml
2025-01-29 04:18:09 +00:00
ee9e65d692
Minor whitespace adjustment in database connection closing
2025-01-29 07:17:53 +03:00
9bc135a51a
Merge branch 'main' of https://github.com/izzzzzi/Solo_bot
2025-01-29 07:17:28 +03:00
fabdfc6ab6
Improve type hinting for database backup function
...
Update return type annotation for `_create_database_backup()` to use explicit tuple type syntax, enhancing type clarity and compatibility with modern Python type hinting practices.
2025-01-29 07:16:21 +03:00
dff378ad81
Auto-format code with Ruff using pyproject.toml
2025-01-29 04:15:40 +00: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
5f43bb6e55
add admin-panel by hteppl
...
reorganizing and optimizing the admin panel
2025-01-28 19:36:54 +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
b6ebfd5c1e
Enhance error handling in backup cleanup process. Added a generic exception handler to log errors during the removal of old backups, improving robustness and maintainability of the backup functionality.
2025-01-23 12:10:08 +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
43959a996e
Auto-format code with Ruff using pyproject.toml
2025-01-23 09:00:26 +00:00
591370ce60
Merge branch 'main' of https://github.com/izzzzzi/Solo_bot
2025-01-23 12:00:10 +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
07d14a301b
Auto-format code with Ruff using pyproject.toml
2025-01-23 08:40:44 +00: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
Vladislav Lisitsyn