diff --git a/app/handlers/admin/bot_configuration.py b/app/handlers/admin/bot_configuration.py index 8898c03c..3d4bebfc 100644 --- a/app/handlers/admin/bot_configuration.py +++ b/app/handlers/admin/bot_configuration.py @@ -42,7 +42,16 @@ CATEGORY_GROUP_METADATA: Dict[str, Dict[str, object]] = { "title": "πŸ€– ΠžΡΠ½ΠΎΠ²Π½Ρ‹Π΅", "description": "Π‘Π°Π·ΠΎΠ²Ρ‹Π΅ настройки Π±ΠΎΡ‚Π°, ΠΎΠ±ΡΠ·Π°Ρ‚Π΅Π»ΡŒΠ½Ρ‹Π΅ ΠΊΠ°Π½Π°Π»Ρ‹ ΠΈ ΠΊΠ»ΡŽΡ‡Π΅Π²Ρ‹Π΅ сСрвисы.", "icon": "πŸ€–", - "categories": ("CORE", "CHANNEL"), + "categories": ( + "CORE", + "CHANNEL", + "TIMEZONE", + "DATABASE", + "POSTGRES", + "SQLITE", + "REDIS", + "REMNAWAVE", + ), }, "support": { "title": "πŸ’¬ ΠŸΠΎΠ΄Π΄Π΅Ρ€ΠΆΠΊΠ°", @@ -56,6 +65,7 @@ CATEGORY_GROUP_METADATA: Dict[str, Dict[str, object]] = { "icon": "πŸ’³", "categories": ( "PAYMENT", + "PAYMENT_VERIFICATION", "YOOKASSA", "CRYPTOBOT", "HELEKET", @@ -114,18 +124,6 @@ CATEGORY_GROUP_METADATA: Dict[str, Dict[str, object]] = { "ADDITIONAL", ), }, - "database": { - "title": "πŸ’Ύ Π‘Π°Π·Π° Π΄Π°Π½Π½Ρ‹Ρ…", - "description": "Π Π΅ΠΆΠΈΠΌ Π±Π°Π·Ρ‹, ΠΏΠ°Ρ€Π°ΠΌΠ΅Ρ‚Ρ€Ρ‹ PostgreSQL, SQLite ΠΈ Redis.", - "icon": "πŸ’Ύ", - "categories": ("DATABASE", "POSTGRES", "SQLITE", "REDIS"), - }, - "remnawave": { - "title": "🌐 RemnaWave API", - "description": "Π˜Π½Ρ‚Π΅Π³Ρ€Π°Ρ†ΠΈΡ с RemnaWave: URL, ΠΊΠ»ΡŽΡ‡ΠΈ ΠΈ способы Π°Π²Ρ‚ΠΎΡ€ΠΈΠ·Π°Ρ†ΠΈΠΈ.", - "icon": "🌐", - "categories": ("REMNAWAVE",), - }, "server": { "title": "πŸ“Š Бтатус сСрвСров", "description": "ΠœΠΎΠ½ΠΈΡ‚ΠΎΡ€ΠΈΠ½Π³ сСрвСров, SLA ΠΈ внСшниС ΠΌΠ΅Ρ‚Ρ€ΠΈΠΊΠΈ.", @@ -142,13 +140,14 @@ CATEGORY_GROUP_METADATA: Dict[str, Dict[str, object]] = { "title": "⚑ Π Π°ΡΡˆΠΈΡ€Π΅Π½Π½Ρ‹Π΅", "description": "Web API, webhook, Π»ΠΎΠ³ΠΈΡ€ΠΎΠ²Π°Π½ΠΈΠ΅, модСрация ΠΈ Ρ€Π΅ΠΆΠΈΠΌ ΠΎΡ‚Π»Π°Π΄ΠΊΠΈ.", "icon": "⚑", - "categories": ("WEB_API", "WEBHOOK", "LOG", "MODERATION", "DEBUG"), - }, - "external_admin": { - "title": "πŸ›‘οΈ Π’Π½Π΅ΡˆΠ½ΡΡ Π°Π΄ΠΌΠΈΠ½ΠΊΠ°", - "description": "Π’ΠΎΠΊΠ΅Π½, ΠΏΠΎ ΠΊΠΎΡ‚ΠΎΡ€ΠΎΠΌΡƒ внСшняя Π°Π΄ΠΌΠΈΠ½ΠΊΠ° провСряСт запросы.", - "icon": "πŸ›‘οΈ", - "categories": ("EXTERNAL_ADMIN",), + "categories": ( + "WEB_API", + "WEBHOOK", + "LOG", + "MODERATION", + "DEBUG", + "EXTERNAL_ADMIN", + ), }, } @@ -161,12 +160,9 @@ CATEGORY_GROUP_ORDER: Tuple[str, ...] = ( "referral", "notifications", "interface", - "database", - "remnawave", "server", "maintenance", "advanced", - "external_admin", ) CATEGORY_GROUP_DEFINITIONS: Tuple[Tuple[str, str, Tuple[str, ...]], ...] = tuple( diff --git a/app/services/system_settings_service.py b/app/services/system_settings_service.py index e5cc6efe..8e8f5e42 100644 --- a/app/services/system_settings_service.py +++ b/app/services/system_settings_service.py @@ -77,6 +77,7 @@ class BotConfigurationService: "SUPPORT": "πŸ’¬ ΠŸΠΎΠ΄Π΄Π΅Ρ€ΠΆΠΊΠ° ΠΈ Ρ‚ΠΈΠΊΠ΅Ρ‚Ρ‹", "LOCALIZATION": "🌍 Π―Π·Ρ‹ΠΊΠΈ интСрфСйса", "CHANNEL": "πŸ“£ ΠžΠ±ΡΠ·Π°Ρ‚Π΅Π»ΡŒΠ½Π°Ρ подписка", + "TIMEZONE": "πŸ—‚ Timezone", "PAYMENT": "πŸ’³ ΠžΠ±Ρ‰ΠΈΠ΅ ΠΏΠ»Π°Ρ‚Π΅ΠΆΠ½Ρ‹Π΅ настройки", "PAYMENT_VERIFICATION": "πŸ•΅οΈ ΠŸΡ€ΠΎΠ²Π΅Ρ€ΠΊΠ° ΠΏΠ»Π°Ρ‚Π΅ΠΆΠ΅ΠΉ", "TELEGRAM": "⭐ Telegram Stars", @@ -130,6 +131,7 @@ class BotConfigurationService: "SUPPORT": "ΠšΠΎΠ½Ρ‚Π°ΠΊΡ‚Ρ‹ ΠΏΠΎΠ΄Π΄Π΅Ρ€ΠΆΠΊΠΈ, SLA ΠΈ Ρ€Π΅ΠΆΠΈΠΌΡ‹ ΠΎΠ±Ρ€Π°Π±ΠΎΡ‚ΠΊΠΈ ΠΎΠ±Ρ€Π°Ρ‰Π΅Π½ΠΈΠΉ.", "LOCALIZATION": "ДоступныС языки, локализация интСрфСйса ΠΈ Π²Ρ‹Π±ΠΎΡ€ языка.", "CHANNEL": "Настройки ΠΎΠ±ΡΠ·Π°Ρ‚Π΅Π»ΡŒΠ½ΠΎΠΉ подписки Π½Π° ΠΊΠ°Π½Π°Π» ΠΈΠ»ΠΈ Π³Ρ€ΡƒΠΏΠΏΡƒ.", + "TIMEZONE": "Часовой пояс ΠΏΠ°Π½Π΅Π»ΠΈ ΠΈ ΠΎΡ‚ΠΎΠ±Ρ€Π°ΠΆΠ΅Π½ΠΈΠ΅ Π²Ρ€Π΅ΠΌΠ΅Π½ΠΈ.", "PAYMENT": "ΠžΠ±Ρ‰ΠΈΠ΅ тСксты ΠΏΠ»Π°Ρ‚Π΅ΠΆΠ΅ΠΉ, описания Ρ‡Π΅ΠΊΠΎΠ² ΠΈ ΡˆΠ°Π±Π»ΠΎΠ½Ρ‹.", "PAYMENT_VERIFICATION": "АвтоматичСская ΠΏΡ€ΠΎΠ²Π΅Ρ€ΠΊΠ° ΠΏΠΎΠΏΠΎΠ»Π½Π΅Π½ΠΈΠΉ ΠΈ ΠΈΠ½Ρ‚Π΅Ρ€Π²Π°Π» выполнСния.", "YOOKASSA": "Π˜Π½Ρ‚Π΅Π³Ρ€Π°Ρ†ΠΈΡ с YooKassa: ΠΈΠ΄Π΅Π½Ρ‚ΠΈΡ„ΠΈΠΊΠ°Ρ‚ΠΎΡ€Ρ‹ ΠΌΠ°Π³Π°Π·ΠΈΠ½Π° ΠΈ Π²Π΅Π±Ρ…ΡƒΠΊΠΈ.",