Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

70_Pushalot: added support for TimeToLive parameter.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10699 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
talkabout 2016-02-02 19:23:13 +00:00
parent 92933594be
commit b9c6838db5
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- feature: 70_Pushalot: added support for TimeToLive parameter.
- bugfix: 60_allergy: fixed invalid readings names - bugfix: 60_allergy: fixed invalid readings names
- bugfix: 73_km200: Little Bugfix with the use around Regular Expressions - bugfix: 73_km200: Little Bugfix with the use around Regular Expressions
- feature: 91_notify: add readLog attribute - feature: 91_notify: add readLog attribute

41
fhem/FHEM/70_Pushalot.pm
View File

@ -24,6 +24,7 @@
# set PushNotification message "This is my message." "With Title" "http://www.xyz/image.png" "http://www.xyz.com"" # set PushNotification message "This is my message." "With Title" "http://www.xyz/image.png" "http://www.xyz.com""
# set PushNotification message "This is my message." "With Title" "http://www.xyz/image.png" "http://www.xyz.com" "Link Title" # set PushNotification message "This is my message." "With Title" "http://www.xyz/image.png" "http://www.xyz.com" "Link Title"
# set PushNotification message "This is my message." "With Title" "http://www.xyz/image.png" "http://www.xyz.com" "Link Title" True False # set PushNotification message "This is my message." "With Title" "http://www.xyz/image.png" "http://www.xyz.com" "Link Title" True False
# set PushNotification message "This is my message." "With Title" "http://www.xyz/image.png" "http://www.xyz.com" "Link Title" True False 5
# #
# Explantation: # Explantation:
# #
@ -34,6 +35,8 @@
# - The fifth parameter is an optional link title for the message # - The fifth parameter is an optional link title for the message
# - The sixth parameter defines whether the message should be marked as important # - The sixth parameter defines whether the message should be marked as important
# - The seventh parameter defines whether the message should be delivered silently # - The seventh parameter defines whether the message should be delivered silently
# - The eigth parameter defines the "time to live" in seconds for the message. After this time the message is automatically purged. Note: The Pushalot service is checking
# messages for purge every 5 minutes
# #
# For further documentation # For further documentation
# https://pushalot.com/api: # https://pushalot.com/api:
@ -139,17 +142,18 @@ sub Pushalot_Build_Body($@)
my ($hash, @args) = @_; my ($hash, @args) = @_;
my $string = join(" ", @args); my $string = join(" ", @args);
my @matches = ($string =~ /"[^"]*"| True| False/g); my @matches = ($string =~ /"[^"]*"| True| False| \d+/g);
my ($message, $title, $image, $link, $linkTitle, $important, $silent) = @matches; my ($message, $title, $image, $link, $linkTitle, $important, $silent, $timeToLive) = @matches;
$message =~ s/^[\s"]+|[\s"]+$//g; $message =~ s/^[\s"]+|[\s"]+$//g;
$title =~ s/^[\s"]+|[\s"]+$//g; $title =~ s/^[\s"]+|[\s"]+$//g;
$image =~ s/^[\s"]+|[\s"]+$//g; $image =~ s/^[\s"]+|[\s"]+$//g;
$link =~ s/^[\s"]+|[\s"]+$//g; $link =~ s/^[\s"]+|[\s"]+$//g;
$linkTitle =~ s/^[\s"]+|[\s"]+$//g; $linkTitle =~ s/^[\s"]+|[\s"]+$//g;
$important =~ s/^[\s"]+|[\s"]+$//g; $important =~ s/^[\s"]+|[\s"]+$//g;
$silent =~ s/^[\s"]+|[\s"]+$//g; $silent =~ s/^[\s"]+|[\s"]+$//g;
$timeToLive =~ s/^[\s"]+|[\s"]+$//g;
if ($message eq "") if ($message eq "")
{ {
@ -162,11 +166,12 @@ sub Pushalot_Build_Body($@)
. "&Source=" . $hash->{Source} . "&Source=" . $hash->{Source}
. "&Body=" . uri_escape($message) . "&Body=" . uri_escape($message)
. "&Title=" . uri_escape($title) . "&Title=" . uri_escape($title)
. "&Image=" . uri_escape($image) . ($image ? "&Image=" . uri_escape($image) : "")
. "&Link=" . uri_escape($link) . ($link ? "&Link=" . uri_escape($link) : "")
. "&LinkTitle=" . uri_escape($linkTitle) . ($linkTitle ? "&LinkTitle=" . uri_escape($linkTitle) : "")
. "&IsImportant=" . $important . "&IsImportant=" . $important
. "&IsSilent=" . $silent; . "&IsSilent=" . $silent
. "&TimeToLive=" . $timeToLive;
} }
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@ -317,6 +322,10 @@ sub Pushalot_Parse_Result($$$)
<td>&lt;silent&gt;</td> <td>&lt;silent&gt;</td>
<td>True|False: True if the message should be delivered silently (no notify sound is played), otherwise False (Default)</td> <td>True|False: True if the message should be delivered silently (no notify sound is played), otherwise False (Default)</td>
</tr> </tr>
<tr>
<td>&lt;time_to_live&gt;</td>
<td>The time in minutes after which the message is automatically purged</td>
</tr>
</table> </table>
<br> <br>
Examples: Examples:
@ -328,6 +337,7 @@ sub Pushalot_Parse_Result($$$)
<code>set PushNotification message "This is my message." "With Title" "http://www.xyz.com/image.png" "http://www.xyz.com" "Link Title" </code><br> <code>set PushNotification message "This is my message." "With Title" "http://www.xyz.com/image.png" "http://www.xyz.com" "Link Title" </code><br>
<code>set PushNotification message "This is my message." "With Title" "http://www.xyz.com/image.png" "http://www.xyz.com" "Link Title" True</code><br> <code>set PushNotification message "This is my message." "With Title" "http://www.xyz.com/image.png" "http://www.xyz.com" "Link Title" True</code><br>
<code>set PushNotification message "This is my message." "With Title" "http://www.xyz.com/image.png" "http://www.xyz.com" "Link Title" True False</code><br> <code>set PushNotification message "This is my message." "With Title" "http://www.xyz.com/image.png" "http://www.xyz.com" "Link Title" True False</code><br>
<code>set PushNotification message "This is my message." "With Title" "http://www.xyz.com/image.png" "http://www.xyz.com" "Link Title" True False 5</code><br>
</ul> </ul>
<br> <br>
</ul> </ul>
@ -424,6 +434,10 @@ sub Pushalot_Parse_Result($$$)
<td>&lt;silent&gt;</td> <td>&lt;silent&gt;</td>
<td>True|False: True wenn die Nachricht 'still' ausgeliefert werden soll (kein Benachrichtigungssound wird abgespielt), ansonsten False (Default)</td> <td>True|False: True wenn die Nachricht 'still' ausgeliefert werden soll (kein Benachrichtigungssound wird abgespielt), ansonsten False (Default)</td>
</tr> </tr>
<tr>
<td>&lt;time_to_live&gt;</td>
<td>Zeit in Minuten nach der die Nachricht automatisch entfernt wird. Achtung: Der Pushalot Service prüft zu löschende Nachrichten alle 5 Minuten</td>
</tr>
</table> </table>
<br> <br>
Beispiele: Beispiele:
@ -435,6 +449,7 @@ sub Pushalot_Parse_Result($$$)
<code>set PushNotification message "Das ist meine Nachricht." "Mit Titel" "http://www.xyz.com/image.png" "http://www.xyz.com" "Link Titel" </code><br> <code>set PushNotification message "Das ist meine Nachricht." "Mit Titel" "http://www.xyz.com/image.png" "http://www.xyz.com" "Link Titel" </code><br>
<code>set PushNotification message "Das ist meine Nachricht." "Mit Titel" "http://www.xyz.com/image.png" "http://www.xyz.com" "Link Titel" True</code><br> <code>set PushNotification message "Das ist meine Nachricht." "Mit Titel" "http://www.xyz.com/image.png" "http://www.xyz.com" "Link Titel" True</code><br>
<code>set PushNotification message "Das ist meine Nachricht." "Mit Titel" "http://www.xyz.com/image.png" "http://www.xyz.com" "Link Title" True False</code><br> <code>set PushNotification message "Das ist meine Nachricht." "Mit Titel" "http://www.xyz.com/image.png" "http://www.xyz.com" "Link Title" True False</code><br>
<code>set PushNotification message "Das ist meine Nachricht." "Mit Titel" "http://www.xyz.com/image.png" "http://www.xyz.com" "Link Title" True False 5</code><br>
</ul> </ul>
<br> <br>
Notes: Notes: