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

queue_processor: Remove email_body from the invite email events.

Browse Source 
We removed the use of email_body field in 47fcb27e39, but was
still passed in events from do_resend_user_invite_email and
in tests. So this commit removes the email_body field from
these places.
This commit is contained in:
sahil839
2021-06-23 00:33:27 +05:30
committed by Tim Abbott
parent 81e2c3825c
commit 6a191a7bf0
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zerver/lib/actions.py
View File

@@ -6951,7 +6951,6 @@ def do_resend_user_invite_email(prereg_user: PreregistrationUser) -> int:
event = { event = {
"prereg_id": prereg_user.id, "prereg_id": prereg_user.id,
"referrer_id": prereg_user.referred_by.id, "referrer_id": prereg_user.referred_by.id,
"email_body": None,
} }
queue_json_publish("invites", event) queue_json_publish("invites", event)

4
zerver/tests/test_queue_worker.py
View File

@@ -441,9 +441,9 @@ class WorkerTest(ZulipTestCase):
email=self.nonreg_email("bob"), referred_by=inviter, realm=inviter.realm email=self.nonreg_email("bob"), referred_by=inviter, realm=inviter.realm
) )
data: List[Dict[str, Any]] = [ data: List[Dict[str, Any]] = [
dict(prereg_id=prereg_alice.id, referrer_id=inviter.id, email_body=None), dict(prereg_id=prereg_alice.id, referrer_id=inviter.id),
# Nonexistent prereg_id, as if the invitation was deleted # Nonexistent prereg_id, as if the invitation was deleted
dict(prereg_id=-1, referrer_id=inviter.id, email_body=None), dict(prereg_id=-1, referrer_id=inviter.id),
] ]
for element in data: for element in data:
fake_client.enqueue("invites", element) fake_client.enqueue("invites", element)