paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

message_send: Add service_queue_events to SendMessageRequest.

Browse Source 
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 <p359101898@gmail.com>
This commit is contained in:
Zixuan James Li
2022-07-29 17:56:10 -04:00
committed by Tim Abbott
parent 5ae0b08b6c
commit 9f2dfd848f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/actions/message_send.py
View File

@@ -818,7 +818,7 @@ def do_send_messages(
ums.extend(user_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, sender=send_request.message.sender,
service_bot_tuples=send_request.service_bot_tuples, service_bot_tuples=send_request.service_bot_tuples,
mentioned_user_ids=mentioned_user_ids, mentioned_user_ids=mentioned_user_ids,
@@ -983,7 +983,8 @@ def do_send_messages(
send_welcome_bot_response(send_request) 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: for event in events:
queue_json_publish( queue_json_publish(
queue_name, queue_name,

1
zerver/lib/message.py
View File

@@ -171,6 +171,7 @@ class SendMessageRequest:
deliver_at: Optional[datetime.datetime] = None deliver_at: Optional[datetime.datetime] = None
delivery_type: Optional[str] = None delivery_type: Optional[str] = None
limit_unread_user_ids: Optional[Set[int]] = 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 # We won't try to fetch more unread message IDs from the database than