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

event_queue: Convert users argument of send_event to list.

Browse Source 
set is not JSON serializable, and orjson enforces this.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-08-07 02:57:25 -07:00
committed by Tim Abbott
parent fe5c524890
commit 25c20a21bd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/tests/test_bots.py
View File

@@ -429,7 +429,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
), ),
event['event'], event['event'],
) )
self.assertEqual(event['users'], {user_profile.id}) self.assertEqual(event['users'], [user_profile.id])
def test_add_bot_with_default_sending_stream_private_denied(self) -> None: def test_add_bot_with_default_sending_stream_private_denied(self) -> None:
self.login('hamlet') self.login('hamlet')
@@ -504,7 +504,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
), ),
event['event'], event['event'],
) )
self.assertEqual(event['users'], {user_profile.id}) self.assertEqual(event['users'], [user_profile.id])
def test_add_bot_with_default_events_register_stream_private_denied(self) -> None: def test_add_bot_with_default_events_register_stream_private_denied(self) -> None:
self.login('hamlet') self.login('hamlet')

2
zerver/tornado/event_queue.py
View File

@@ -1184,5 +1184,5 @@ def send_event(realm: Realm, event: Mapping[str, Any],
the user/message pair.""" the user/message pair."""
port = get_tornado_port(realm) port = get_tornado_port(realm)
queue_json_publish(notify_tornado_queue_name(port), queue_json_publish(notify_tornado_queue_name(port),
dict(event=event, users=users), dict(event=event, users=list(users)),
lambda *args, **kwargs: send_notification_http(realm, *args, **kwargs)) lambda *args, **kwargs: send_notification_http(realm, *args, **kwargs))