Basealt adaptation

1 files changed, 17 insertions, 8 deletions

diff --git a/keyboards.py b/keyboards.py
index 5bfc2cb..aa8d761 100644
--- a/keyboards.py
+++ b/keyboards.py
@@ -13,10 +13,10 @@ class MenuKeyboard(Keyboard):
     TOP_10 = "hidden Топ-10📊"
     RULES = "Правилаℹ️"
     ADMIN = "/admin"
-    HELP = "Задать вопрос🆘"
+    HELP = "Связаться с Базальт СПО🐧"
 
     @classmethod
-    def get_keyboard(cls, telegram_id=None):
+    def get_keyboard(cls, telegram_id=None, solved=False):
         if telegram_id is not None:
             status_code, data = backend_api.get_profile(telegram_id)
             if status_code == 200 and data["is_admin"]:
@@ -27,11 +27,17 @@ class MenuKeyboard(Keyboard):
                     [cls.HELP],
                 ]
 
-        return [
-            [cls.CHOOSE_TASK],
-            [cls.RULES],
-            [cls.HELP],
-        ]
+        if solved:
+            return [
+                [cls.RULES],
+                [cls.HELP],
+            ]
+        else:
+            return [
+                [cls.CHOOSE_TASK],
+                [cls.RULES],
+                [cls.HELP],
+            ]
 
 
 class BackToMenuKeyboard(Keyboard):
@@ -50,7 +56,10 @@ class TasksKeyboard(Keyboard):
         status, tasks = backend_api.get_published_tasks()
         titles_keyboard = [[cls.CANCEL]]
         if status == 200:
-            titles_keyboard.extend([task.get("title")] for task in tasks)
+            titles = []
+            for task in sorted(tasks, key=lambda t: t.get("title")):
+                titles.append([task.get("title")])
+            titles_keyboard.extend(titles)
 
         return titles_keyboard