fix : Fixed error in helpview

- Fixed error in helpview, encountered while viewing the help section.
- other small fixes

Author: Gopinath-Mahendiran

tests/config/test_keys.py

@@ -3,7 +3,7 @@
 import pytest
 from pytest_mock import MockerFixture
 
-from zulipterminal.config import keys 
+from zulipterminal.config import keys
 
 
 AVAILABLE_COMMANDS = list(keys.key_config.KEY_BINDINGS.keys())
@@ -59,16 +59,12 @@ def test_is_command_key_matching_keys(valid_command: str) -> None:
 def test_is_command_key_nonmatching_keys(valid_command: str) -> None:
     keys_to_test = USED_KEYS - set(keys.key_config.keys_for_command(valid_command))
     for key in keys_to_test:
-        assert not keys.key_config.is_command_key(
-            valid_command, key
-        )
+        assert not keys.key_config.is_command_key(valid_command, key)
 
 
 def test_is_command_key_invalid_command(invalid_command: str) -> None:
     with pytest.raises(keys.InvalidCommand):
-        keys.key_config.is_command_key(
-            invalid_command, "esc"
-        )  # key doesn't matter
+        keys.key_config.is_command_key(invalid_command, "esc")  # key doesn't matter
 
 
 def test_HELP_is_not_allowed_as_tip() -> None:
@@ -161,18 +157,12 @@ def test_display_key_for_urwid_key(urwid_key: str, display_key: str) -> None:
 
 @pytest.mark.parametrize("command, display_keys", COMMAND_TO_DISPLAY_KEYS)
 def test_display_keys_for_command(command: str, display_keys: List[str]) -> None:
-    assert (
-        keys.key_config.display_keys_for_command(command)
-        == display_keys
-    )
+    assert keys.key_config.display_keys_for_command(command) == display_keys
 
 
 @pytest.mark.parametrize("command, display_keys", COMMAND_TO_DISPLAY_KEYS)
 def test_primary_display_key_for_command(command: str, display_keys: List[str]) -> None:
-    assert (
-        keys.key_config.primary_display_key_for_command(command)
-        == display_keys[0]
-    )
+    assert keys.key_config.primary_display_key_for_command(command) == display_keys[0]
 
 
 def test_display_keys_for_command_invalid_command(invalid_command: str) -> None:

zulipterminal/config/keys.py

@@ -234,7 +234,7 @@ def set_terminology(self, terminology: str) -> None:
             "TOGGLE_TOPIC": {
                 "keys": ["t"],
                 "help_text": f"Toggle topics in a {self.terminology}",
-                "key_category": f"{self.terminology}_list",
+                "key_category": "stream_list",
             },
             "ALL_MESSAGES": {
                 "keys": ["a", "esc"],
@@ -305,7 +305,7 @@ def set_terminology(self, terminology: str) -> None:
             "TOGGLE_MUTE_STREAM": {
                 "keys": ["m"],
                 "help_text": f"Mute/unmute {self.terminology}s",
-                "key_category": f"{self.terminology}_list",
+                "key_category": "stream_list",
             },
             "THUMBS_UP": {
                 "keys": ["+"],
@@ -342,19 +342,19 @@ def set_terminology(self, terminology: str) -> None:
             "STREAM_INFO": {
                 "keys": ["i"],
                 "help_text": f"Show/hide {self.terminology} information & modify settings",
-                "key_category": f"{self.terminology}_list",
+                "key_category": "stream_list",
             },
             "STREAM_MEMBERS": {
                 "keys": ["m"],
                 "help_text": f"Show/hide {self.terminology} members",
                 "excluded_from_random_tips": True,
-                "key_category": f"{self.terminology}_info",
+                "key_category": "stream_info",
             },
             "COPY_STREAM_EMAIL": {
                 "keys": ["c"],
                 "help_text": f"Copy {self.terminology} email to clipboard",
                 "excluded_from_random_tips": True,
-                "key_category": f"{self.terminology}_info",
+                "key_category": "stream_info",
             },
             "REDRAW": {
                 "keys": ["ctrl l"],
@@ -495,19 +495,19 @@ def set_terminology(self, terminology: str) -> None:
             "narrowing": "Switching Messages View",
             "searching": "Searching",
             "msg_actions": "Message actions",
-            f"{self.terminology}_list": f"{self.terminology} list actions",
+            "stream_list": "stream list actions",
             "user_list": "User list actions",
             "open_compose": "Begin composing a message",
             "compose_box": "Writing a message",
             "editor_navigation": "Editor: Navigation",
             "editor_text_manipulation": "Editor: Text Manipulation",
-            f"{self.terminology}_info": (
-                f"{self.terminology} information (press {self.KEY_BINDINGS['STREAM_INFO']['keys'][0]}"
-                f" to view info of a {self.terminology})"
+            "strream_info": (
+                f"stream information (press {self.KEY_BINDINGS['STREAM_INFO']['keys'][0]}"
+                " to view info of a stream)"
             ),
             "msg_info": (
                 f"Message information (press {self.KEY_BINDINGS['MSG_INFO']['keys'][0]}"
-                f" to view info of a message)"
+                " to view info of a message)"
             ),
         }
 
@@ -577,7 +577,8 @@ def commands_for_random_tips(self) -> List[KeyBinding]:
             for key_binding in self.KEY_BINDINGS.values()
             if not key_binding.get("excluded_from_random_tips", False)
         ]
-    def keys_for_command(self,command: str) -> List[str]:
+
+    def keys_for_command(self, command: str) -> List[str]:
         """
         Returns the actual keys for a given mapped command
         """
@@ -600,5 +601,6 @@ def initialize_command_map(key_config: KeyConfig) -> None:
         for key in key_config.keys_for_command(zt_cmd):
             command_map[key] = urwid_cmd
 
+
 # Initialize the command map after the KeyConfig instance is fully initialized
 initialize_command_map(key_config)

zulipterminal/core.py

@@ -104,7 +104,7 @@ def __init__(
         self.is_typing_notification_in_progress = False
 
         self.show_loading()
-        self.feature_level = ""
+        self.feature_level = None
         client_identifier = f"ZulipTerminal/{ZT_VERSION} {platform()}"
         config_file = os.path.expanduser(config_file)
         if config_file is not None and os.path.exists(config_file):
@@ -113,10 +113,7 @@ def __init__(
                 config.read_file(f, config_file)
             if self.feature_level is None:
                 self.feature_level = self.get_feature_level(config.get("api", "site"))
-        if self.feature_level.isdigit():
-            self.feature_level = int(self.feature_level)
-        else:
-            self.feature_level = 0
+                print(type(self.feature_level))
         self.terminology = "channel" if self.feature_level > 254 else "stream"
         self.key_config = key_config
         self.key_config.set_terminology(

zulipterminal/ui_tools/views.py

@@ -1280,7 +1280,7 @@ def __init__(self, controller: Any, title: str) -> None:
                 for binding in key_config.KEY_BINDINGS.values()
                 if binding["key_category"] == category
             )
-            key_config.KEY_BINDINGS = [
+            processed_bindings = [
                 (
                     binding["help_text"],
                     ", ".join(
@@ -1289,9 +1289,8 @@ def __init__(self, controller: Any, title: str) -> None:
                 )
                 for binding in keys_in_category
             ]
-
             help_menu_content.append(
-                (key_config.HELP_CATEGORIES[category], key_config.KEY_BINDINGS)
+                (key_config.HELP_CATEGORIES[category], processed_bindings)
             )
 
         popup_width, column_widths = self.calculate_table_widths(