Skip to content

Commit c551abc

Browse files
committed
helper: Replace direct access to Model.narrow with functions.
This commit replaces all instances where Model.narrow is directly used with usage of functions Model.get_narrow() and Model.get_narrow_length() in order to limit direct access to Model.narrow to Model class.
1 parent 70cdb9e commit c551abc

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

zulipterminal/helper.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,8 @@ def index_messages(messages: List[Message], model: Any, index: Index) -> Index:
396396
},
397397
}
398398
"""
399-
narrow = model.narrow
399+
narrow = model.get_narrow()
400+
narrow_length = model.get_narrow_length()
400401
for msg in messages:
401402
if "edit_history" in msg:
402403
index["edited_messages"].add(msg["id"])
@@ -409,7 +410,7 @@ def index_messages(messages: List[Message], model: Any, index: Index) -> Index:
409410
index["search"].add(msg["id"])
410411
continue
411412

412-
if len(narrow) == 1:
413+
if narrow_length == 1:
413414
if narrow[0][1] == "starred" and "starred" in msg["flags"]:
414415
index["starred_msg_ids"].add(msg["id"])
415416

@@ -436,7 +437,7 @@ def index_messages(messages: List[Message], model: Any, index: Index) -> Index:
436437

437438
if (
438439
msg["type"] == "stream"
439-
and len(narrow) == 2
440+
and narrow_length == 2
440441
and narrow[1][1] == msg["subject"]
441442
):
442443
topics_in_stream = index["topic_msg_ids"][msg["stream_id"]]
@@ -648,7 +649,7 @@ def display_error_if_present(response: Dict[str, Any], controller: Any) -> None:
648649
def check_narrow_and_notify(
649650
outer_narrow: List[Any], inner_narrow: List[Any], controller: Any
650651
) -> None:
651-
current_narrow = controller.model.narrow
652+
current_narrow = controller.model.get_narrow()
652653

653654
if (
654655
current_narrow != []

0 commit comments

Comments
 (0)