From 9f2dfd848f2d5ff42a94e5e65ea2e5fe580d2c2c Mon Sep 17 00:00:00 2001 From: Zixuan James Li Date: Fri, 29 Jul 2022 17:56:10 -0400 Subject: [PATCH] message_send: Add service_queue_events to SendMessageRequest. We should not monkey-patch message when unnecessary. Adding `service_queue_events` to `SendMessageRequests` suits our need to type safety here. Signed-off-by: Zixuan James Li --- zerver/actions/message_send.py | 5 +++-- zerver/lib/message.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/zerver/actions/message_send.py b/zerver/actions/message_send.py index 8689e9104b..87e590191a 100644 --- a/zerver/actions/message_send.py +++ b/zerver/actions/message_send.py @@ -818,7 +818,7 @@ def do_send_messages( ums.extend(user_messages) - send_request.message.service_queue_events = get_service_bot_events( + send_request.service_queue_events = get_service_bot_events( sender=send_request.message.sender, service_bot_tuples=send_request.service_bot_tuples, mentioned_user_ids=mentioned_user_ids, @@ -983,7 +983,8 @@ def do_send_messages( send_welcome_bot_response(send_request) - for queue_name, events in send_request.message.service_queue_events.items(): + assert send_request.service_queue_events is not None + for queue_name, events in send_request.service_queue_events.items(): for event in events: queue_json_publish( queue_name, diff --git a/zerver/lib/message.py b/zerver/lib/message.py index 358756b302..21b7a376f0 100644 --- a/zerver/lib/message.py +++ b/zerver/lib/message.py @@ -171,6 +171,7 @@ class SendMessageRequest: deliver_at: Optional[datetime.datetime] = None delivery_type: Optional[str] = None limit_unread_user_ids: Optional[Set[int]] = None + service_queue_events: Optional[Dict[str, List[Dict[str, Any]]]] = None # We won't try to fetch more unread message IDs from the database than