From 31488f1b2a8a19c90fddd2621abefa6e1708e287 Mon Sep 17 00:00:00 2001 From: Chris Caron Date: Sat, 31 Aug 2024 21:10:34 -0400 Subject: [PATCH] meta/docs added --- KEYWORDS | 1 + README.md | 1 + apprise/plugins/email.py | 12 +++++------- packaging/redhat/python-apprise.spec | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/KEYWORDS b/KEYWORDS index b67e068a97..ba12c02be8 100644 --- a/KEYWORDS +++ b/KEYWORDS @@ -81,6 +81,7 @@ Rocket.Chat RSyslog Ryver SendGrid +SendPulse ServerChan SES SFR diff --git a/README.md b/README.md index 164296d8b0..8b5486d29f 100644 --- a/README.md +++ b/README.md @@ -116,6 +116,7 @@ The table below identifies the services this tool supports and some example serv | [RSyslog](https://github.com/caronc/apprise/wiki/Notify_rsyslog) | rsyslog:// | (UDP) 514 | rsyslog://hostname
rsyslog://hostname/Facility | [Ryver](https://github.com/caronc/apprise/wiki/Notify_ryver) | ryver:// | (TCP) 443 | ryver://Organization/Token
ryver://botname@Organization/Token | [SendGrid](https://github.com/caronc/apprise/wiki/Notify_sendgrid) | sendgrid:// | (TCP) 443 | sendgrid://APIToken:FromEmail/
sendgrid://APIToken:FromEmail/ToEmail
sendgrid://APIToken:FromEmail/ToEmail1/ToEmail2/ToEmailN/ +| [SendPulse](https://github.com/caronc/apprise/wiki/Notify_sendpulse) | sendpulse:// | (TCP) 443 | sendpulse://user@host/ClientId/ClientSecret
sendpulse://user@host/ClientId/clientSecret/ToEmail
sendpulse://user@host/ClientId/ClientSecret/ToEmail1/ToEmail2/ToEmailN/ | [ServerChan](https://github.com/caronc/apprise/wiki/Notify_serverchan) | schan:// | (TCP) 443 | schan://sendkey/ | [Signal API](https://github.com/caronc/apprise/wiki/Notify_signal) | signal:// or signals:// | (TCP) 80 or 443 | signal://hostname:port/FromPhoneNo
signal://hostname:port/FromPhoneNo/ToPhoneNo
signal://hostname:port/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/ | [SimplePush](https://github.com/caronc/apprise/wiki/Notify_simplepush) | spush:// | (TCP) 443 | spush://apikey
spush://salt:password@apikey
spush://apikey?event=Apprise diff --git a/apprise/plugins/email.py b/apprise/plugins/email.py index 2e423916ac..f6878a0cfa 100644 --- a/apprise/plugins/email.py +++ b/apprise/plugins/email.py @@ -412,9 +412,7 @@ class NotifyEmail(NotifyBase): template_args = dict(NotifyBase.template_args, **{ 'to': { - 'name': _('To Email'), - 'type': 'string', - 'map_to': 'targets', + 'alias_of': 'targets', }, 'from': { 'name': _('From Email'), @@ -1107,14 +1105,14 @@ def parse_url(url): from_addr = NotifyEmail.unquote(results['qsd']['from']) if 'name' in results['qsd'] and len(results['qsd']['name']): - # Depricate use of both `from=` and `name=` in the same url as - # they will be synomomus of one another in the future. + # Use of both `from=` and `name=` in the same url are + # synonymous of one another from_addr = formataddr( (NotifyEmail.unquote(results['qsd']['name']), from_addr), charset='utf-8') logger.warning( - 'Email name= and from= are synonymous; ' - 'use one or the other.') + 'Email name= and from= are synonymous of one another; ' + 'using from=') elif 'name' in results['qsd'] and len(results['qsd']['name']): # Extract from name to associate with from address diff --git a/packaging/redhat/python-apprise.spec b/packaging/redhat/python-apprise.spec index dd6253be7f..374c8d3984 100644 --- a/packaging/redhat/python-apprise.spec +++ b/packaging/redhat/python-apprise.spec @@ -48,11 +48,11 @@ Windows, Microsoft Teams, Misskey, MQTT, MSG91, MyAndroid, Nexmo, Nextcloud, NextcloudTalk, Notica, Notifiarr, Notifico, ntfy, Office365, OneSignal, Opsgenie, PagerDuty, PagerTree, ParsePlatform, PopcornNotify, Prowl, Pushalot, PushBullet, Pushjet, PushMe, Pushover, PushSafer, Pushy, PushDeer, Revolt, -Reddit, Rocket.Chat, RSyslog, SendGrid, ServerChan, SFR, Signal, SimplePush, -Sinch, Slack, SMSEagle, SMS Manager, SMTP2Go, SparkPost, Splunk, Super Toasty, -Streamlabs, Stride, Synology Chat, Syslog, Techulus Push, Telegram, Threema -Gateway, Twilio, Twitter, Twist, VictorOps, Voipms, Vonage, WeCom Bot, -WhatsApp, Webex Teams, Workflows, XBMC} +Reddit, Rocket.Chat, RSyslog, SendGrid, SendPulse, ServerChan, SFR, Signal, +SimplePush, Sinch, Slack, SMSEagle, SMS Manager, SMTP2Go, SparkPost, Splunk, +Super Toasty, Streamlabs, Stride, Synology Chat, Syslog, Techulus Push, +Telegram, Threema Gateway, Twilio, Twitter, Twist, VictorOps, Voipms, Vonage, +WeCom Bot, WhatsApp, Webex Teams, Workflows, XBMC} Name: python-%{pypi_name} Version: 1.8.1