Some tidying.

This commit is contained in:
Stefan Härter 2023-11-12 19:31:46 +01:00
parent 406679ae2e
commit a42d6e91dd

View File

@ -39,9 +39,7 @@ sub new {
$Self->{LogLevel} = $Param{LogLevel} || 'info'; $Self->{LogLevel} = $Param{LogLevel} || 'info';
$Self->{LogObject} = Log::Log4perl->get_logger('TelegramBot'); $Self->{LogObject} = Log::Log4perl->get_logger('TelegramBot');
$Self->{Token} = 'bot5868933096:AAE8Oe-AxU6m_yCWfpqTqwwjERqnRpBGJtE'; $Self->{Token} = 'bot5868933096:AAE8Oe-AxU6m_yCWfpqTqwwjERqnRpBGJtE';
$Self->{URL} = { $Self->{TelegramURL} = 'https://api.telegram.org';
Telegram => 'https://api.telegram.org',
};
# load remembered update ids # load remembered update ids
$Self->{MessageIDs} = YAML::LoadFile("$FindBin::Bin/message_ids.yml"); $Self->{MessageIDs} = YAML::LoadFile("$FindBin::Bin/message_ids.yml");
@ -105,7 +103,7 @@ sub build {
else { else {
# for now, testing fallback # for now, testing fallback
my $ResponseResult = plain POST( my $ResponseResult = plain POST(
join( '/', ( $Self->{URL}{Telegram}, $Self->{Token}, 'sendMessage' ) ), join( '/', ( $Self->{TelegramURL}, $Self->{Token}, 'sendMessage' ) ),
{ {
'chat_id' => $Param{Message}->{callback_query}->{from}->{id}, 'chat_id' => $Param{Message}->{callback_query}->{from}->{id},
'reply_to_message_id' => $Param{Message}->{callback_query}->{message}->{message_id}, 'reply_to_message_id' => $Param{Message}->{callback_query}->{message}->{message_id},
@ -141,7 +139,7 @@ sub build {
$KeyboardData, $KeyboardData,
); );
my $ResponseResult = plain POST( my $ResponseResult = plain POST(
join( '/', ( $Self->{URL}{Telegram}, $Self->{Token}, 'sendMessage' ) ), join( '/', ( $Self->{TelegramURL}, $Self->{Token}, 'sendMessage' ) ),
{ {
'chat_id' => $Param{Message}->{chat}->{id}, 'chat_id' => $Param{Message}->{chat}->{id},
'reply_to_message_id' => $Param{Message}->{id}, 'reply_to_message_id' => $Param{Message}->{id},
@ -217,7 +215,7 @@ sub processMessage {
} }
my $ResponseResult = plain POST( my $ResponseResult = plain POST(
join( '/', ( $Self->{URL}{Telegram}, $Self->{Token}, 'sendMessage' ) ), join( '/', ( $Self->{TelegramURL}, $Self->{Token}, 'sendMessage' ) ),
{ {
chat_id => $Param{Message}->{message}->{chat}->{id}, chat_id => $Param{Message}->{message}->{chat}->{id},
$ResponseData->%*, $ResponseData->%*,
@ -229,7 +227,7 @@ sub processMessage {
# mark message as read # mark message as read
my $SeenResult = plain POST( my $SeenResult = plain POST(
join( '/', ( $Self->{URL}{Telegram}, $Self->{Token}, 'readMessageContents' ) ), join( '/', ( $Self->{TelegramURL}, $Self->{Token}, 'readMessageContents' ) ),
{ {
id => $Param{Message}->{message}->{id}, id => $Param{Message}->{message}->{id},
} }
@ -253,7 +251,7 @@ sub fetchMessages {
$Self->{LogObject}->info('fetchMessages: Initiating getUpdates'); $Self->{LogObject}->info('fetchMessages: Initiating getUpdates');
my $MessageDataRaw = my $MessageDataRaw =
json GET( join( '/', ( $Self->{URL}{Telegram}, $Self->{Token}, $Method ) ), {} ); json GET( join( '/', ( $Self->{TelegramURL}, $Self->{Token}, $Method ) ), {} );
$Self->{LogObject} $Self->{LogObject}
->info( 'fetchMessages: Messages raw are ' . Dumper($MessageDataRaw) ); ->info( 'fetchMessages: Messages raw are ' . Dumper($MessageDataRaw) );
my @Messages = $MessageDataRaw->{result}->@*; my @Messages = $MessageDataRaw->{result}->@*;