@@ -111,9 +111,11 @@ def __init__(self, message: Message, model: "Model", last_message: Any) -> None:
111
111
112
112
def need_recipient_header (self ) -> bool :
113
113
# Prevent redundant information in recipient bar
114
- if len (self .model .narrow ) == 1 and self .model .narrow [0 ][0 ] == "pm_with" :
114
+ narrow = self .model .get_narrow ()
115
+ narrow_length = self .model .get_narrow_length ()
116
+ if narrow_length == 1 and narrow [0 ][0 ] == "pm_with" :
115
117
return False
116
- if len ( self . model . narrow ) == 2 and self . model . narrow [1 ][0 ] == "topic" :
118
+ if narrow_length == 2 and narrow [1 ][0 ] == "topic" :
117
119
return False
118
120
119
121
last_msg = self .last_message
@@ -193,7 +195,7 @@ def top_header_bar(self, message_view: Any) -> Any:
193
195
return message_view .private_header ()
194
196
195
197
def top_search_bar (self ) -> Any :
196
- curr_narrow = self .model .narrow
198
+ curr_narrow = self .model .get_narrow ()
197
199
is_search_narrow = self .model .is_search_narrow ()
198
200
if is_search_narrow :
199
201
curr_narrow = [
@@ -890,6 +892,8 @@ def mouse_event(
890
892
return super ().mouse_event (size , event , button , col , row , focus )
891
893
892
894
def keypress (self , size : urwid_Size , key : str ) -> Optional [str ]:
895
+ narrow = self .model .get_narrow ()
896
+ narrow_length = self .model .get_narrow_length ()
893
897
if is_command_key ("REPLY_MESSAGE" , key ):
894
898
if self .message ["type" ] == "private" :
895
899
self .model .controller .view .write_box .private_box_view (
@@ -902,7 +906,10 @@ def keypress(self, size: urwid_Size, key: str) -> Optional[str]:
902
906
stream_id = self .stream_id ,
903
907
)
904
908
elif is_command_key ("STREAM_MESSAGE" , key ):
905
- if len (self .model .narrow ) != 0 and self .model .narrow [0 ][0 ] == "stream" :
909
+ if (
910
+ narrow_length != 0
911
+ and narrow [0 ][0 ] == "stream"
912
+ ):
906
913
self .model .controller .view .write_box .stream_box_view (
907
914
caption = self .message ["display_recipient" ],
908
915
stream_id = self .stream_id ,
@@ -923,7 +930,10 @@ def keypress(self, size: urwid_Size, key: str) -> Optional[str]:
923
930
elif is_command_key ("TOGGLE_NARROW" , key ):
924
931
self .model .unset_search_narrow ()
925
932
if self .message ["type" ] == "private" :
926
- if len (self .model .narrow ) == 1 and self .model .narrow [0 ][0 ] == "pm_with" :
933
+ if (
934
+ narrow_length == 1
935
+ and narrow [0 ][0 ] == "pm_with"
936
+ ):
927
937
self .model .controller .narrow_to_all_pm (
928
938
contextual_message_id = self .message ["id" ],
929
939
)
@@ -933,7 +943,7 @@ def keypress(self, size: urwid_Size, key: str) -> Optional[str]:
933
943
contextual_message_id = self .message ["id" ],
934
944
)
935
945
elif self .message ["type" ] == "stream" :
936
- if len ( self . model . narrow ) > 1 : # in a topic
946
+ if narrow_length > 1 : # in a topic
937
947
self .model .controller .narrow_to_stream (
938
948
stream_name = self .stream_name ,
939
949
contextual_message_id = self .message ["id" ],
0 commit comments