Grouping - InlineKeyboard changed , timeout updated

kaulketh · Mar 15, 2019 · 4fb47b9 · 4fb47b9
1 parent b5ed68e
commit 4fb47b9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/bot/conf/greenhouse_config.py b/bot/conf/greenhouse_config.py
@@ -32,7 +32,6 @@
 # keyboard configs
 kb1 = [[lib.group1[1], lib.group1[2], lib.group1[3], lib.group3[1]],
        [lib.group3[2], lib.group2[1], lib.group2[2], lib.group2[3]],
-       # [lib.group1[0], lib.group3[0], lib.group2[0]],
        [lib.grouping],
        [lib.stop_bot, lib.live_stream, lib.reload]
        ]

diff --git a/bot/conf/lib_global.py b/bot/conf/lib_global.py
@@ -14,7 +14,7 @@
 """
 timeout if no user activity 
 """
-timeout = 600
+timeout = 60
 
 
 """ language settings

diff --git a/bot/greenhouse.py b/bot/greenhouse.py
@@ -433,11 +433,11 @@ def __group_menu(bot, update):
     selection = ()
     logger.info('Grouping mode called.')
     inline_keyboard = [
-        [__get_inline_btn(lib.group1[1], conf.RELAIS_01), __get_inline_btn(lib.group1[2], conf.RELAIS_02),
-         __get_inline_btn(lib.group1[3], conf.RELAIS_03), __get_inline_btn(lib.group3[1], conf.RELAIS_04)],
-        [__get_inline_btn(lib.group3[2], conf.RELAIS_05), __get_inline_btn(lib.group2[1], conf.RELAIS_06),
-         __get_inline_btn(lib.group2[2], conf.RELAIS_07), __get_inline_btn(lib.group2[3], conf.RELAIS_08)],
-        [__get_inline_btn(lib.btn_finished, lib.btn_finished), __get_inline_btn(lib.btn_cancel, lib.btn_cancel)]
+        [__get_btn(lib.group1[1], conf.RELAIS_01), __get_btn(lib.group1[2], conf.RELAIS_02),
+         __get_btn(lib.group1[3], conf.RELAIS_03), __get_btn(lib.group3[1], conf.RELAIS_04)],
+        [__get_btn(lib.group3[2], conf.RELAIS_05), __get_btn(lib.group2[1], conf.RELAIS_06),
+         __get_btn(lib.group2[2], conf.RELAIS_07), __get_btn(lib.group2[3], conf.RELAIS_08)],
+        [__get_btn(lib.btn_finished, lib.btn_finished), __get_btn(lib.btn_cancel, lib.btn_cancel)]
     ]
 
     global reply_markup
@@ -446,8 +446,8 @@ def __group_menu(bot, update):
     return GROUPING
 
 
-def __get_inline_btn(text, callback):
-    return InlineKeyboardButton(text, callback_data=callback)
+def __get_btn(text, callback):
+    return InlineKeyboardButton('{0}({1})'.format(text, callback), callback_data=callback)
 # end: grouping