-
Notifications
You must be signed in to change notification settings - Fork 84
Allow django_backend to take advantage of message_streams #103
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
nicholasserra
merged 3 commits into
themartorana:master
from
hkhanna:backend-message-stream
Oct 15, 2021
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,12 @@ def __init__(self, *args, **kwargs): | |
| else: | ||
| self.track_opens = getattr(settings, 'POSTMARK_TRACK_OPENS', False) | ||
|
|
||
| if 'message_stream' in kwargs: | ||
| self.message_stream = kwargs['message_stream'] | ||
| del kwargs['message_stream'] | ||
| else: | ||
| self.message_stream = None | ||
|
|
||
| super(PMEmailMessage, self).__init__(*args, **kwargs) | ||
|
|
||
|
|
||
|
|
@@ -38,6 +44,13 @@ def __init__(self, *args, **kwargs): | |
| else: | ||
| self.track_opens = getattr(settings, 'POSTMARK_TRACK_OPENS', False) | ||
|
|
||
| if 'message_stream' in kwargs: | ||
| self.message_stream = kwargs['message_stream'] | ||
| del kwargs['message_stream'] | ||
| else: | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same comment as above ^ |
||
| self.message_stream = None | ||
|
|
||
|
|
||
| super(PMEmailMultiAlternatives, self).__init__(*args, **kwargs) | ||
|
|
||
|
|
||
|
|
@@ -117,6 +130,7 @@ def _build_message(self, message): | |
| else: | ||
| attachments.append(item) | ||
|
|
||
| message_stream = getattr(message, 'message_stream', None) | ||
| postmark_message = PMMail(api_key=self.api_key, | ||
| subject=message.subject, | ||
| sender=message.from_email, | ||
|
|
@@ -127,7 +141,8 @@ def _build_message(self, message): | |
| html_body=html_body, | ||
| reply_to=reply_to, | ||
| custom_headers=custom_headers, | ||
| attachments=attachments) | ||
| attachments=attachments, | ||
| message_stream=message_stream) | ||
|
|
||
| postmark_message.tag = getattr(message, 'tag', None) | ||
| postmark_message.track_opens = getattr(message, 'track_opens', False) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you also test the case where you can pass
message_streaminto the EmailMessage kwargs? As opposed to setting it on the instance after instantiation? I ask because these other kwargstrack_opensandtagdel the kwarg afterThinking we probably need to do the same here as it might raise an error upstream.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch! I've added it. But note that I can't find any reference to these classes anywhere, including the README.
I'm guessing users can use these as a convenience if they want to pass args to the
__init__()function of anEmailMultiAlternativessubclass. But the way the README suggests usage is just to settagormessage_streamas an attribute onEmailMultiAlternativesafter instantiation.