CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-06-24 21:08:25 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

search refactor: Replace confusing != 0 idiom in search code.

Browse Source 
We want to say `if num_after > 0` when we expect num_after to be
a positive integer.  We don't want any confusion that we will
execute the blocks for values of -7 or None.
This commit is contained in:
Steve Howell 2018-03-12 14:41:35 -04:00 committed by Tim Abbott
parent 988f28630b
commit e77350dc8e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/views/messages.py
View File

@ -633,7 +633,7 @@ def get_messages_backend(request: HttpRequest, user_profile: UserProfile,
# specified to ensure that the resulting list always contains the
# anchor message. If a narrow was specified, the anchor message
# might not match the narrow anyway.
if num_after != 0:
if num_after > 0:
num_after += num_extra_messages
else:
num_before += num_extra_messages
@ -672,14 +672,14 @@ def get_messages_backend(request: HttpRequest, user_profile: UserProfile,
before_query = None
after_query = None
if num_before != 0:
if num_before > 0:
before_anchor = anchor
if num_after != 0:
if num_after > 0:
# Don't include the anchor in both the before query and the after query
before_anchor = anchor - 1
before_query = query.where(inner_msg_id_col <= before_anchor) \
.order_by(inner_msg_id_col.desc()).limit(num_before)
if num_after != 0:
if num_after > 0:
after_query = query.where(inner_msg_id_col >= anchor) \
.order_by(inner_msg_id_col.asc()).limit(num_after)