From c60f197fdecce185d648387e6e96e62bf4131bbf Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulipchat.com>
Date: Tue, 13 Mar 2018 16:05:55 -0700
Subject: [PATCH] do_update_message_flags: Accept a Client object.

This is important for upcoming logging changes.
---
 zerver/lib/actions.py       | 1 +
 zerver/tests/test_events.py | 6 +++---
 zerver/views/messages.py    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py
index 779035a8c3..81fcaa5a1d 100644
--- a/zerver/lib/actions.py
+++ b/zerver/lib/actions.py
@@ -3614,6 +3614,7 @@ def do_mark_stream_messages_as_read(user_profile: UserProfile,
     return count
 
 def do_update_message_flags(user_profile: UserProfile,
+                            client: Client,
                             operation: str,
                             flag: str,
                             messages: Optional[Sequence[int]]) -> int:
diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py
index 6e30cb51e9..b9cb0af705 100644
--- a/zerver/tests/test_events.py
+++ b/zerver/tests/test_events.py
@@ -749,7 +749,7 @@ class EventsRegisterTest(ZulipTestCase):
         )
         user_profile = self.example_user('hamlet')
         events = self.do_test(
-            lambda: do_update_message_flags(user_profile, 'add', 'starred', [message]),
+            lambda: do_update_message_flags(user_profile, get_client("website"), 'add', 'starred', [message]),
             state_change_expected=False,
         )
         error = schema_checker('events[0]', events[0])
@@ -762,7 +762,7 @@ class EventsRegisterTest(ZulipTestCase):
             ('operation', equals("remove")),
         ])
         events = self.do_test(
-            lambda: do_update_message_flags(user_profile, 'remove', 'starred', [message]),
+            lambda: do_update_message_flags(user_profile, get_client("website"), 'remove', 'starred', [message]),
             state_change_expected=False,
         )
         error = schema_checker('events[0]', events[0])
@@ -781,7 +781,7 @@ class EventsRegisterTest(ZulipTestCase):
             )
 
             self.do_test(
-                lambda: do_update_message_flags(user_profile, 'add', 'read', [message]),
+                lambda: do_update_message_flags(user_profile, get_client("website"), 'add', 'read', [message]),
                 state_change_expected=True,
             )
 
diff --git a/zerver/views/messages.py b/zerver/views/messages.py
index c6acc278dc..e1bc0a35d5 100644
--- a/zerver/views/messages.py
+++ b/zerver/views/messages.py
@@ -974,7 +974,7 @@ def update_message_flags(request: HttpRequest, user_profile: UserProfile,
                          messages: List[int]=REQ(validator=check_list(check_int)),
                          operation: str=REQ('op'), flag: str=REQ()) -> HttpResponse:
 
-    count = do_update_message_flags(user_profile, operation, flag, messages)
+    count = do_update_message_flags(user_profile, request.client, operation, flag, messages)
 
     target_count_str = str(len(messages))
     log_data_str = "[%s %s/%s] actually %s" % (operation, flag, target_count_str, count)