Fixing source code

KittyNeverDies · Feb 13, 2024 · 71b33ef · 71b33ef
1 parent 402c4c9
commit 71b33ef
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 15 deletions.
diff --git a/bozenka/features/admin/information.py b/bozenka/features/admin/information.py
@@ -4,7 +4,7 @@
 from aiogram.types import Message
 
 from bozenka.features.main import BasicFeature
-from bozenka.instances.telegram.utils.keyboards import delete_keyboard
+from bozenka.instances.telegram.utils.delete import delete_keyboard
 
 
 class ChatInformation(BasicFeature):

diff --git a/bozenka/features/admin/invite_generation.py b/bozenka/features/admin/invite_generation.py
@@ -28,7 +28,6 @@ def invite_telegram_keyboard(invite_link: str, admin_id: int, chat_name: str) ->
     return kb
 
 
-
 class Invite(BasicFeature):
     """
     A class with information about invite feature

diff --git a/bozenka/features/admin/moderation.py b/bozenka/features/admin/moderation.py
@@ -10,7 +10,7 @@
 from bozenka.features.main import BasicFeature
 from bozenka.instances.telegram.utils.callbacks_factory import UnbanData, BanData, UnmuteData, MuteData, DeleteMenu
 from bozenka.instances.telegram.filters import IsAdminFilter, BotHasPermissions, UserHasPermissions
-from bozenka.instances.telegram.utils.keyboards import delete_keyboard
+from bozenka.instances.telegram.utils.delete import delete_keyboard
 from bozenka.instances.telegram.utils.simpler import SolutionSimpler
 
 

diff --git a/bozenka/features/admin/msg_pins.py b/bozenka/features/admin/msg_pins.py
@@ -7,7 +7,7 @@
 from bozenka.features.main import BasicFeature
 from bozenka.instances.telegram.utils.callbacks_factory import PinMsg, UnpinMsg, DeleteMenu
 from bozenka.instances.telegram.filters import UserHasPermissions, BotHasPermissions, IsAdminFilter
-from bozenka.instances.telegram.utils.keyboards import delete_keyboard
+from bozenka.instances.telegram.utils.delete import delete_keyboard
 from bozenka.instances.telegram.utils.simpler import SolutionSimpler
 
 

diff --git a/bozenka/features/admin/topics.py b/bozenka/features/admin/topics.py
@@ -7,7 +7,7 @@
 from bozenka.features.main import BasicFeature
 from bozenka.instances.telegram.utils.callbacks_factory import CloseThread, OpenThread, DeleteMenu
 from bozenka.instances.telegram.filters import UserHasPermissions, BotHasPermissions
-from bozenka.instances.telegram.utils.keyboards import delete_keyboard
+from bozenka.instances.telegram.utils.delete import delete_keyboard
 from bozenka.instances.telegram.utils.simpler import SolutionSimpler
 
 

diff --git a/bozenka/features/user/image_generation.py b/bozenka/features/user/image_generation.py
@@ -14,7 +14,7 @@
 from bozenka.generative.kadinsky import kadinsky_gen
 from bozenka.instances.telegram.utils.callbacks_factory import ImageGenerationCategory, ImageGeneration, DeleteMenu, \
     GptStop
-from bozenka.instances.telegram.utils.keyboards import delete_keyboard
+from bozenka.instances.telegram.utils.delete import delete_keyboard
 from bozenka.instances.telegram.utils.simpler import GeneratingImages
 
 

diff --git a/bozenka/features/user/text_generation.py b/bozenka/features/user/text_generation.py
@@ -17,7 +17,7 @@
 from bozenka.instances.telegram.utils.callbacks_factory import Gpt4FreeProvsModelPage, Gpt4FreeProviderPage, \
     Gpt4AllSelect, Gpt4AllModel, GptCategory, Gpt4freeResult, \
     Gpt4FreeProvider, GptBackMenu, Gpt4FreeModel, Gpt4FreeCategory, Gpt4FreeModelPage, GptStop
-from bozenka.instances.telegram.utils.keyboards import delete_keyboard
+from bozenka.instances.telegram.utils.delete import delete_keyboard
 from bozenka.instances.telegram.utils.simpler import AnsweringGPT4Free, AnsweringGpt4All
 
 

diff --git a/bozenka/instances/telegram/__init__.py b/bozenka/instances/telegram/__init__.py
@@ -31,7 +31,12 @@ async def register_all_features(list_of_features: list, dispatcher: Dispatcher,
         for callback_query_handler in feature.telegram_callback_handlers:
             dispatcher.callback_query.register(callback_query_handler[0], *callback_query_handler[1])
 
-    await bot.set_my_commands(cmd_list)
+    if not (commands := await bot.get_my_commands()):
+        await bot.set_my_commands(cmd_list)
+    else:
+        for cmd in cmd_list:
+            commands.append(cmd)
+        await bot.set_my_commands(commands)
 
 
 async def launch_telegram_instance(session_maker: async_sessionmaker) -> None:
@@ -46,6 +51,8 @@ async def launch_telegram_instance(session_maker: async_sessionmaker) -> None:
 
     dp = Dispatcher()
 
+    await bot.delete_my_commands()
+
     # Registering other handlers
     dp.callback_query.register(delete_callback_handler, DeleteMenu.filter())
     dp.callback_query.register(hide_menu_handler, HideMenu.filter())
@@ -56,5 +63,4 @@ async def launch_telegram_instance(session_maker: async_sessionmaker) -> None:
                                await register_all_features(list_of_features=customizable_features, dispatcher=dp, bot=bot),
                                await register_all_features(list_of_features=basic_features, dispatcher=dp, bot=bot)
 
-                           ]
-   )
+                           ])
diff --git a/bozenka/instances/telegram/filters/permissions.py b/bozenka/instances/telegram/filters/permissions.py
@@ -5,7 +5,7 @@
 from aiogram.types import Message, ChatPermissions, CallbackQuery
 from aiogram.enums import ChatMemberStatus, ChatType
 
-from bozenka.instances.telegram.utils.keyboards import delete_keyboard
+from bozenka.instances.telegram.utils.delete import delete_keyboard
 
 
 class UserHasPermissions(Filter):

diff --git a/bozenka/instances/telegram/utils/simpler/__init__.py b/bozenka/instances/telegram/utils/simpler/__init__.py
@@ -1,6 +1,2 @@
 from .solution_simpler import SolutionSimpler
-from .lists_of_content import *
 from .fsm_states import *
-
-
-