c3lf/c3lf-system-3
9
0
Fork 0
Code Issues 55 Pull requests Projects 2 Releases Wiki Activity Actions

stash

Browse source
This commit is contained in:
j3d1 2023-12-06 05:06:26 +01:00
parent 76dd805262
commit 470541d239
4 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/mail/protocol.py
View file

@ -46,12 +46,12 @@ async def send_smtp(message, log):
await aiosmtplib.send(message, hostname="127.0.0.1", port=25, use_tls=False, start_tls=False)
def find_active_issue_thread(in_reply_to):
def find_active_issue_thread(in_reply_to, subject=None):
reply_to = Email.objects.filter(reference=in_reply_to)
if reply_to.exists():
return reply_to.first().issue_thread
else:
return IssueThread.objects.create()
return IssueThread.objects.create(name=subject)
class LMTPHandler:
@ -102,6 +102,7 @@ class LMTPHandler:
recipient = envelope.rcpt_tos[0]
sender = envelope.mail_from
subject = parsed.get('Subject')
target_event = None
try:
address_map = await sync_to_async(EventAddress.objects.get)(address=recipient)
@ -110,12 +111,12 @@ class LMTPHandler:
except EventAddress.DoesNotExist:
pass
active_issue_thread = await sync_to_async(find_active_issue_thread)(header_in_reply_to)
active_issue_thread = await sync_to_async(find_active_issue_thread)(header_in_reply_to, subject)
email = await sync_to_async(Email.objects.create)(sender=sender,
recipient=recipient,
body=body.decode('utf-8'),
subject=parsed.get('Subject'),
subject=subject,
reference=header_message_id,
in_reply_to=header_in_reply_to,
raw=envelope.content.decode('utf-8'),

12
core/mail/tests/v2/test_mails.py
View file

@ -83,11 +83,16 @@ class LMTPHandlerTestCase(TestCase): # TODO replace with less hacky test
self.assertTrue(Email.objects.all()[1].reference.startswith("<"))
self.assertTrue(Email.objects.all()[1].reference.endswith("@localhost>"))
self.assertEqual(Email.objects.all()[1].in_reply_to, "<1@test>")
self.assertEqual(IssueThread.objects.all()[0].name, 'test')
self.assertEqual(IssueThread.objects.all()[0].state, 'new')
self.assertEqual(IssueThread.objects.all()[0].assigned_to, None)
def test_handle_client_reply(self):
issue_thread = IssueThread.objects.create()
issue_thread = IssueThread.objects.create(
name="test",
)
mail1 = Email.objects.create(
subject='test',
subject='test subject',
body='test',
sender='test1@test',
recipient='test2@test',
@ -134,6 +139,9 @@ class LMTPHandlerTestCase(TestCase): # TODO replace with less hacky test
self.assertTrue(Email.objects.all()[3].reference.startswith("<"))
self.assertTrue(Email.objects.all()[3].reference.endswith("@localhost>"))
self.assertEqual(Email.objects.all()[3].in_reply_to, "<3@test>")
self.assertEqual(IssueThread.objects.all()[0].name, 'test')
self.assertEqual(IssueThread.objects.all()[0].state, 'new')
self.assertEqual(IssueThread.objects.all()[0].assigned_to, None)
# class AsyncLMTPTestCase(TestCase):
#