model: Set status of bots to be a static "bot" value.

This will be picked up using earlier commits, to show it differently in
the UI.

With a different status, bots are now explicitly placed at the end of the
user list.

Tests updated.

Original logic by Progyan, simplified using logic suggested in review by
neiljp in #1187.

Co-authored-by: neiljp (Neil Pilgrim) <[email protected]>

Author: plugyawn

tests/conftest.py

@@ -1021,25 +1021,25 @@ def user_dict(logged_on_user: Dict[str, Any]) -> Dict[str, Dict[str, Any]]:
         "[email protected]": {
             "email": "[email protected]",
             "full_name": "Email Gateway",
-            "status": "inactive",
+            "status": "bot",
             "user_id": 6,
         },
         "[email protected]": {
             "email": "[email protected]",
             "full_name": "Zulip Feedback Bot",
-            "status": "inactive",
+            "status": "bot",
             "user_id": 1,
         },
         "[email protected]": {
             "email": "[email protected]",
             "full_name": "Notification Bot",
-            "status": "inactive",
+            "status": "bot",
             "user_id": 5,
         },
         "[email protected]": {
             "email": "[email protected]",
             "full_name": "Welcome Bot",
-            "status": "inactive",
+            "status": "bot",
             "user_id": 4,
         },
     }
@@ -1075,12 +1075,6 @@ def user_list(logged_on_user: Dict[str, Any]) -> List[Dict[str, Any]]:
             "status": "active",
             "user_id": logged_on_user["user_id"],
         },
-        {
-            "email": "[email protected]",
-            "full_name": "Email Gateway",
-            "status": "inactive",
-            "user_id": 6,
-        },
         {
             "full_name": "Human 1",
             "email": "[email protected]",
@@ -1105,22 +1099,28 @@ def user_list(logged_on_user: Dict[str, Any]) -> List[Dict[str, Any]]:
             "user_id": 14,
             "status": "inactive",
         },
+        {
+            "email": "[email protected]",
+            "full_name": "Email Gateway",
+            "status": "bot",
+            "user_id": 6,
+        },
         {
             "email": "[email protected]",
             "full_name": "Notification Bot",
-            "status": "inactive",
+            "status": "bot",
             "user_id": 5,
         },
         {
             "email": "[email protected]",
             "full_name": "Welcome Bot",
-            "status": "inactive",
+            "status": "bot",
             "user_id": 4,
         },
         {
             "email": "[email protected]",
             "full_name": "Zulip Feedback Bot",
-            "status": "inactive",
+            "status": "bot",
             "user_id": 1,
         },
     ]

zulipterminal/model.py

@@ -1035,7 +1035,10 @@ def get_all_users(self) -> List[Dict[str, Any]]:
                 }
                 continue
             email = user["email"]
-            if email in presences:  # presences currently subset of all users
+            if user["is_bot"]:
+                # Bot has no dynamic status, so avoid presence lookup
+                status = "bot"
+            elif email in presences:  # presences currently subset of all users
                 """
                 * Aggregate our information on a user's presence across their
                 * clients.
@@ -1086,6 +1089,7 @@ def get_all_users(self) -> List[Dict[str, Any]]:
                 "user_id": user["user_id"],
                 "status": status,
             }
+
             self._all_users_by_id[user["user_id"]] = user
             self.user_id_email_dict[user["user_id"]] = email
 
@@ -1096,7 +1100,7 @@ def get_all_users(self) -> List[Dict[str, Any]]:
                 "full_name": bot["full_name"],
                 "email": email,
                 "user_id": bot["user_id"],
-                "status": "inactive",
+                "status": "bot",
             }
             self._cross_realm_bots_by_id[bot["user_id"]] = bot
             self._all_users_by_id[bot["user_id"]] = bot