[Pushsafer] Remove default parameter expire=3600

Author: amotl

HANDBOOK.md

@@ -2469,10 +2469,12 @@ For a list of available icons, sounds and other params see the
 [Pushsafer API](https://www.pushsafer.com/en/pushapi).
 
 Please note:
-- The default value for the [_Expire_](https://www.pushsafer.com/en/pushapi_ext#API-EX)
-  parameter is `3600`.
-  
-- `vibration=0` means "device-default" vibration.
+- [Retry](https://www.pushsafer.com/en/pushapi_ext#API-RE)
+  with [Expire](https://www.pushsafer.com/en/pushapi_ext#API-EX): 
+  For configuring delivery retries, you must set both parameters.
+- [Vibration](https://www.pushsafer.com/en/pushapi_ext#API-V):
+  `vibration=0` means "device-default" vibration. This is a special value
+  used by mqttwarn, it will be translated to an empty `v=` upstream parameter.
 
 | Topic option  |  M/O   | Description                            |
 | ------------- | :----: | -------------------------------------- |

mqttwarn/services/pushsafer.py

@@ -131,9 +131,7 @@ def encode_v1(self):
         except IndexError:
             raise PushsaferConfigurationError(f"Pushsafer private or alias key not configured")
 
-        params = {
-            'expire': 3600,
-        }
+        params = OrderedDict()
 
         if len(addrs) > 1:
             params['d'] = addrs[1]
@@ -192,13 +190,9 @@ def encode_v2(self):
         except KeyError:
             raise PushsaferConfigurationError(f"Pushsafer private or alias key not configured")
 
-        params = {
-            'expire': 3600,
-        }
-
         # Decode and serialize all other parameters.
         pp = PushsaferParameters(**addrs)
-        params.update(pp.translated())
+        params = pp.translated()
 
         # Propagate `title` separately.
         if title is not None:

tests/services/pushsafer/util.py

@@ -9,7 +9,6 @@ def get_reference_data(**more_data):
     data = {
         "m": "⚽ Notification message ⚽",
         "k": "myToken",
-        "expire": "3600",
     }
     data.update(more_data)
     return data