mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

50_SSChatBot: contrib 1.6.1

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22007 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
DS_Starter
2020-05-22 17:42:15 +00:00
parent 429950db3c
commit cf93b643a0
1 changed files with 276 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

438
fhem/contrib/DS_Starter/50_SSChatBot.pm
View File

@@ -35,20 +35,21 @@ package main;
use strict; use strict;
use warnings; use warnings;
eval "use JSON;1;" or my $SSChatBotMM = "JSON"; # Debian: apt-get install libjson-perl eval "use JSON;1;" or my $SSChatBotMM = "JSON"; ## no critic 'eval' # Debian: apt-get install libjson-perl
use Data::Dumper; # Perl Core module use Data::Dumper; # Perl Core module
use MIME::Base64; use MIME::Base64;
use Time::HiRes; use Time::HiRes;
use HttpUtils; use HttpUtils;
use Encode; use Encode;
no if $] >= 5.017011, warnings => 'experimental::smartmatch'; no if $] >= 5.017011, warnings => 'experimental::smartmatch';
eval "use FHEM::Meta;1" or my $modMetaAbsent = 1; eval "use FHEM::Meta;1" or my $modMetaAbsent = 1; ## no critic 'eval'
eval "use Net::Domain qw(hostname hostfqdn hostdomain domainname);1" or my $SSChatBotNDom = "Net::Domain"; eval "use Net::Domain qw(hostname hostfqdn hostdomain domainname);1" or my $SSChatBotNDom = "Net::Domain"; ## no critic 'eval'
# no if $] >= 5.017011, warnings => 'experimental'; # no if $] >= 5.017011, warnings => 'experimental';
# Versions History intern # Versions History intern
our %SSChatBot_vNotesIntern = ( my %SSChatBot_vNotesIntern = (
"1.6.1" => "22.05.2020 changes according to PBP ",
"1.6.0" => "22.05.2020 replace \" H\" with \"%20H\" in attachments due to problem in HttpUtils ", "1.6.0" => "22.05.2020 replace \" H\" with \"%20H\" in attachments due to problem in HttpUtils ",
"1.5.0" => "15.03.2020 slash commands set in interactive answer field 'value' will be executed ", "1.5.0" => "15.03.2020 slash commands set in interactive answer field 'value' will be executed ",
"1.4.0" => "15.03.2020 rename '1_sendItem' to 'asyncSendItem' because of Aesthetics ", "1.4.0" => "15.03.2020 rename '1_sendItem' to 'asyncSendItem' because of Aesthetics ",
@@ -63,7 +64,7 @@ our %SSChatBot_vNotesIntern = (
); );
# Versions History extern # Versions History extern
our %SSChatBot_vNotesExtern = ( my %SSChatBot_vNotesExtern = (
"1.4.0" => "15.03.2020 Command '1_sendItem' renamed to 'asyncSendItem' because of Aesthetics ", "1.4.0" => "15.03.2020 Command '1_sendItem' renamed to 'asyncSendItem' because of Aesthetics ",
"1.3.0" => "13.03.2020 The set command 'sendItem' was renamed to '1_sendItem' to avoid changing the botToken by chance. ". "1.3.0" => "13.03.2020 The set command 'sendItem' was renamed to '1_sendItem' to avoid changing the botToken by chance. ".
"Also attachments are allowed now in the '1_sendItem' command. ", "Also attachments are allowed now in the '1_sendItem' command. ",
@@ -115,7 +116,7 @@ sub SSChatBot_Initialize {
"httptimeout ". "httptimeout ".
$readingFnAttributes; $readingFnAttributes;
eval { FHEM::Meta::InitMod( __FILE__, $hash ) }; # für Meta.pm (https://forum.fhem.de/index.php/topic,97589.0.html) FHEM::Meta::InitMod( __FILE__, $hash ) if(!$modMetaAbsent); # für Meta.pm (https://forum.fhem.de/index.php/topic,97589.0.html)
return; return;
} }
@@ -236,7 +237,7 @@ return;
sub SSChatBot_Attr { sub SSChatBot_Attr {
my ($cmd,$name,$aName,$aVal) = @_; my ($cmd,$name,$aName,$aVal) = @_;
my $hash = $defs{$name}; my $hash = $defs{$name};
my ($do,$val,$cache); my ($do,$val);
# $cmd can be "del" or "set" # $cmd can be "del" or "set"
# $name is device name # $name is device name
@@ -250,11 +251,11 @@ sub SSChatBot_Attr {
$val = ($do == 1 ? "disabled" : "initialized"); $val = ($do == 1 ? "disabled" : "initialized");
if ($do == 1) { if ($do == 1) {
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
} else { } else {
InternalTimer(gettimeofday()+2, "SSChatBot_initonboot", $hash, 0) if($init_done); InternalTimer(gettimeofday()+2, "SSChatBot_initonboot", $hash, 0) if($init_done);
} }
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBulkUpdate ($hash, "state", $val); readingsBulkUpdate ($hash, "state", $val);
@@ -262,14 +263,14 @@ sub SSChatBot_Attr {
} }
if ($cmd eq "set") { if ($cmd eq "set") {
if ($aName =~ m/httptimeout/) { if ($aName =~ m/httptimeout/x) {
unless ($aVal =~ /^\d+$/) { return "The Value for $aName is not valid. Use only figures 1-9 !";} unless ($aVal =~ /^\d+$/x) { return "The Value for $aName is not valid. Use only figures 1-9 !";}
} }
if ($aName =~ m/ownCommand([1-9][0-9]*)$/) { if ($aName =~ m/ownCommand([1-9][0-9]*)$/) {
my $num = $1; my $num = $1;
return "The value of $aName must start with a slash like \"/Weather \"." unless ($aVal =~ /^\/.*$/); return qq{The value of $aName must start with a slash like "/Weather ".} unless ($aVal =~ /^\/.*$/);
addToDevAttrList($name, "ownCommand".($num+1)); # add neue ownCommand dynamisch addToDevAttrList($name, "ownCommand".($num+1)); # add neue ownCommand dynamisch
} }
} }
@@ -277,15 +278,16 @@ return;
} }
################################################################ ################################################################
sub SSChatBot_Set { sub SSChatBot_Set { ## no critic 'complexity'
my ($hash, @a) = @_; my ($hash, @a) = @_;
return "\"set X\" needs at least an argument" if ( @a < 2 ); return qq{"set X" needs at least an argument} if ( @a < 2 );
my $name = $a[0]; my @items = @a;
my $opt = $a[1]; my $name = shift @a;
my $prop = $a[2]; my $opt = shift @a;
my $prop1 = $a[3]; my $prop = shift @a;
my $prop2 = $a[4]; my $prop1 = shift @a;
my $prop3 = $a[5]; my $prop2 = shift @a;
my $prop3 = shift @a;
my ($success,$setlist); my ($success,$setlist);
return if(IsDisabled($name)); return if(IsDisabled($name));
@@ -295,7 +297,7 @@ sub SSChatBot_Set {
if(!$hash->{TOKEN}) { if(!$hash->{TOKEN}) {
# initiale setlist für neue Devices # initiale setlist für neue Devices
$setlist = "Unknown argument $opt, choose one of ". $setlist = "Unknown argument $opt, choose one of ".
"botToken " "botToken "
; ;
} else { } else {
$setlist = "Unknown argument $opt, choose one of ". $setlist = "Unknown argument $opt, choose one of ".
@@ -311,16 +313,16 @@ sub SSChatBot_Set {
return "The command \"$opt\" needs an argument." if (!$prop); return "The command \"$opt\" needs an argument." if (!$prop);
($success) = SSChatBot_setToken($hash,$prop,"botToken"); ($success) = SSChatBot_setToken($hash,$prop,"botToken");
if($success) { if($success) {
CommandGet(undef, "$name chatUserlist"); # Chatuser Liste abrufen CommandGet(undef, "$name chatUserlist"); # Chatuser Liste abrufen
return "botToken saved successfully"; return qq{botToken saved successfully};
} else { } else {
return "Error while saving botToken - see logfile for details"; return qq{Error while saving botToken - see logfile for details};
} }
} elsif ($opt eq "listSendqueue") { } elsif ($opt eq "listSendqueue") {
my $sub = sub ($) { my $sub = sub ($) {
my ($idx) = @_; my $idx = shift;
my $ret; my $ret;
foreach my $key (reverse sort keys %{$data{SSChatBot}{$name}{sendqueue}{entries}{$idx}}) { foreach my $key (reverse sort keys %{$data{SSChatBot}{$name}{sendqueue}{entries}{$idx}}) {
$ret .= ", " if($ret); $ret .= ", " if($ret);
@@ -330,13 +332,13 @@ sub SSChatBot_Set {
}; };
if (!keys %{$data{SSChatBot}{$name}{sendqueue}{entries}}) { if (!keys %{$data{SSChatBot}{$name}{sendqueue}{entries}}) {
return "SendQueue is empty."; return qq{SendQueue is empty.};
} }
my $sq; my $sq;
foreach my $idx (sort{$a<=>$b} keys %{$data{SSChatBot}{$name}{sendqueue}{entries}}) { foreach my $idx (sort{$a<=>$b} keys %{$data{SSChatBot}{$name}{sendqueue}{entries}}) {
$sq .= $idx." => ".$sub->($idx)."\n"; $sq .= $idx." => ".$sub->($idx)."\n";
} }
return $sq; return $sq;
} elsif ($opt eq "purgeSendqueue") { } elsif ($opt eq "purgeSendqueue") {
if($prop eq "-all-") { if($prop eq "-all-") {
@@ -344,15 +346,17 @@ sub SSChatBot_Set {
delete $data{SSChatBot}{$name}{sendqueue}{entries}; delete $data{SSChatBot}{$name}{sendqueue}{entries};
$data{SSChatBot}{$name}{sendqueue}{index} = 0; $data{SSChatBot}{$name}{sendqueue}{index} = 0;
return "All entries of SendQueue are deleted"; return "All entries of SendQueue are deleted";
} elsif($prop eq "-permError-") { } elsif($prop eq "-permError-") {
foreach my $idx (keys %{$data{SSChatBot}{$name}{sendqueue}{entries}}) { foreach my $idx (keys %{$data{SSChatBot}{$name}{sendqueue}{entries}}) {
delete $data{SSChatBot}{$name}{sendqueue}{entries}{$idx} delete $data{SSChatBot}{$name}{sendqueue}{entries}{$idx}
if($data{SSChatBot}{$name}{sendqueue}{entries}{$idx}{forbidSend}); if($data{SSChatBot}{$name}{sendqueue}{entries}{$idx}{forbidSend});
} }
return "All entries with state \"permanent send error\" are deleted"; return qq{All entries with state "permanent send error" are deleted};
} else { } else {
delete $data{SSChatBot}{$name}{sendqueue}{entries}{$prop}; delete $data{SSChatBot}{$name}{sendqueue}{entries}{$prop};
return "SendQueue entry with index \"$prop\" deleted"; return qq{SendQueue entry with index "$prop" deleted};
} }
} elsif ($opt eq "asyncSendItem") { } elsif ($opt eq "asyncSendItem") {
@@ -361,20 +365,21 @@ sub SSChatBot_Set {
# text="<https://www.synology.com>" users="user1" # text="<https://www.synology.com>" users="user1"
# text="Check this!! <https://www.synology.com|Click here> for details!" users="user1,user2" # text="Check this!! <https://www.synology.com|Click here> for details!" users="user1,user2"
# text="a fun image" fileUrl="http://imgur.com/xxxxx" users="user1,user2" # text="a fun image" fileUrl="http://imgur.com/xxxxx" users="user1,user2"
return undef if(!$hash->{HELPER}{USERFETCHED}); return if(!$hash->{HELPER}{USERFETCHED});
my ($text,$users); my ($text,$users);
my ($fileUrl,$attachment) = ("",""); my ($fileUrl,$attachment) = ("","");
my $cmd = join(" ", map { $_ =~ s/\s//g; $_; } @a ); my $cmd = join(" ", map { my $p = $_; $p =~ s/\s//g; $p; } @items);
my ($a,$h) = parseParams($cmd); my ($arr,$h) = parseParams($cmd);
if($h) { if($h) {
$text = $h->{text} if(defined $h->{text}); $text = $h->{text} if(defined $h->{text});
$users = $h->{users} if(defined $h->{users}); $users = $h->{users} if(defined $h->{users});
$fileUrl = $h->{fileUrl} if(defined $h->{fileUrl}); $fileUrl = $h->{fileUrl} if(defined $h->{fileUrl});
$attachment = SSChatBot_formString($h->{attachments}, "attachement") if(defined $h->{attachments}); $attachment = SSChatBot_formString($h->{attachments}, "attachement") if(defined $h->{attachments});
} }
if($a) { if($arr) {
my @t = @{$a}; my @t = @{$arr};
shift @t; shift @t; shift @t; shift @t;
$text = join(" ", @t) if(!$text); $text = join(" ", @t) if(!$text);
} }
@@ -392,7 +397,7 @@ sub SSChatBot_Set {
foreach (@ua) { foreach (@ua) {
next if(!$_); next if(!$_);
my $uid = $hash->{HELPER}{USERS}{$_}{id}; my $uid = $hash->{HELPER}{USERS}{$_}{id};
return "The receptor \"$_\" seems to be unknown because its ID coulnd't be found." if(!$uid); return qq{The receptor "$_" seems to be unknown because its ID coulnd't be found.} if(!$uid);
# Eintrag zur SendQueue hinzufügen # Eintrag zur SendQueue hinzufügen
# Werte: (name,opmode,method,userid,text,fileUrl,channel,attachment) # Werte: (name,opmode,method,userid,text,fileUrl,channel,attachment)
@@ -406,7 +411,7 @@ sub SSChatBot_Set {
if($ret) { if($ret) {
return $ret; return $ret;
} else { } else {
return "The SendQueue has been restarted."; return qq{The SendQueue has been restarted.};
} }
} else { } else {
@@ -417,33 +422,33 @@ return;
} }
################################################################ ################################################################
sub SSChatBot_Get { sub SSChatBot_Get { ## no critic 'complexity'
my ($hash, @a) = @_; my ($hash, @a) = @_;
return "\"get X\" needs at least an argument" if ( @a < 2 ); return "\"get X\" needs at least an argument" if ( @a < 2 );
my $name = shift @a; my $name = shift @a;
my $opt = shift @a; my $opt = shift @a;
my $arg = shift @a; my $arg = shift @a;
my $arg1 = shift @a; my $arg1 = shift @a;
my $arg2 = shift @a; my $arg2 = shift @a;
my $ret = ""; my $ret = "";
my $getlist; my $getlist;
if(!$hash->{TOKEN}) { if(!$hash->{TOKEN}) {
return; return;
} else { } else {
$getlist = "Unknown argument $opt, choose one of ". $getlist = "Unknown argument $opt, choose one of ".
"storedToken:noArg ". "storedToken:noArg ".
"chatUserlist:noArg ". "chatUserlist:noArg ".
"chatChannellist:noArg ". "chatChannellist:noArg ".
"versionNotes " "versionNotes "
; ;
} }
return if(IsDisabled($name)); return if(IsDisabled($name));
if ($opt eq "storedToken") { if ($opt eq "storedToken") {
if (!$hash->{TOKEN}) {return "Token of $name is not set - make sure you've set it with \"set $name botToken <TOKEN>\"";} if (!$hash->{TOKEN}) {return "Token of $name is not set - make sure you've set it with \"set $name botToken <TOKEN>\"";}
# Token abrufen # Token abrufen
my ($success, $token) = SSChatBot_getToken($hash,0,"botToken"); my ($success, $token) = SSChatBot_getToken($hash,0,"botToken");
unless ($success) {return "Token couldn't be retrieved successfully - see logfile"}; unless ($success) {return "Token couldn't be retrieved successfully - see logfile"};
@@ -453,9 +458,10 @@ sub SSChatBot_Get {
"$token \n" "$token \n"
; ;
} elsif ($opt eq "chatUserlist") { } elsif ($opt eq "chatUserlist") {
# übergebenen CL-Hash (FHEMWEB) in Helper eintragen # übergebenen CL-Hash (FHEMWEB) in Helper eintragen
SSChatBot_getclhash($hash,1); SSChatBot_delclhash ($name);
SSChatBot_getclhash($hash,1);
# Eintrag zur SendQueue hinzufügen # Eintrag zur SendQueue hinzufügen
# Werte: (name,opmode,method,userid,text,fileUrl,channel,attachment) # Werte: (name,opmode,method,userid,text,fileUrl,channel,attachment)
@@ -465,7 +471,8 @@ sub SSChatBot_Get {
} elsif ($opt eq "chatChannellist") { } elsif ($opt eq "chatChannellist") {
# übergebenen CL-Hash (FHEMWEB) in Helper eintragen # übergebenen CL-Hash (FHEMWEB) in Helper eintragen
SSChatBot_getclhash($hash,1); SSChatBot_delclhash ($name);
SSChatBot_getclhash($hash,1);
# Eintrag zur SendQueue hinzufügen # Eintrag zur SendQueue hinzufügen
# Werte: (name,opmode,method,userid,text,fileUrl,channel,attachment) # Werte: (name,opmode,method,userid,text,fileUrl,channel,attachment)
@@ -473,24 +480,24 @@ sub SSChatBot_Get {
SSChatBot_getapisites($name); SSChatBot_getapisites($name);
} elsif ($opt =~ /versionNotes/) { } elsif ($opt =~ /versionNotes/x) {
my $header = "<b>Module release information</b><br>"; my $header = "<b>Module release information</b><br>";
my $header1 = "<b>Helpful hints</b><br>"; my $header1 = "<b>Helpful hints</b><br>";
my %hs; my %hs;
# Ausgabetabelle erstellen # Ausgabetabelle erstellen
my ($ret,$val0,$val1); my ($ret,$val0,$val1);
my $i = 0; my $i = 0;
$ret = "<html>"; $ret = "<html>";
# Hints # Hints
if(!$arg || $arg =~ /hints/ || $arg =~ /[\d]+/) { if(!$arg || $arg =~ /hints/x || $arg =~ /[\d]+/x) {
$ret .= sprintf("<div class=\"makeTable wide\"; style=\"text-align:left\">$header1 <br>"); $ret .= sprintf("<div class=\"makeTable wide\"; style=\"text-align:left\">$header1 <br>");
$ret .= "<table class=\"block wide internals\">"; $ret .= "<table class=\"block wide internals\">";
$ret .= "<tbody>"; $ret .= "<tbody>";
$ret .= "<tr class=\"even\">"; $ret .= "<tr class=\"even\">";
if($arg && $arg =~ /[\d]+/) { if($arg && $arg =~ /[\d]+/x) {
my @hints = split(",",$arg); my @hints = split(",",$arg);
foreach (@hints) { foreach (@hints) {
if(AttrVal("global","language","EN") eq "DE") { if(AttrVal("global","language","EN") eq "DE") {
@@ -526,7 +533,7 @@ sub SSChatBot_Get {
} }
# Notes # Notes
if(!$arg || $arg =~ /rel/) { if(!$arg || $arg =~ /rel/x) {
$ret .= sprintf("<div class=\"makeTable wide\"; style=\"text-align:left\">$header <br>"); $ret .= sprintf("<div class=\"makeTable wide\"; style=\"text-align:left\">$header <br>");
$ret .= "<table class=\"block wide internals\">"; $ret .= "<table class=\"block wide internals\">";
$ret .= "<tbody>"; $ret .= "<tbody>";
@@ -548,15 +555,15 @@ sub SSChatBot_Get {
$ret .= "</tbody>"; $ret .= "</tbody>";
$ret .= "</table>"; $ret .= "</table>";
$ret .= "</div>"; $ret .= "</div>";
} }
$ret .= "</html>"; $ret .= "</html>";
return $ret; return $ret;
} else { } else {
return "$getlist"; return "$getlist";
} }
return $ret; # not generate trigger out of command return $ret; # not generate trigger out of command
} }
@@ -585,7 +592,7 @@ sub SSChatBot_initonboot {
my $room = AttrVal($name, "room", "Chat"); my $room = AttrVal($name, "room", "Chat");
my $port = 8082; my $port = 8082;
while (grep(/^$port$/ , @FWports)) { # den ersten freien FHEMWEB-Port ab 8082 finden while (grep {/^$port$/} @FWports) { # den ersten freien FHEMWEB-Port ab 8082 finden
$port++; $port++;
} }
@@ -610,29 +617,29 @@ sub SSChatBot_initonboot {
} else { } else {
Log3($name, 2, "$name - ERROR while creating FHEMWEB instance ".$hash->{FW}." with webname \"$FWname\" !"); Log3($name, 2, "$name - ERROR while creating FHEMWEB instance ".$hash->{FW}." with webname \"$FWname\" !");
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBulkUpdate ($hash, "state", "ERROR in initialization - see logfile"); readingsBulkUpdate ($hash, "state", "ERROR in initialization - see logfile");
readingsEndUpdate ($hash,1); readingsEndUpdate ($hash,1);
} }
} }
if(!$ret) { if(!$ret) {
CommandGet(undef, "$name chatUserlist"); # Chatuser Liste initial abrufen CommandGet(undef, "$name chatUserlist"); # Chatuser Liste initial abrufen
my $host = hostname(); # eigener Host my $host = hostname(); # eigener Host
my $fqdn = hostfqdn(); # MYFQDN eigener Host my $fqdn = hostfqdn(); # MYFQDN eigener Host
chop($fqdn) if($fqdn =~ /^.*\.$/); # eventuellen "." nach dem FQDN entfernen chop($fqdn) if($fqdn =~ /^.*\.$/); # eventuellen "." nach dem FQDN entfernen
my $FWchatport = $defs{$FW}{PORT}; my $FWchatport = $defs{$FW}{PORT};
my $FWprot = AttrVal($FW, "HTTPS", 0); my $FWprot = AttrVal($FW, "HTTPS", 0);
$FWname = AttrVal($FW, "webname", 0); $FWname = AttrVal($FW, "webname", 0);
CommandAttr(undef, "$FW csrfToken none") if(!AttrVal($FW, "csrfToken", "")); CommandAttr(undef, "$FW csrfToken none") if(!AttrVal($FW, "csrfToken", ""));
$csrf = $defs{$FW}{CSRFTOKEN}?$defs{$FW}{CSRFTOKEN}:""; $csrf = $defs{$FW}{CSRFTOKEN}?$defs{$FW}{CSRFTOKEN}:"";
$hash->{OUTDEF} = ($FWprot?"https":"http")."://".($fqdn?$fqdn:$host).":".$FWchatport."/".$FWname."/outchat?botname=".$name."&fwcsrf=".$csrf; $hash->{OUTDEF} = ($FWprot?"https":"http")."://".($fqdn?$fqdn:$host).":".$FWchatport."/".$FWname."/outchat?botname=".$name."&fwcsrf=".$csrf;
SSChatBot_addExtension($name, "SSChatBot_CGI", "outchat"); SSChatBot_addExtension($name, "SSChatBot_CGI", "outchat");
$hash->{HELPER}{INFIX} = "outchat"; $hash->{HELPER}{INFIX} = "outchat";
} }
} else { } else {
InternalTimer(gettimeofday()+3, "SSChatBot_initonboot", $hash, 0); InternalTimer(gettimeofday()+3, "SSChatBot_initonboot", $hash, 0);
@@ -717,7 +724,7 @@ sub SSChatBot_checkretry {
my $rc = $data{SSChatBot}{$name}{sendqueue}{entries}{$idx}{retryCount}; my $rc = $data{SSChatBot}{$name}{sendqueue}{entries}{$idx}{retryCount};
my $errorcode = ReadingsVal($name, "Errorcode", 0); my $errorcode = ReadingsVal($name, "Errorcode", 0);
if($errorcode =~ /100|101|117|120|407|409|410|800|900/) { # bei diesen Errorcodes den Queueeintrag nicht wiederholen, da dauerhafter Fehler ! if($errorcode =~ /100|101|117|120|407|409|410|800|900/x) { # bei diesen Errorcodes den Queueeintrag nicht wiederholen, da dauerhafter Fehler !
$forbidSend = SSChatBot_experror($hash,$errorcode); # Fehlertext zum Errorcode ermitteln $forbidSend = SSChatBot_experror($hash,$errorcode); # Fehlertext zum Errorcode ermitteln
$data{SSChatBot}{$name}{sendqueue}{entries}{$idx}{forbidSend} = $forbidSend; $data{SSChatBot}{$name}{sendqueue}{entries}{$idx}{forbidSend} = $forbidSend;
@@ -760,7 +767,6 @@ sub SSChatBot_checkretry {
return return
} }
sub SSChatBot_getapisites ($) { sub SSChatBot_getapisites ($) {
my ($name) = @_; my ($name) = @_;
my $hash = $defs{$name}; my $hash = $defs{$name};
@@ -799,7 +805,7 @@ sub SSChatBot_getapisites ($) {
} }
if ($hash->{HELPER}{APIPARSET}) { # API-Hashwerte sind bereits gesetzt -> Abruf überspringen if ($hash->{HELPER}{APIPARSET}) { # API-Hashwerte sind bereits gesetzt -> Abruf überspringen
Log3($name, 4, "$name - API hashvalues already set - ignore get apisites"); Log3($name, 4, "$name - API hashvalues already set - ignore get apisites");
return SSChatBot_chatop($name); return SSChatBot_chatop($name);
} }
@@ -838,7 +844,7 @@ sub SSChatBot_getapisites_parse {
my ($error,$errorcode,$success,$chatexternalmaxver,$chatexternalpath); my ($error,$errorcode,$success,$chatexternalmaxver,$chatexternalpath);
if ($err ne "") { if ($err ne "") {
# wenn ein Fehler bei der HTTP Abfrage aufgetreten ist # wenn ein Fehler bei der HTTP Abfrage aufgetreten ist
Log3($name, 2, "$name - ERROR message: $err"); Log3($name, 2, "$name - ERROR message: $err");
readingsBeginUpdate ($hash); readingsBeginUpdate ($hash);
@@ -889,8 +895,8 @@ sub SSChatBot_getapisites_parse {
readingsBulkUpdateIfChanged ($hash,"Error", "none"); readingsBulkUpdateIfChanged ($hash,"Error", "none");
readingsEndUpdate ($hash,1); readingsEndUpdate ($hash,1);
# Webhook Hash values sind gesetzt # Webhook Hash values sind gesetzt
$hash->{HELPER}{APIPARSET} = 1; $hash->{HELPER}{APIPARSET} = 1;
} else { } else {
$errorcode = "805"; $errorcode = "805";
@@ -921,7 +927,7 @@ sub SSChatBot_getapisites_parse {
SSChatBot_checkretry($name,1); SSChatBot_checkretry($name,1);
return; return;
} }
} }
return SSChatBot_chatop($name); return SSChatBot_chatop($name);
} }
@@ -972,7 +978,7 @@ sub SSChatBot_chatop {
Log3($name, 5, "$name - HTTP-Call will be done with httptimeout: $httptimeout s"); Log3($name, 5, "$name - HTTP-Call will be done with httptimeout: $httptimeout s");
if ($opmode =~ /^chatUserlist$|^chatChannellist$/) { if ($opmode =~ /^chatUserlist$|^chatChannellist$/x) {
$url = "$inprot://$inaddr:$inport/webapi/$chatexternalpath?api=$chatexternal&version=$chatexternalmaxver&method=$method&token=\"$token\""; $url = "$inprot://$inaddr:$inport/webapi/$chatexternalpath?api=$chatexternal&version=$chatexternalmaxver&method=$method&token=\"$token\"";
} }
@@ -985,7 +991,7 @@ sub SSChatBot_chatop {
$url .= "&payload={"; $url .= "&payload={";
$url .= "\"text\": \"$text\"," if($text); $url .= "\"text\": \"$text\"," if($text);
$url .= "\"file_url\": \"$fileUrl\"," if($fileUrl); $url .= "\"file_url\": \"$fileUrl\"," if($fileUrl);
$url .= "\"attachments\": $attachment," if($attachment); $url .= "\"attachments\": $attachment," if($attachment);
$url .= "\"user_ids\": [$userid]" if($userid); $url .= "\"user_ids\": [$userid]" if($userid);
$url .= "}"; $url .= "}";
} }
@@ -994,7 +1000,7 @@ sub SSChatBot_chatop {
if(AttrVal($name, "showTokenInLog", "0") == 1) { if(AttrVal($name, "showTokenInLog", "0") == 1) {
Log3($name, 4, "$name - Call-Out: $url"); Log3($name, 4, "$name - Call-Out: $url");
} else { } else {
$part =~ s/$token/<secret>/; $part =~ s/$token/<secret>/x;
Log3($name, 4, "$name - Call-Out: $part"); Log3($name, 4, "$name - Call-Out: $part");
} }
@@ -1015,7 +1021,7 @@ return;
############################################################################################# #############################################################################################
# Callback from SSChatBot_chatop # Callback from SSChatBot_chatop
############################################################################################# #############################################################################################
sub SSChatBot_chatop_parse { sub SSChatBot_chatop_parse { ## no critic 'complexity'
my ($param, $err, $myjson) = @_; my ($param, $err, $myjson) = @_;
my $hash = $param->{hash}; my $hash = $param->{hash};
my $name = $hash->{NAME}; my $name = $hash->{NAME};
@@ -1023,7 +1029,7 @@ sub SSChatBot_chatop_parse {
my $inaddr = $hash->{INADDR}; my $inaddr = $hash->{INADDR};
my $inport = $hash->{INPORT}; my $inport = $hash->{INPORT};
my $opmode = $hash->{OPMODE}; my $opmode = $hash->{OPMODE};
my ($rectime,$data,$success,$error,$errorcode,$cherror); my ($data,$success,$error,$errorcode,$cherror);
my $lang = AttrVal("global","language","EN"); my $lang = AttrVal("global","language","EN");
@@ -1032,7 +1038,7 @@ sub SSChatBot_chatop_parse {
Log3($name, 2, "$name - ERROR message: $err"); Log3($name, 2, "$name - ERROR message: $err");
$errorcode = "none"; $errorcode = "none";
$errorcode = "800" if($err =~ /: malformed or unsupported URL$/s); $errorcode = "800" if($err =~ /:\smalformed\sor\sunsupported\sURL$/xs);
readingsBeginUpdate ($hash); readingsBeginUpdate ($hash);
readingsBulkUpdateIfChanged ($hash, "Error", $err); readingsBulkUpdateIfChanged ($hash, "Error", $err);
@@ -1065,7 +1071,7 @@ sub SSChatBot_chatop_parse {
if ($opmode eq "chatUserlist") { if ($opmode eq "chatUserlist") {
my %users = (); my %users = ();
my ($un,$ui,$st,$nn,$em,$uids); my ($un,$ui,$st,$nn,$em,$uids);
my $i = 0; my $i = 0;
my $out = "<html>"; my $out = "<html>";
$out .= "<b>Synology Chat Server visible Users</b> <br><br>"; $out .= "<b>Synology Chat Server visible Users</b> <br><br>";
@@ -1090,7 +1096,7 @@ sub SSChatBot_chatop_parse {
$uids .= $un; $uids .= $un;
$out .= "<tr><td> $un </td><td> $ui </td><td> $st </td><td> $nn </td><td> $em </td><td></tr>"; $out .= "<tr><td> $un </td><td> $ui </td><td> $st </td><td> $nn </td><td> $em </td><td></tr>";
} }
$i++; $i++;
} }
$hash->{HELPER}{USERS} = \%users if(%users); $hash->{HELPER}{USERS} = \%users if(%users);
$hash->{HELPER}{USERFETCHED} = 1; $hash->{HELPER}{USERFETCHED} = 1;
@@ -1112,15 +1118,15 @@ sub SSChatBot_chatop_parse {
$out .= "</table>"; $out .= "</table>";
$out .= "</html>"; $out .= "</html>";
# Ausgabe Popup der User-Daten (nach readingsEndUpdate positionieren sonst # Ausgabe Popup der User-Daten (nach readingsEndUpdate positionieren sonst
# "Connection lost, trying reconnect every 5 seconds" wenn > 102400 Zeichen) # "Connection lost, trying reconnect every 5 seconds" wenn > 102400 Zeichen)
asyncOutput($hash->{HELPER}{CL}{1},"$out"); asyncOutput($hash->{HELPER}{CL}{1},"$out");
delete($hash->{HELPER}{CL}); InternalTimer(gettimeofday()+10.0, "SSChatBot_delclhash", $name, 0);
} elsif ($opmode eq "chatChannellist") { } elsif ($opmode eq "chatChannellist") {
my %channels = (); my %channels = ();
my ($cn,$ci,$cr,$mb,$ty,$cids); my ($cn,$ci,$cr,$mb,$ty,$cids);
my $i = 0; my $i = 0;
my $out = "<html>"; my $out = "<html>";
$out .= "<b>Synology Chat Server visible Channels</b> <br><br>"; $out .= "<b>Synology Chat Server visible Channels</b> <br><br>";
@@ -1143,17 +1149,17 @@ sub SSChatBot_chatop_parse {
$cids .= $cn; $cids .= $cn;
$out .= "<tr><td> $cn </td><td> $ci </td><td> $cr </td><td> $mb </td><td> $ty </td><td></tr>"; $out .= "<tr><td> $cn </td><td> $ci </td><td> $cr </td><td> $mb </td><td> $ty </td><td></tr>";
} }
$i++; $i++;
} }
$hash->{HELPER}{CHANNELS} = \%channels if(%channels); $hash->{HELPER}{CHANNELS} = \%channels if(%channels);
$out .= "</table>"; $out .= "</table>";
$out .= "</html>"; $out .= "</html>";
# Ausgabe Popup der User-Daten (nach readingsEndUpdate positionieren sonst # Ausgabe Popup der User-Daten (nach readingsEndUpdate positionieren sonst
# "Connection lost, trying reconnect every 5 seconds" wenn > 102400 Zeichen) # "Connection lost, trying reconnect every 5 seconds" wenn > 102400 Zeichen)
asyncOutput($hash->{HELPER}{CL}{1},"$out"); asyncOutput($hash->{HELPER}{CL}{1},"$out");
delete($hash->{HELPER}{CL}); InternalTimer(gettimeofday()+5.0, "SSChatBot_delclhash", $name, 0);
} elsif ($opmode eq "sendItem" && $hash->{OPIDX}) { } elsif ($opmode eq "sendItem" && $hash->{OPIDX}) {
my $postid = ""; my $postid = "";
@@ -1275,8 +1281,8 @@ sub SSChatBot_sortVersion {
my ($sseq,@versions) = @_; my ($sseq,@versions) = @_;
my @sorted = map {$_->[0]} my @sorted = map {$_->[0]}
sort {$a->[1] cmp $b->[1]} sort {$a->[1] cmp $b->[1]}
map {[$_, pack "C*", split /\./]} @versions; map {[$_, pack "C*", split /\./]} @versions;
@sorted = map {join ".", unpack "C*", $_} @sorted = map {join ".", unpack "C*", $_}
sort sort
@@ -1491,7 +1497,7 @@ sub SSChatBot_formString {
$txt .= $_; $txt .= $_;
} }
$pat = join '|', map quotemeta, keys(%replacements); $pat = join '|', map { quotemeta; } keys(%replacements);
$txt =~ s/($pat)/$replacements{$1}/g; $txt =~ s/($pat)/$replacements{$1}/g;
@@ -1509,46 +1515,58 @@ sub SSChatBot_getclhash {
if($nobgd) { if($nobgd) {
# nur übergebenen CL-Hash speichern, # nur übergebenen CL-Hash speichern,
# keine Hintergrundverarbeitung bzw. synthetische Erstellung CL-Hash # keine Hintergrundverarbeitung bzw. synthetische Erstellung CL-Hash
$hash->{HELPER}{CL}{1} = $hash->{CL}; $hash->{HELPER}{CL}{1} = $hash->{CL};
return undef; return;
} }
if (!defined($hash->{CL})) { if (!defined($hash->{CL})) {
# Clienthash wurde nicht übergeben und wird erstellt (FHEMWEB Instanzen mit canAsyncOutput=1 analysiert) # Clienthash wurde nicht übergeben und wird erstellt (FHEMWEB Instanzen mit canAsyncOutput=1 analysiert)
my $outdev; my $outdev;
my @webdvs = devspec2array("TYPE=FHEMWEB:FILTER=canAsyncOutput=1:FILTER=STATE=Connected"); my @webdvs = devspec2array("TYPE=FHEMWEB:FILTER=canAsyncOutput=1:FILTER=STATE=Connected");
my $i = 1; my $i = 1;
foreach (@webdvs) { foreach (@webdvs) {
$outdev = $_; $outdev = $_;
next if(!$defs{$outdev}); next if(!$defs{$outdev});
$hash->{HELPER}{CL}{$i}->{NAME} = $defs{$outdev}{NAME}; $hash->{HELPER}{CL}{$i}->{NAME} = $defs{$outdev}{NAME};
$hash->{HELPER}{CL}{$i}->{NR} = $defs{$outdev}{NR}; $hash->{HELPER}{CL}{$i}->{NR} = $defs{$outdev}{NR};
$hash->{HELPER}{CL}{$i}->{COMP} = 1; $hash->{HELPER}{CL}{$i}->{COMP} = 1;
$i++; $i++;
} }
} else { } else {
# übergebenen CL-Hash in Helper eintragen # übergebenen CL-Hash in Helper eintragen
$hash->{HELPER}{CL}{1} = $hash->{CL}; $hash->{HELPER}{CL}{1} = $hash->{CL};
} }
# Clienthash auflösen zur Fehlersuche (aufrufende FHEMWEB Instanz # Clienthash auflösen zur Fehlersuche (aufrufende FHEMWEB Instanz
if (defined($hash->{HELPER}{CL}{1})) { if (defined($hash->{HELPER}{CL}{1})) {
for (my $k=1; (defined($hash->{HELPER}{CL}{$k})); $k++ ) { for (my $k=1; (defined($hash->{HELPER}{CL}{$k})); $k++ ) {
Log3($name, 4, "$name - Clienthash number: $k"); Log3($name, 4, "$name - Clienthash number: $k");
while (my ($key,$val) = each(%{$hash->{HELPER}{CL}{$k}})) { while (my ($key,$val) = each(%{$hash->{HELPER}{CL}{$k}})) {
$val = $val?$val:" "; $val = $val?$val:" ";
Log3($name, 4, "$name - Clienthash: $key -> $val"); Log3($name, 4, "$name - Clienthash: $key -> $val");
} }
} }
} else { } else {
Log3($name, 2, "$name - Clienthash was neither delivered nor created !"); Log3($name, 2, "$name - Clienthash was neither delivered nor created !");
$ret = "Clienthash was neither delivered nor created. Can't use asynchronous output for function."; $ret = "Clienthash was neither delivered nor created. Can't use asynchronous output for function.";
} }
return ($ret); return ($ret);
} }
#############################################################################################
# Clienthash löschen
#############################################################################################
sub SSChatBot_delclhash {
my $name = shift;
my $hash = $defs{$name};
delete($hash->{HELPER}{CL});
return;
}
############################################################################################# #############################################################################################
# Versionierungen des Moduls setzen # Versionierungen des Moduls setzen
# Die Verwendung von Meta.pm und Packages wird berücksichtigt # Die Verwendung von Meta.pm und Packages wird berücksichtigt
@@ -1563,22 +1581,22 @@ sub SSChatBot_setVersionInfo {
$hash->{HELPER}{VERSION} = $v; $hash->{HELPER}{VERSION} = $v;
if($modules{$type}{META}{x_prereqs_src} && !$hash->{HELPER}{MODMETAABSENT}) { if($modules{$type}{META}{x_prereqs_src} && !$hash->{HELPER}{MODMETAABSENT}) {
# META-Daten sind vorhanden # META-Daten sind vorhanden
$modules{$type}{META}{version} = "v".$v; # Version aus META.json überschreiben, Anzeige mit {Dumper $modules{SSChatBot}{META}} $modules{$type}{META}{version} = "v".$v; # Version aus META.json überschreiben, Anzeige mit {Dumper $modules{SSChatBot}{META}}
if($modules{$type}{META}{x_version}) { # {x_version} ( nur gesetzt wenn $Id: 50_SSChatBot.pm 20534 2019-11-18 17:50:17Z DS_Starter $ im Kopf komplett! vorhanden ) if($modules{$type}{META}{x_version}) { # {x_version} ( nur gesetzt wenn $Id: 50_SSChatBot.pm 20534 2019-11-18 17:50:17Z DS_Starter $ im Kopf komplett! vorhanden )
$modules{$type}{META}{x_version} =~ s/1.1.1/$v/g; $modules{$type}{META}{x_version} =~ s/1\.1\.1/$v/gx;
} else { } else {
$modules{$type}{META}{x_version} = $v; $modules{$type}{META}{x_version} = $v;
} }
return $@ unless (FHEM::Meta::SetInternals($hash)); # FVERSION wird gesetzt ( nur gesetzt wenn $Id: 50_SSChatBot.pm 20534 2019-11-18 17:50:17Z DS_Starter $ im Kopf komplett! vorhanden ) return $@ unless (FHEM::Meta::SetInternals($hash)); # FVERSION wird gesetzt ( nur gesetzt wenn $Id: 50_SSChatBot.pm 20534 2019-11-18 17:50:17Z DS_Starter $ im Kopf komplett! vorhanden )
if(__PACKAGE__ eq "FHEM::$type" || __PACKAGE__ eq $type) { if(__PACKAGE__ eq "FHEM::$type" || __PACKAGE__ eq $type) {
# es wird mit Packages gearbeitet -> Perl übliche Modulversion setzen # es wird mit Packages gearbeitet -> Perl übliche Modulversion setzen
# mit {<Modul>->VERSION()} im FHEMWEB kann Modulversion abgefragt werden # mit {<Modul>->VERSION()} im FHEMWEB kann Modulversion abgefragt werden
use version 0.77; our $VERSION = FHEM::Meta::Get( $hash, 'version' ); use version 0.77; our $VERSION = FHEM::Meta::Get( $hash, 'version' ); ## no critic 'VERSION'
} }
} else { } else {
# herkömmliche Modulstruktur # herkömmliche Modulstruktur
$hash->{VERSION} = $v; $hash->{VERSION} = $v;
} }
return; return;
@@ -1588,7 +1606,7 @@ return;
# Common Gateway Interface # Common Gateway Interface
# parsen von outgoing Messages Chat -> FHEM # parsen von outgoing Messages Chat -> FHEM
############################################################################################# #############################################################################################
sub SSChatBot_CGI { sub SSChatBot_CGI { ## no critic 'complexity'
my ($request) = @_; my ($request) = @_;
my ($hash,$name,$link,$args); my ($hash,$name,$link,$args);
my ($text,$timestamp,$channelid,$channelname,$userid,$username,$postid,$triggerword) = ("","","","","","","",""); my ($text,$timestamp,$channelid,$channelname,$userid,$username,$postid,$triggerword) = ("","","","","","","","");
@@ -1607,25 +1625,25 @@ sub SSChatBot_CGI {
if(!$args) { # POST-Methode empfangen wenn keine GET_Methode ? if(!$args) { # POST-Methode empfangen wenn keine GET_Methode ?
$args = (split(/outchat&/, $request))[1]; $args = (split(/outchat&/, $request))[1];
if(!$args) { if(!$args) {
Log 1, "TYPE SSChatBot - ERROR - no expected data received"; Log 1, "TYPE SSChatBot - ERROR - no expected data received";
return ("text/plain; charset=utf-8", "no expected data received"); return ("text/plain; charset=utf-8", "no expected data received");
} }
} }
$args =~ s/&/" /g; $args =~ s/&/" /g;
$args =~ s/=/="/g; $args =~ s/=/="/g;
$args .= "\""; $args .= "\"";
$args = urlDecode($args); $args = urlDecode($args);
my($a,$h) = parseParams($args); my($a,$h) = parseParams($args);
if (!defined($h->{botname})) { if (!defined($h->{botname})) {
Log 1, "TYPE SSChatBot - ERROR - no Botname received"; Log 1, "TYPE SSChatBot - ERROR - no Botname received";
return ("text/plain; charset=utf-8", "no FHEM SSChatBot name in message"); return ("text/plain; charset=utf-8", "no FHEM SSChatBot name in message");
} }
# check ob angegebenes SSChatBot Device definiert, wenn ja Kontext auf botname setzen # check ob angegebenes SSChatBot Device definiert, wenn ja Kontext auf botname setzen
$name = $h->{botname}; # das SSChatBot Device $name = $h->{botname}; # das SSChatBot Device
unless (IsDevice($name, 'SSChatBot')) { unless (IsDevice($name, 'SSChatBot')) {
Log 1, "ERROR - No SSChatBot device \"$name\" of Type \"SSChatBot\" exists"; Log 1, "ERROR - No SSChatBot device \"$name\" of Type \"SSChatBot\" exists";
return ( "text/plain; charset=utf-8", "No SSChatBot device for webhook \"/outchat\" exists" ); return ( "text/plain; charset=utf-8", "No SSChatBot device for webhook \"/outchat\" exists" );
} }
@@ -1638,13 +1656,13 @@ sub SSChatBot_CGI {
# eine Antwort auf ein interaktives Objekt # eine Antwort auf ein interaktives Objekt
if (defined($h->{payload})) { if (defined($h->{payload})) {
# ein Benutzer hat ein interaktives Objekt ausgelöst (Button). Die Datenfelder sind nachfolgend beschrieben: # ein Benutzer hat ein interaktives Objekt ausgelöst (Button). Die Datenfelder sind nachfolgend beschrieben:
# "actions": Array des Aktionsobjekts, das sich auf die vom Benutzer ausgelöste Aktion bezieht # "actions": Array des Aktionsobjekts, das sich auf die vom Benutzer ausgelöste Aktion bezieht
# "callback_id": Zeichenkette, die sich auf die Callback_id des Anhangs bezieht, in dem sich die vom Benutzer ausgelöste Aktion befindet # "callback_id": Zeichenkette, die sich auf die Callback_id des Anhangs bezieht, in dem sich die vom Benutzer ausgelöste Aktion befindet
# "post_id" # "post_id"
# "token" # "token"
# "user": { "user_id","username" } # "user": { "user_id","username" }
my $pldata = $h->{payload}; my $pldata = $h->{payload};
(undef, $success) = SSChatBot_evaljson($hash,$pldata); (undef, $success) = SSChatBot_evaljson($hash,$pldata);
unless ($success) { unless ($success) {
Log3($name, 1, "$name - ERROR - invalid JSON data received:\n".Dumper($pldata)); Log3($name, 1, "$name - ERROR - invalid JSON data received:\n".Dumper($pldata));
@@ -1685,17 +1703,17 @@ sub SSChatBot_CGI {
} }
# Timestamp dekodieren # Timestamp dekodieren
if ($h->{timestamp}) { if ($h->{timestamp}) {
$h->{timestamp} = FmtDateTime(($h->{timestamp})/1000); $h->{timestamp} = FmtDateTime(($h->{timestamp})/1000);
} }
Log3($name, 4, "$name - received data decoded:\n".Dumper($h)); Log3($name, 4, "$name - received data decoded:\n".Dumper($h));
$hash->{OPMODE} = "receiveData"; $hash->{OPMODE} = "receiveData";
# ausgehende Datenfelder (Chat -> FHEM), die das Chat senden kann # ausgehende Datenfelder (Chat -> FHEM), die das Chat senden kann
# =============================================================== # ===============================================================
# token: bot token # token: bot token
# channel_id # channel_id
# channel_name # channel_name
# user_id # user_id
@@ -1704,19 +1722,19 @@ sub SSChatBot_CGI {
# timestamp # timestamp
# text # text
# trigger_word: which trigger word is matched # trigger_word: which trigger word is matched
# #
$channelid = $h->{channel_id} if($h->{channel_id}); $channelid = $h->{channel_id} if($h->{channel_id});
$channelname = $h->{channel_name} if($h->{channel_name}); $channelname = $h->{channel_name} if($h->{channel_name});
$userid = $h->{user_id} if($h->{user_id}); $userid = $h->{user_id} if($h->{user_id});
$username = $h->{username} if($h->{username}); $username = $h->{username} if($h->{username});
$postid = $h->{post_id} if($h->{post_id}); $postid = $h->{post_id} if($h->{post_id});
$callbackid = $h->{callback_id} if($h->{callback_id}); $callbackid = $h->{callback_id} if($h->{callback_id});
$timestamp = $h->{timestamp} if($h->{timestamp}); $timestamp = $h->{timestamp} if($h->{timestamp});
# interaktive Schaltflächen (Aktionen) auswerten # interaktive Schaltflächen (Aktionen) auswerten
if ($h->{actions}) { if ($h->{actions}) {
$actions = $h->{actions}; $actions = $h->{actions};
$actions =~ m/^type: button.*value: (.*), text:.*$/; $actions =~ m/^type: button.*value: (.*), text:.*$/;
$actval = $1; $actval = $1;
if($actval =~ /^\/.*$/) { if($actval =~ /^\/.*$/) {
@@ -1725,8 +1743,8 @@ sub SSChatBot_CGI {
} }
} }
if ($h->{text} || $avToExec) { if ($h->{text} || $avToExec) {
$text = $h->{text}; $text = $h->{text};
$text = $avToExec if($avToExec); # Vorrang für empfangene interaktive Data (Schaltflächenwerte) die Slash-Befehle enthalten $text = $avToExec if($avToExec); # Vorrang für empfangene interaktive Data (Schaltflächenwerte) die Slash-Befehle enthalten
if($text =~ /^\/([Ss]et.*?|[Gg]et.*?|[Cc]ode.*?)\s+(.*)$/) { # vordefinierte Befehle in FHEM ausführen if($text =~ /^\/([Ss]et.*?|[Gg]et.*?|[Cc]ode.*?)\s+(.*)$/) { # vordefinierte Befehle in FHEM ausführen
my $p1 = $1; my $p1 = $1;
@@ -1734,7 +1752,7 @@ sub SSChatBot_CGI {
if($p1 =~ /set.*/i) { if($p1 =~ /set.*/i) {
$command = "set ".$p2; $command = "set ".$p2;
$do = 1; $do = 1;
$au = AttrVal($name,"allowedUserForSet", "all"); $au = AttrVal($name,"allowedUserForSet", "all");
@aul = split(",",$au); @aul = split(",",$au);
if($au eq "all" || $username ~~ @aul) { if($au eq "all" || $username ~~ @aul) {
@@ -1762,7 +1780,7 @@ sub SSChatBot_CGI {
} elsif ($p1 =~ /code.*/i) { } elsif ($p1 =~ /code.*/i) {
$command = $p2; $command = $p2;
$do = 1; $do = 1;
$au = AttrVal($name,"allowedUserForCode", "all"); $au = AttrVal($name,"allowedUserForCode", "all");
@aul = split(",",$au); @aul = split(",",$au);
if($au eq "all" || $username ~~ @aul) { if($au eq "all" || $username ~~ @aul) {
@@ -1793,66 +1811,66 @@ sub SSChatBot_CGI {
$ua = "" if(!$ua); $ua = "" if(!$ua);
my %hc = map { ($_ => 1) } grep { "$_" =~ m/ownCommand(\d+)/ } split(" ","ownCommand1 $ua"); my %hc = map { ($_ => 1) } grep { "$_" =~ m/ownCommand(\d+)/ } split(" ","ownCommand1 $ua");
foreach my $ca (sort keys %hc) { foreach my $ca (sort keys %hc) {
my $uc = AttrVal($name, $ca, ""); my $uc = AttrVal($name, $ca, "");
next if (!$uc); next if (!$uc);
($uc,$arg) = split(/\s+/, $uc, 2); ($uc,$arg) = split(/\s+/, $uc, 2);
if($uc && $text =~ /^$uc\s?$/) { # User eigener Slash-Befehl, z.B.: /Wetter if($uc && $text =~ /^$uc\s?$/) { # User eigener Slash-Befehl, z.B.: /Wetter
$command = $arg; $command = $arg;
$do = 1; $do = 1;
$au = AttrVal($name,"allowedUserForOwn", "all"); # Berechtgung des Chat-Users checken $au = AttrVal($name,"allowedUserForOwn", "all"); # Berechtgung des Chat-Users checken
@aul = split(",",$au); @aul = split(",",$au);
if($au eq "all" || $username ~~ @aul) { if($au eq "all" || $username ~~ @aul) {
Log3($name, 4, "$name - Synology Chat user \"$username\" execute FHEM command: ".$arg); Log3($name, 4, "$name - Synology Chat user \"$username\" execute FHEM command: ".$arg);
$cr = AnalyzeCommandChain(undef, $arg); # FHEM Befehlsketten ausführen $cr = AnalyzeCommandChain(undef, $arg); # FHEM Befehlsketten ausführen
} else { } else {
$cr = "User \"$username\" is not allowed execute \"$arg\" command"; $cr = "User \"$username\" is not allowed execute \"$arg\" command";
$state = "command execution denied"; $state = "command execution denied";
Log3($name, 2, "$name - WARNING - Chat user \"$username\" is not authorized for \"$arg\" command. Execution denied !"); Log3($name, 2, "$name - WARNING - Chat user \"$username\" is not authorized for \"$arg\" command. Execution denied !");
} }
$cr = $cr ne ""?$cr:"command '$arg' executed"; $cr = $cr ne ""?$cr:"command '$arg' executed";
Log3($name, 4, "$name - FHEM command return: ".$cr); Log3($name, 4, "$name - FHEM command return: ".$cr);
$cr = SSChatBot_formString($cr, "command"); $cr = SSChatBot_formString($cr, "command");
SSChatBot_addQueue($name, "sendItem", "chatbot", $userid, $cr, "", "", ""); SSChatBot_addQueue($name, "sendItem", "chatbot", $userid, $cr, "", "", "");
} }
} }
# Wenn Kommando ausgeführt wurde Ergebnisse aus Queue übertragen # Wenn Kommando ausgeführt wurde Ergebnisse aus Queue übertragen
if($do) { if($do) {
RemoveInternalTimer($hash, "SSChatBot_getapisites"); RemoveInternalTimer($hash, "SSChatBot_getapisites");
InternalTimer(gettimeofday()+1, "SSChatBot_getapisites", "$name", 0); InternalTimer(gettimeofday()+1, "SSChatBot_getapisites", "$name", 0);
} }
} }
if ($h->{trigger_word}) { if ($h->{trigger_word}) {
$triggerword = urlDecode($h->{trigger_word}); $triggerword = urlDecode($h->{trigger_word});
Log3($name, 4, "$name - trigger_word received: ".$triggerword); Log3($name, 4, "$name - trigger_word received: ".$triggerword);
} }
readingsBeginUpdate ($hash); readingsBeginUpdate ($hash);
readingsBulkUpdate ($hash, "recActions", $actions); readingsBulkUpdate ($hash, "recActions", $actions);
readingsBulkUpdate ($hash, "recCallbackId", $callbackid); readingsBulkUpdate ($hash, "recCallbackId", $callbackid);
readingsBulkUpdate ($hash, "recActionsValue", $actval); readingsBulkUpdate ($hash, "recActionsValue", $actval);
readingsBulkUpdate ($hash, "recChannelId", $channelid); readingsBulkUpdate ($hash, "recChannelId", $channelid);
readingsBulkUpdate ($hash, "recChannelname", $channelname); readingsBulkUpdate ($hash, "recChannelname", $channelname);
readingsBulkUpdate ($hash, "recUserId", $userid); readingsBulkUpdate ($hash, "recUserId", $userid);
readingsBulkUpdate ($hash, "recUsername", $username); readingsBulkUpdate ($hash, "recUsername", $username);
readingsBulkUpdate ($hash, "recPostId", $postid); readingsBulkUpdate ($hash, "recPostId", $postid);
readingsBulkUpdate ($hash, "recTimestamp", $timestamp); readingsBulkUpdate ($hash, "recTimestamp", $timestamp);
readingsBulkUpdate ($hash, "recText", $text); readingsBulkUpdate ($hash, "recText", $text);
readingsBulkUpdate ($hash, "recTriggerword", $triggerword); readingsBulkUpdate ($hash, "recTriggerword", $triggerword);
readingsBulkUpdate ($hash, "recCommand", $command); readingsBulkUpdate ($hash, "recCommand", $command);
readingsBulkUpdate ($hash, "sendCommandReturn", $cr); readingsBulkUpdate ($hash, "sendCommandReturn", $cr);
readingsBulkUpdate ($hash, "Errorcode", "none"); readingsBulkUpdate ($hash, "Errorcode", "none");
readingsBulkUpdate ($hash, "Error", "none"); readingsBulkUpdate ($hash, "Error", "none");
readingsBulkUpdate ($hash, "state", $state); readingsBulkUpdate ($hash, "state", $state);
readingsEndUpdate ($hash,1); readingsEndUpdate ($hash,1);
return ("text/plain; charset=utf-8", $ret); return ("text/plain; charset=utf-8", $ret);
} else { } else {
# no data received # no data received