refactor: Replace 'private' with 'direct' - rebased.

Author: Ajnus

tests/conftest.py

@@ -450,7 +450,7 @@ def msg_template_factory(
     """
     Generate message template for all types of messages(stream/PM/group)
     """
-    # TODO: Separate Message into distinct types for stream and private messages.
+    # TODO: Separate Message into distinct types for stream and direct messages.
     message = Message(
         id=msg_id,
         sender_full_name="Foo Foo",

tests/ui_tools/test_messages.py

@@ -71,7 +71,7 @@ def test_init_fails_with_bad_message_type(self):
         with pytest.raises(RuntimeError):
             MessageBox(message, self.model, None)
 
-    def test_private_message_to_self(self, mocker):
+    def test_direct_message_to_self(self, mocker):  # rebased
         message = dict(
             type="private",
             display_recipient=[
@@ -85,13 +85,14 @@ def test_private_message_to_self(self, mocker):
         )
         self.model.user_email = "foo@zulip.com"
         mocker.patch(
-            MODULE + ".MessageBox._is_private_message_to_self", return_value=True
+            MODULE + ".MessageBox._is_direct_message_to_self",  # rebased
+            return_value=True,
         )
         mocker.patch.object(MessageBox, "main_view")
         msg_box = MessageBox(message, self.model, None)
 
         assert msg_box.recipient_emails == ["foo@zulip.com"]
-        msg_box._is_private_message_to_self.assert_called_once_with()
+        msg_box._is_direct_message_to_self.assert_called_once_with()  # rebased
 
     @pytest.mark.parametrize(
         "content, expected_markup",

zulipterminal/model.py

@@ -1556,7 +1556,7 @@ def get_stream_by_id(streams: List[StreamData], stream_id: int) -> StreamData:
 
     def _handle_typing_event(self, event: Event) -> None:
         """
-        Handle typing notifications (in private messages)
+        Handle typing notifications (in direct messages)
         """
         assert event["type"] == "typing"
 

zulipterminal/ui_tools/messages.py

@@ -89,7 +89,7 @@ def __init__(self, message: Message, model: "Model", last_message: Any) -> None:
             raise RuntimeError("Invalid message type")
 
         if self.message["type"] == "private":
-            if self._is_private_message_to_self():
+            if self._is_direct_message_to_self():  # rebased
                 recipient = self.message["display_recipient"][0]
                 self.recipients_names = recipient["full_name"]
                 self.recipient_emails = [self.model.user_email]
@@ -147,7 +147,7 @@ def need_recipient_header(self) -> bool:
         else:
             raise RuntimeError("Invalid message type")
 
-    def _is_private_message_to_self(self) -> bool:
+    def _is_direct_message_to_self(self) -> bool:
         recipient_list = self.message["display_recipient"]
         return (
             len(recipient_list) == 1
@@ -1043,7 +1043,7 @@ def keypress(self, size: urwid_Size, key: str) -> Optional[str]:
             self.model.controller.view.middle_column.set_focus("footer")
         elif is_command_key("EDIT_MESSAGE", key):
             # User can't edit messages of others that already have a subject
-            # For private messages, subject = "" (empty string)
+            # For direct messages, subject = "" (empty string)
             # This also handles the realm_message_content_edit_limit_seconds == 0 case
             if (
                 self.message["sender_id"] != self.model.user_id
@@ -1115,7 +1115,7 @@ def keypress(self, size: urwid_Size, key: str) -> Optional[str]:
                         )
                         return key
                 else:
-                    # The remaining case is of a private message not belonging to user.
+                    # The remaining case is of a direct message not belonging to user.
                     # Which should be already handled by the topmost if block
                     raise RuntimeError(
                         "Reached unexpected block. This should be handled at the top."