updated docs and removed security on gateway id

README.md

@@ -146,7 +146,7 @@ The table below identifies the services this tool supports and some example serv
 | [Signal API](https://github.com/caronc/apprise/wiki/Notify_signal) | signal://  or signals:// | (TCP) 80 or 443  | signal://hostname:port/FromPhoneNo<br/>signal://hostname:port/FromPhoneNo/ToPhoneNo<br/>signal://hostname:port/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
 | [Sinch](https://github.com/caronc/apprise/wiki/Notify_sinch) | sinch://  | (TCP) 443   | sinch://ServicePlanId:ApiToken@FromPhoneNo<br/>sinch://ServicePlanId:ApiToken@FromPhoneNo/ToPhoneNo<br/>sinch://ServicePlanId:ApiToken@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/<br/>sinch://ServicePlanId:ApiToken@ShortCode/ToPhoneNo<br/>sinch://ServicePlanId:ApiToken@ShortCode/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
 | [SMSEagle](https://github.com/caronc/apprise/wiki/Notify_smseagle) | smseagle://  or smseagles:// | (TCP) 80 or 443  | smseagles://hostname:port/ToPhoneNo<br/>smseagles://hostname:port/@ToContact<br/>smseagles://hostname:port/#ToGroup<br/>smseagles://hostname:port/ToPhoneNo1/#ToGroup/@ToContact/
-| [Threema Gateway](https://github.com/caronc/apprise/wiki/Notify_threema) | threema://  | (TCP) 443   | threema://GatewayID@secret<br/>threema://GatewayID@secret/ToPhoneNo<br/>threema://GatewayID@secret/ToEmail<br/>threema://GatewayID@secret/ToThreemaID/<br/>threema://GatewayID@secret/ToEmail/ToThreemaID/ToPhoneNo/...
+| [Threema Gateway](https://github.com/caronc/apprise/wiki/Notify_threema) | threema://  | (TCP) 443   | threema://GatewayID@secret/ToPhoneNo<br/>threema://GatewayID@secret/ToEmail<br/>threema://GatewayID@secret/ToThreemaID/<br/>threema://GatewayID@secret/ToEmail/ToThreemaID/ToPhoneNo/...
 | [Twilio](https://github.com/caronc/apprise/wiki/Notify_twilio) | twilio://  | (TCP) 443   | twilio://AccountSid:AuthToken@FromPhoneNo<br/>twilio://AccountSid:AuthToken@FromPhoneNo/ToPhoneNo<br/>twilio://AccountSid:AuthToken@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/<br/>twilio://AccountSid:AuthToken@FromPhoneNo/ToPhoneNo?apikey=Key<br/>twilio://AccountSid:AuthToken@ShortCode/ToPhoneNo<br/>twilio://AccountSid:AuthToken@ShortCode/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
 | [Voipms](https://github.com/caronc/apprise/wiki/Notify_voipms) | voipms://  | (TCP) 443   | voipms://password:email/FromPhoneNo<br/>voipms://password:email/FromPhoneNo/ToPhoneNo<br/>voipms://password:email/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
 | [Vonage](https://github.com/caronc/apprise/wiki/Notify_nexmo) (formerly Nexmo) | nexmo://  | (TCP) 443   | nexmo://ApiKey:ApiSecret@FromPhoneNo<br/>nexmo://ApiKey:ApiSecret@FromPhoneNo/ToPhoneNo<br/>nexmo://ApiKey:ApiSecret@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/

apprise/plugins/NotifyThreema.py

@@ -314,8 +314,7 @@ def url(self, privacy=False, *args, **kwargs):
             '{schema}://{gatewayid}@{secret}/{targets}?{params}'
         return schemaStr.format(
             schema=self.secure_protocol,
-            gatewayid=self.pprint(
-                self.user, privacy, mode=PrivacyMode.Secret, safe=''),
+            gatewayid=NotifyThreema.quote(self.user),
             secret=self.pprint(
                 self.secret, privacy, mode=PrivacyMode.Secret, safe=''),
             targets='/'.join(chain(

test/test_plugin_threema.py

@@ -58,21 +58,21 @@
         # Invalid target phone number
         'instance': NotifyThreema,
         'notify_response': False,
-        'privacy_url': 'threema://****@****/2222',
+        'privacy_url': 'threema://%2ATHEGWID@****/2222',
     }),
     ('threema://*THEGWID@secret/{targets}/'.format(
         targets='/'.join(['16134442222'])), {
 
         # Valid
         'instance': NotifyThreema,
-        'privacy_url': 'threema://****@****/16134442222',
+        'privacy_url': 'threema://%2ATHEGWID@****/16134442222',
     }),
     ('threema://*THEGWID@secret/{targets}/'.format(
         targets='/'.join(['16134442222', '16134443333'])), {
 
         # Valid multiple targets
         'instance': NotifyThreema,
-        'privacy_url': 'threema://****@****/16134442222/16134443333',
+        'privacy_url': 'threema://%2ATHEGWID@****/16134442222/16134443333',
     }),
     ('threema:///?secret=secret&from=*THEGWID&to={targets}'.format(
         targets=','.join(['16134448888', '[email protected]', 'abcd1234'])), {