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

Add missing use in RedisLib.pm and also fix usage of canTalk() there

Browse Source
This commit is contained in:
eleksir
2022-02-03 01:22:21 +03:00
parent 76f286c770
commit d1f7f3c230
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/RedisLib.pm
View File

@@ -13,6 +13,7 @@ use Mojo::Redis;
use Mojo::Redis::Connection; use Mojo::Redis::Connection;
use BotLib::Conf qw (LoadConf); use BotLib::Conf qw (LoadConf);
use Teapot::Bot::Object::ChatPermissions;
use version; our $VERSION = qw (1.0); use version; our $VERSION = qw (1.0);
use Exporter qw (import); use Exporter qw (import);
@@ -39,7 +40,9 @@ sub redis_parse_message {
$message->{chat_id} = $m->{chatid}; $message->{chat_id} = $m->{chatid};
$message->{text} = $m->{message}; $message->{text} = $m->{message};
if (Teapot::Bot::Object::ChatPermissions::canTalk ($main::TGM, $m->{chatid})) { my $can_talk = Teapot::Bot::Object::ChatPermissions->canTalk ($main::TGM, $m->{chatid});
if ($can_talk) {
# Результат этого действия нас не сильно волнует, т.к. если будет ошибка, то в лог попадёт трейс # Результат этого действия нас не сильно волнует, т.к. если будет ошибка, то в лог попадёт трейс
$main::TGM->sendMessage ($message); $main::TGM->sendMessage ($message);
} }
@@ -48,7 +51,7 @@ sub redis_parse_message {
}; };
sub redis_events_listener { sub redis_events_listener {
$log->notice ('[NOTICE]Run redis events listener'); $log->notice ('[NOTICE] Run redis events listener');
# If we already connected there is no point to disconnect # If we already connected there is no point to disconnect
if (defined $main::REDIS) { if (defined $main::REDIS) {
my $connected = eval { Mojo::Redis::Connection->is_connected ($main::REDIS); }; my $connected = eval { Mojo::Redis::Connection->is_connected ($main::REDIS); };

6
lib/Teapot/Bot/Object/ChatPermissions.pm
View File

@@ -33,11 +33,12 @@ sub canTalk {
my $self = shift; my $self = shift;
my $chatid = shift; my $chatid = shift;
my $args->{chat_id} = $chatid;
my $can_talk = 0; my $can_talk = 0;
if ($chatid < 0) { if ($chatid < 0) {
# group chat # group chat
my $chatobj = Teapot::Bot::Brain->getChat ($self, { 'chat_id' => $chatid }); my $chatobj = Teapot::Bot::Brain->getChat ($args);
# on api error, keep silence # on api error, keep silence
if ($chatobj == 0 || $chatobj->{error}) { if ($chatobj == 0 || $chatobj->{error}) {
@@ -54,7 +55,8 @@ sub canTalk {
} }
my $myid = $myObj->id; my $myid = $myObj->id;
my $me = Teapot::Bot::Brain->getChatMember ($self, { 'chat_id' => $chatid, 'user_id' => $myid }); $args->{user_id} = $myid;
my $me = Teapot::Bot::Brain->getChatMember ($self, $args);
# on api error, keep silence # on api error, keep silence
if ($me == 0 || $me->{error}) { if ($me == 0 || $me->{error}) {