github
/
apprise
mirror of https://github.com/caronc/apprise
1
0
Fork 0
Code Issues Releases Wiki Activity

Mailgun to support `from=` for consistency with `email://` (#711)

pull/719/head
Chris Caron 2022-10-25 17:30:45 -04:00 committed by GitHub
parent c13bf84d03
commit b3cca772f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apprise/plugins/NotifyMailgun.py
View File

@ -160,6 +160,9 @@ class NotifyMailgun(NotifyBase):
'type': 'string', 'type': 'string',
'map_to': 'from_name', 'map_to': 'from_name',
}, },
'from': {
'alias_of': 'name',
},
'region': { 'region': {
'name': _('Region Name'), 'name': _('Region Name'),
'type': 'choice:string', 'type': 'choice:string',
@ -642,6 +645,12 @@ class NotifyMailgun(NotifyBase):
results['from_name'] = \ results['from_name'] = \
NotifyMailgun.unquote(results['qsd']['name']) NotifyMailgun.unquote(results['qsd']['name'])
# Support from= for consistency with `mail://`
elif 'from' in results['qsd'] and len(results['qsd']['from']):
# Extract from name to associate with from address
results['from_name'] = \
NotifyMailgun.unquote(results['qsd']['name'])
if 'region' in results['qsd'] and len(results['qsd']['region']): if 'region' in results['qsd'] and len(results['qsd']['region']):
# Extract from name to associate with from address # Extract from name to associate with from address
results['region_name'] = \ results['region_name'] = \

6
test/test_plugin_mailgun.py
View File

@ -107,6 +107,12 @@ apprise_url_tests = (
'a' * 32, 'b' * 8, 'c' * 8), { 'a' * 32, 'b' * 8, 'c' * 8), {
'instance': NotifyMailgun, 'instance': NotifyMailgun,
}), }),
# We can use the `from=` directive as well:
('mailgun://user@localhost.localdomain/{}-{}-{}'
'?:from=Chris&:status=admin'.format(
'a' * 32, 'b' * 8, 'c' * 8), {
'instance': NotifyMailgun,
}),
# bcc and cc # bcc and cc
('mailgun://user@localhost.localdomain/{}-{}-{}' ('mailgun://user@localhost.localdomain/{}-{}-{}'
'?bcc=user@example.com&cc=user2@example.com'.format( '?bcc=user@example.com&cc=user2@example.com'.format(