FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

50_Signalbot: Added OS release as model

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25299 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Adimarantis 2021-12-05 13:22:12 +00:00
parent bb5cff611f
commit d0337483e4
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fhem/FHEM/50_Signalbot.pm
View File

@ -1,6 +1,6 @@
############################################## ##############################################
#$Id$ #$Id$
my $Signalbot_VERSION="3.1"; my $Signalbot_VERSION="3.2";
# Simple Interface to Signal CLI running as Dbus service # Simple Interface to Signal CLI running as Dbus service
# Author: Adimarantis # Author: Adimarantis
# License: GPL # License: GPL
@ -644,7 +644,7 @@ sub Signalbot_MessageReceived ($@) {
my $sourceRegex = quotemeta($source); my $sourceRegex = quotemeta($source);
my $groupIdRegex = quotemeta($group); my $groupIdRegex = quotemeta($group);
my $allowedPeer = AttrVal($hash->{NAME},"allowedPeer",undef); my $allowedPeer = AttrVal($hash->{NAME},"allowedPeer",undef);
my $babble=1;
if(!defined $allowedPeer || $allowedPeer =~ /^.*$senderRegex.*$/ || $allowedPeer =~ /^.*$sourceRegex.*$/ || ($groupIdRegex ne "" && $allowedPeer =~ /^.*$groupIdRegex.*$/)) { if(!defined $allowedPeer || $allowedPeer =~ /^.*$senderRegex.*$/ || $allowedPeer =~ /^.*$sourceRegex.*$/ || ($groupIdRegex ne "" && $allowedPeer =~ /^.*$groupIdRegex.*$/)) {
#Copy previous redings to keep history of on message #Copy previous redings to keep history of on message
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
@ -656,7 +656,11 @@ sub Signalbot_MessageReceived ($@) {
readingsBulkUpdate($hash, "prevMsgAttachment", ReadingsVal($hash->{NAME}, "msgAttachment", undef)) if defined ReadingsVal($hash->{NAME}, "msgAttachment", undef); readingsBulkUpdate($hash, "prevMsgAttachment", ReadingsVal($hash->{NAME}, "msgAttachment", undef)) if defined ReadingsVal($hash->{NAME}, "msgAttachment", undef);
readingsEndUpdate($hash, 0); readingsEndUpdate($hash, 0);
$message=Signalbot_command($hash,$source,$message); my $cmd=AttrVal($hash->{NAME},"cmdKeyword",undef);
if ($message =~ /^$cmd(.*)/) {
$babble=0; #Skip Babble execution in command mode
$message=Signalbot_command($hash,$source,$message);
}
$message=encode_utf8($message); $message=encode_utf8($message);
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBulkUpdate($hash, "msgAttachment", trim($atr)); readingsBulkUpdate($hash, "msgAttachment", trim($atr));
@ -686,7 +690,7 @@ sub Signalbot_MessageReceived ($@) {
$replyPeer="#".$groupIdRegex if (defined $groupIdRegex and $groupIdRegex ne ""); $replyPeer="#".$groupIdRegex if (defined $groupIdRegex and $groupIdRegex ne "");
#Activate Babble integration, only if sender or sender group is in babblePeer #Activate Babble integration, only if sender or sender group is in babblePeer
if (defined $bDevice && defined $bPeer && defined $replyPeer) { if (defined $bDevice && defined $bPeer && defined $replyPeer && $babble==1) {
if ($bPeer =~ /^.*$senderRegex.*$/ || $bPeer =~ /^.*$sourceRegex.*$/ || ($groupIdRegex ne "" && $bPeer =~ /^.*$groupIdRegex.*$/)) { if ($bPeer =~ /^.*$senderRegex.*$/ || $bPeer =~ /^.*$sourceRegex.*$/ || ($groupIdRegex ne "" && $bPeer =~ /^.*$groupIdRegex.*$/)) {
Log3 $hash->{NAME}, 4, $hash->{NAME}.": Calling Babble for $message ($replyPeer)"; Log3 $hash->{NAME}, 4, $hash->{NAME}.": Calling Babble for $message ($replyPeer)";
if ($defs{$bDevice} && $defs{$bDevice}->{TYPE} eq "Babble") { if ($defs{$bDevice} && $defs{$bDevice}->{TYPE} eq "Babble") {
@ -829,6 +833,7 @@ sub Signalbot_setup2($@) {
#to be on the safe side allow 2 digits for lowest version number, so 0.8.0 results to 800 #to be on the safe side allow 2 digits for lowest version number, so 0.8.0 results to 800
$hash->{helper}{version}=$ver[0]*1000+$ver[1]*100+$ver[2]; $hash->{helper}{version}=$ver[0]*1000+$ver[1]*100+$ver[2];
$hash->{VERSION}="Signalbot:".$Signalbot_VERSION." signal-cli:".$version." Protocol::DBus:".$Protocol::DBus::VERSION; $hash->{VERSION}="Signalbot:".$Signalbot_VERSION." signal-cli:".$version." Protocol::DBus:".$Protocol::DBus::VERSION;
$hash->{model}=SignalBot_OSRel();
if($hash->{helper}{version}>800) { if($hash->{helper}{version}>800) {
my $state=Signalbot_CallS($hash,"isRegistered"); my $state=Signalbot_CallS($hash,"isRegistered");
#Signal-cli 0.9.0 : isRegistered not existing and will return undef when in multi-mode (or false with my PR) #Signal-cli 0.9.0 : isRegistered not existing and will return undef when in multi-mode (or false with my PR)
@ -1783,7 +1788,7 @@ sub SignalBot_replaceCommands(@) {
return ($msg, @processed); return ($msg, @processed);
} }
my ( $isMediaStream, $type ) = SignalBot_IdentifyStream( $hash, $msg ) if ( defined( $msg ) ); my ( $isMediaStream, $type ) = SignalBot_IdentifyStream( $hash, $msg );
if ($isMediaStream<0) { if ($isMediaStream<0) {
Log3 $hash->{NAME}, 5, $hash->{NAME}.": Media stream found $isMediaStream $type"; Log3 $hash->{NAME}, 5, $hash->{NAME}.": Media stream found $isMediaStream $type";
my $tmpfilename="/tmp/signalbot".gettimeofday().".".$type; my $tmpfilename="/tmp/signalbot".gettimeofday().".".$type;
@ -1816,6 +1821,23 @@ sub SignalBot_replaceCommands(@) {
return (undef,@processed); return (undef,@processed);
} }
#Get OSRelease Version
sub SignalBot_OSRel() {
my $fh;
if (!open($fh, "<", "/etc/os-release")) {
return "Unknown";
}
while (my $line = <$fh>) {
chomp($line);
if ($line =~ /PRETTY_NAME="(.*)"/) {
close ($fh);
return $1;
}
}
close ($fh);
return "Unknown";
}
###################################### ######################################
# Get a string and identify possible media streams # Get a string and identify possible media streams
@ -2038,7 +2060,7 @@ For German documentation see <a href="https://wiki.fhem.de/wiki/Signalbot">Wiki<
</li> </li>
<li><b>babblePeer</b><br> <li><b>babblePeer</b><br>
<a id="Signalbot-attr-babblePeer"></a> <a id="Signalbot-attr-babblePeer"></a>
Comma separated list of recipient(s) and/or groupId(s) that will trigger that messages are forwarded to a Babble module defined by "BabbleDev". This can be used to interpret real language interpretation of messages as a chatbot or to trigger FHEM events.<br> Comma separated list of recipient(s) and/or groupId(s) that will trigger that messages are forwarded to a Babble module defined by "babbleDev". This can be used to interpret real language interpretation of messages as a chatbot or to trigger FHEM events.<br>
<b>If the attribute is not defined, nothing is sent to Babble</b> <b>If the attribute is not defined, nothing is sent to Babble</b>
</li> </li>
<li><b>babbleDev</b><br> <li><b>babbleDev</b><br>
@ -2046,6 +2068,10 @@ For German documentation see <a href="https://wiki.fhem.de/wiki/Signalbot">Wiki<
Name of Babble Device to be used. This will typically be automatically filled when bubblePeer is set.<br> Name of Babble Device to be used. This will typically be automatically filled when bubblePeer is set.<br>
<b>If the attribute is not defined, nothing is sent to Babble</b> <b>If the attribute is not defined, nothing is sent to Babble</b>
</li> </li>
<li><b>babbleExclude</b><br>
<a id="Signalbot-attr-babbleExclude"></a>
RegExp pattern that, when matched, will exclude messages to be processed by the Babble connection<br>
</li>
<li><b>commandKeyword</b><br> <li><b>commandKeyword</b><br>
<a id="Signalbot-attr-commandKeyword"></a> <a id="Signalbot-attr-commandKeyword"></a>
One or more characters that mark a message as GoogleAuth protected command which is directly forwarded to FHEM for processing. Example: for "="<br> One or more characters that mark a message as GoogleAuth protected command which is directly forwarded to FHEM for processing. Example: for "="<br>