TelegramBot.pm

@@ -1,4 +1,4 @@
-# important for switch feature
+# Important for switch feature
 use v5.32;
 
 use utf8;
@@ -17,10 +17,10 @@ use JSON;
 use Log::Log4perl;
 use YAML;
 
-# package name
+# Package name
 package TelegramBot;
 
-# constants and initalisations
+# Constants and initalisations
 Log::Log4perl->init("$FindBin::Bin/log.conf");
 my $CACHE = Cache::FastMmap->new(
     share_file => '/tmp/telegram_bot',
@@ -47,36 +47,6 @@ sub new {
     # whitelist
     $Self->{Whitelist} = $Param{Whitelist};
 
-    $Self->{CommandList} = {
-        'greet' => \&greet,
-    };
-
-    # include plugins
-    my @Plugins = glob("$FindBin::Bin/Plugins/*");
-    if ( @Plugins ) {
-        use File::Basename;
-        PLUGIN:
-        for my $PluginPath ( @Plugins ) {
-            my $PluginName = basename($PluginPath);
-            next PLUGIN unless require("$FindBin::Bin/Plugins/${PluginName}/Core.pm");
-            my $FullPath = "Plugins::${PluginName}::Core";
-            my $PluginObject = $FullPath->new;
-            if( !$PluginObject ) {
-                $Self->{LogObject}->error("Couldn't load plugin $PluginName");
-                next PLUGIN;
-            }
-
-            # import plugin command list
-            my $PluginCommandList = $PluginObject->getCommandList();
-            COMMAND:
-            for my $PluginCommand ( keys $PluginCommandList->%* ) {
-                next COMMAND if $Self->{CommandList}{$PluginCommand};
-
-                $Self->{CommandList}{$PluginCommand} = $PluginCommandList->{$PluginCommand};
-            }
-        }
-    }
-
     return $Self;
 }
 
@@ -87,6 +57,7 @@ sub new {
 =cut
 
 sub greet {
+
     my ( $Self, %Param ) = @_;
 
     $Self->{LogObject}->info('greet: Initiating greet routine');
@@ -116,7 +87,6 @@ sub greet {
 
 =cut
 
-# TODO rebuild to take custom parameters of various kind
 sub build {
 
     my ( $Self, %Param ) = @_;
@@ -146,7 +116,6 @@ sub build {
 
     }
     else {
-        # TODO load list of commands from core and plugins
         $KeyboardData = {
             'inline_keyboard' => [
                 [
@@ -207,15 +176,13 @@ sub processMessage {
 
 
     my $ResponseData = {};
-    my $CommandList  = join('|', keys $Self->{CommandList}->%*);
     if ( defined $Param{Message}->{message} && $Param{Message}->{message}->{text} =~
-        /\/(?<command>$CommandList)\s?(?<arguments>.*)?/ )
+        /\/(?<command>greet|statistics|build)\s?(?<arguments>.*)?/ )
     {
         my $Message = $Param{Message}->{message};
         my $Command         = $+{command};
         my $ArgumentsString = $+{arguments};
-        $ResponseData = $Self->{CommandList}{$Command}(
+        $ResponseData = $Self->$Command(
-            $Self,
             Message   => $Message,
             Arguments => $ArgumentsString,
         );