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

First run with admin module: fix typos in ChatMember.pm, Brain.pm, admin.pm, botlib.pm

Browse Source
This commit is contained in:
eleksir
2021-02-23 14:10:54 +03:00
parent e38726a1f2
commit 04cb3d2357
5 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Teapot/Bot/Brain.pm
View File

@@ -276,20 +276,15 @@ sub deleteMessage {
my $token = $self->token || croak 'No token supplied to deleteMessage()?';
if (Teapot::Bot::Object::ChatMember::canDelete($self, $chatid)) {
if (Teapot::Bot::Object::ChatMember::canDeleteMessage($self, $args->{chat_id})) {
my $url = "https://api.telegram.org/bot${token}/deleteMessage";
my $api_response = $self->_post_request($url, $send_args);
if ($api_response) {
return Teapot::Bot::Object::Message->create_from_hash($api_response, $self);
}
else {
return {'error' => 1};
}
$self->_post_request($url, $send_args);
}
else {
return {'error' => 1};
}
return;
}

10
lib/Teapot/Bot/Object/ChatMember.pm
View File

@@ -48,7 +48,7 @@ sub canDeleteMessage {
if ($chatid < 0) {
# group chat
my $chatobj = $self->_brain->getChat ({ 'chat_id' => $chatid });
my $chatobj = $self->getChat ({ 'chat_id' => $chatid });
# on api error, keep silence
unless ($chatobj) {
@@ -56,7 +56,7 @@ sub canDeleteMessage {
return 0;
}
my $myObj = $self->_brain->getMe ();
my $myObj = $self->getMe ();
# on api error, keep silence
unless ($chatobj) {
@@ -65,7 +65,7 @@ sub canDeleteMessage {
}
my $myid = $myObj->id;
my $me = $self->_brain->getChatMember ({ 'chat_id' => $chatid, 'user_id' => $myid });
my $me = $self->getChatMember ({ 'chat_id' => $chatid, 'user_id' => $myid });
# on api error, keep silence
unless ($me) {
@@ -78,8 +78,8 @@ sub canDeleteMessage {
if ($me->{'status'} eq 'administrator') {
$can_delete = 1;
}
# in supergroup bot must be granted with
} elsif ($chatobj->{'type'} eq 'group') || ($chatobj->{'type'} eq 'channel')
# in supergroup bot must be granted with can_delete_messages
} elsif (($chatobj->{'type'} eq 'supergroup') || ($chatobj->{'type'} eq 'channel')) {
if ($me->{'can_delete_messages'}) {
$can_delete = 1;
}