messages: [To update].

[To update].

Test updated [and added?].

Author: Sushmey

tests/ui_tools/test_messages.py

@@ -766,6 +766,7 @@ def test_main_view(self, mocker, message, last_message):
         [
             {
                 "id": 4,
+                "sender_id": 4,
                 "type": "stream",
                 "display_recipient": "Verona",
                 "stream_id": 5,
@@ -804,6 +805,7 @@ def test_main_view_renders_slash_me(self, mocker, message, content, is_me_messag
         [
             {
                 "id": 4,
+                "sender_id": 4,
                 "type": "stream",
                 "display_recipient": "Verona",
                 "stream_id": 5,
@@ -1047,6 +1049,7 @@ def test_msg_generates_search_and_header_bar(
         [
             {
                 "id": 4,
+                "sender_id": 4,
                 "type": "stream",
                 "display_recipient": "Verona",
                 "stream_id": 5,
@@ -1072,11 +1075,11 @@ def test_msg_generates_search_and_header_bar(
         "expected_header, to_vary_in_last_message",
         [
             (
-                [STATUS_INACTIVE, "alice", " ", "DAYDATETIME"],
-                {"sender_full_name": "bob"},
+                [STATUS_INACTIVE, "alice (4)", " ", "DAYDATETIME"],
+                {"sender_id": "4"},
             ),
             ([" ", " ", " ", "DAYDATETIME"], {"timestamp": 1532103779}),
-            ([STATUS_INACTIVE, "alice", " ", "DAYDATETIME"], {"timestamp": 0}),
+            ([STATUS_INACTIVE, "alice (4)", " ", "DAYDATETIME"], {"timestamp": 0}),
         ],
         ids=[
             "show_author_as_authors_different",
@@ -1172,7 +1175,7 @@ def test_main_view_generates_EDITED_label(
     @pytest.mark.parametrize(
         "to_vary_in_last_message, update_required",
         [
-            ({"sender_full_name": "Unique name (won't be in next message)"}, True),
+            ({"sender_id": "Unique id (won't be in next message)"}, True),
             ({}, False),
         ],
         ids=[

zulipterminal/ui_tools/messages.py

@@ -691,8 +691,17 @@ def main_view(self) -> List[Any]:
             if any(
                 different[key] for key in ("recipients", "author", "author_id", "24h")
             ):
-                text["author"] = ("msg_sender", message["this"]["author"])
-
+                if self.model.is_user_name_duplicate(message["this"]["author"]):
+                    text["author"] = (
+                        "msg_sender",
+                        message["this"]["author"]
+                        + " "
+                        + "("
+                        + str(message["this"]["author_id"])
+                        + ")",
+                    )
+                else:
+                    text["author"] = ("msg_sender", message["this"]["author"])
                 # TODO: Refactor to use user ids for look up instead of emails.
                 email = self.message.get("sender_email", "")
                 user = self.model.user_dict.get(email, None)