From 9ebb536c2db12738137be64e682abeccdb25c353 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Tue, 10 Sep 2013 11:32:40 -0400 Subject: [PATCH] Use json_to_bool in REQ instead of manually using ujson.loads (imported from commit 5a607f7aba4a8e4e5920a35df06c375cff98ff55) --- zerver/lib/actions.py | 2 +- zerver/views/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index 86588719d6..313b4d1b52 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -1093,7 +1093,7 @@ def update_user_presence(user_profile, client, log_time, status, queue_json_publish("user_activity", event, process_user_presence_event) - if ujson.loads(new_user_input): + if new_user_input: update_user_activity_interval(user_profile, log_time) def do_update_message_flags(user_profile, operation, flag, messages, all): diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py index 2ae89841d8..749db5cb40 100644 --- a/zerver/views/__init__.py +++ b/zerver/views/__init__.py @@ -1815,7 +1815,7 @@ def get_status_list(requesting_user_profile): @authenticated_json_post_view @has_request_variables def json_update_active_status(request, user_profile, status=REQ, - new_user_input=REQ(default=False)): + new_user_input=REQ(converter=json_to_bool, default=False)): status_val = UserPresence.status_from_string(status) if status_val is None: raise JsonableError("Invalid presence status: %s" % (status,))