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',
@@ -39,7 +39,9 @@ sub new {
     $Self->{LogLevel}  = $Param{LogLevel} || 'info';
     $Self->{LogObject} = Log::Log4perl->get_logger('TelegramBot');
     $Self->{Token}     = 'bot5868933096:AAE8Oe-AxU6m_yCWfpqTqwwjERqnRpBGJtE';
-    $Self->{TelegramURL} = 'https://api.telegram.org';
+    $Self->{URL}       = {
+        Telegram => 'https://api.telegram.org',
+    };
 
     # load remembered update ids
     $Self->{MessageIDs} = YAML::LoadFile("$FindBin::Bin/message_ids.yml");
@@ -47,36 +49,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 +59,7 @@ sub new {
 =cut
 
 sub greet {
+
     my ( $Self, %Param ) = @_;
 
     $Self->{LogObject}->info('greet: Initiating greet routine');
@@ -116,7 +89,6 @@ sub greet {
 
 =cut
 
-# TODO rebuild to take custom parameters of various kind
 sub build {
 
     my ( $Self, %Param ) = @_;
@@ -133,7 +105,7 @@ sub build {
         else {
             # for now, testing fallback
             my $ResponseResult = plain POST(
-                join( '/', ( $Self->{TelegramURL}, $Self->{Token}, 'sendMessage' ) ),
+                join( '/', ( $Self->{URL}{Telegram}, $Self->{Token}, 'sendMessage' ) ),
                 {
                     'chat_id'             => $Param{Message}->{callback_query}->{from}->{id},
                     'reply_to_message_id' => $Param{Message}->{callback_query}->{message}->{message_id},
@@ -146,7 +118,6 @@ sub build {
 
     }
     else {
-        # TODO load list of commands from core and plugins
         $KeyboardData = {
             'inline_keyboard' => [
                 [
@@ -170,7 +141,7 @@ sub build {
         $KeyboardData,
     );
     my $ResponseResult = plain POST(
-        join( '/', ( $Self->{TelegramURL}, $Self->{Token}, 'sendMessage' ) ),
+        join( '/', ( $Self->{URL}{Telegram}, $Self->{Token}, 'sendMessage' ) ),
         {
             'chat_id'             => $Param{Message}->{chat}->{id},
             'reply_to_message_id' => $Param{Message}->{id},
@@ -207,15 +178,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}(
-            $Self,
+        $ResponseData = $Self->$Command(
             Message   => $Message,
             Arguments => $ArgumentsString,
         );
@@ -248,7 +217,7 @@ sub processMessage {
     }
 
     my $ResponseResult = plain POST(
-        join( '/', ( $Self->{TelegramURL}, $Self->{Token}, 'sendMessage' ) ),
+        join( '/', ( $Self->{URL}{Telegram}, $Self->{Token}, 'sendMessage' ) ),
         {
             chat_id => $Param{Message}->{message}->{chat}->{id},
             $ResponseData->%*,
@@ -260,7 +229,7 @@ sub processMessage {
 
     # mark message as read
     my $SeenResult = plain POST(
-        join( '/', ( $Self->{TelegramURL}, $Self->{Token}, 'readMessageContents' ) ),
+        join( '/', ( $Self->{URL}{Telegram}, $Self->{Token}, 'readMessageContents' ) ),
         {
             id => $Param{Message}->{message}->{id},
         }
@@ -284,7 +253,7 @@ sub fetchMessages {
     $Self->{LogObject}->info('fetchMessages: Initiating getUpdates');
 
     my $MessageDataRaw =
-      json GET( join( '/', ( $Self->{TelegramURL}, $Self->{Token}, $Method ) ), {} );
+      json GET( join( '/', ( $Self->{URL}{Telegram}, $Self->{Token}, $Method ) ), {} );
     $Self->{LogObject}
       ->info( 'fetchMessages: Messages raw are ' . Dumper($MessageDataRaw) );
     my @Messages = $MessageDataRaw->{result}->@*;