aleesa-bot/aleesa-telegram
0
Fork 0
Code Pull Requests Projects Releases Activity

Also dump redis messages on debug loglevel

Browse Source
This commit is contained in:
eleksir
2022-04-23 14:38:06 +03:00
parent 93032dd35e
commit 1958f77e9c
3 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/BotLib.pm
View File

@@ -9,8 +9,9 @@ use open qw (:std :utf8);
use English qw ( -no_match_vars );
use Clone qw (clone);
use Math::Random::Secure qw (irand);
use Data::Dumper qw (Dumper);
use Log::Any qw ($log);
use Math::Random::Secure qw (irand);
use BotLib::Conf qw (LoadConf);
use BotLib::Admin qw (@ForbiddenMessageTypes GetForbiddenTypes AddForbiddenType
@@ -25,6 +26,7 @@ our @EXPORT_OK = qw (Command Highlight BotSleep IsCensored);
my $c = LoadConf ();
my $csign = $c->{telegrambot}->{csign};
my $redismsg->{from} = 'telegram';
$redismsg->{plugin} = 'telegram';
$redismsg->{misc}->{answer} = 1;
@@ -136,6 +138,8 @@ sub Command {
} while (sleep 1);
}
$log->debug ('Outgoing redis message: ' . Dumper ($rmsg));
my $pubsub = $main::REDIS->pubsub;
$pubsub->json ($c->{'redis_router_channel'})->notify (
@@ -270,8 +274,8 @@ MYADMIN
{
'chat_id' => 0 + $chatid,
'user_id' => 0 + $user_id_to_mute,
'until_date' => $time + time ()
}
'until_date' => $time + time (),
},
);
if ($result->{error}) {

11
lib/RedisLib.pm
View File

@@ -6,9 +6,8 @@ use warnings;
use utf8;
use open qw (:std :utf8);
use Data::Dumper qw (Dumper);
use Log::Any qw ($log);
# Чтобы "уж точно" использовать hiredis-биндинги, загрузим этот модуль перед Mojo::Redis
use Protocol::Redis::XS ();
use Mojo::Redis ();
use Mojo::Redis::Connection ();
@@ -26,6 +25,8 @@ sub redis_parse_message {
my $m = shift;
my $message;
$log->debug ('Incoming redis message: ' . Dumper $m);
# Мы "не можем" отправлять сообщения в телеграм, если мы к нему не подключены
# (конечно, можем, но Teapot-lib предполагает, что объектик с чатом - это его собственность, а городить свой что-то
# не очень хочется)
@@ -40,12 +41,12 @@ sub redis_parse_message {
$message->{chat_id} = eval { 0 + $m->{chatid}; };
unless (defined $message->{chat_id}) {
log->error ('Incoming redis message is incorrect: chat id must be numeric value!');
$log->error ('Incoming redis message is incorrect: chat id must be numeric value!');
return;
}
if ($message->{chat_id} == 0) {
log->error ('Incoming redis message is incorrect: chat id must not be equal 0!');
$log->error ('Incoming redis message is incorrect: chat id must not be equal 0!');
return;
}
@@ -58,7 +59,7 @@ sub redis_parse_message {
my $r = $main::TGM->sendMessage ($message);
if ($r->{error}) {
log->error ("An error occured while sending message to chat $m->{chatid}");
$log->error ("An error occured while sending message to chat $m->{chatid}");
}
}

31
lib/TelegramBot.pm
View File

@@ -7,7 +7,9 @@ use warnings;
use utf8;
use open qw (:std :utf8);
use English qw ( -no_match_vars );
use Clone qw (clone);
use Data::Dumper qw (Dumper);
use Log::Any qw ($log);
use Math::Random::Secure qw (irand);
use Mojo::Base 'Teapot::Bot::Brain';
@@ -78,6 +80,8 @@ sub __cron {
$rmsg->{userid} = "$enabledfortunechat";
$rmsg->{chatid} = "$enabledfortunechat";
$log->debug ('Outgoing redis message: ' . Dumper ($rmsg));
$pubsub->json ($c->{'redis_router_channel'})->notify (
$c->{'redis_router_channel'} => $rmsg,
);
@@ -260,6 +264,15 @@ sub __on_msg {
$rmsg->{chatid} = "$userid";
$rmsg->{misc}->{answer} = 1;
{
do {
my $ready = eval { $main::RCONN->is_connected; };
last if ($ready);
} while (sleep 1);
}
$log->debug ('Outgoing redis message: ' . Dumper ($rmsg));
my $pubsub = $main::REDIS->pubsub;
$pubsub->json ($c->{'redis_router_channel'})->notify (
@@ -347,6 +360,15 @@ sub __on_msg {
$rmsg->{chatid} = "$chatid";
$rmsg->{misc}->{answer} = 1;
{
do {
my $ready = eval { $main::RCONN->is_connected; };
last if ($ready);
} while (sleep 1);
}
$log->debug ('Outgoing redis message: ' . Dumper ($rmsg));
my $pubsub = $main::REDIS->pubsub;
$pubsub->json ($c->{'redis_router_channel'})->notify (
@@ -396,6 +418,15 @@ sub __on_msg {
$rmsg->{misc}->{answer} = 0;
}
{
do {
my $ready = eval { $main::RCONN->is_connected; };
last if ($ready);
} while (sleep 1);
}
$log->debug ('Outgoing redis message: ' . Dumper ($rmsg));
my $pubsub = $main::REDIS->pubsub;
$pubsub->json ($c->{'redis_router_channel'})->notify (