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

More strict check of redis message json format

Browse Source
This commit is contained in:
eleksir
2022-04-18 23:19:19 +03:00
parent 391b9889cf
commit 33ab2a368d
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/BotLib.pm
View File

@@ -16,7 +16,7 @@ use BotLib::Conf qw (LoadConf);
use BotLib::Admin qw (@ForbiddenMessageTypes GetForbiddenTypes AddForbiddenType use BotLib::Admin qw (@ForbiddenMessageTypes GetForbiddenTypes AddForbiddenType
DelForbiddenType ListForbidden FortuneToggle FortuneStatus DelForbiddenType ListForbidden FortuneToggle FortuneStatus
PluginToggle PluginStatus PluginEnabled ChanMsgToggle ChanMsgStatus PluginToggle PluginStatus PluginEnabled ChanMsgToggle ChanMsgStatus
GreetMsgToggle GreetMsgStatus GoodbyeMsgToggle GoodbyeMsgStatus); GreetMsgToggle GreetMsgStatus GoodbyeMsgToggle GoodbyeMsgStatus);
use BotLib::Util qw (trim); use BotLib::Util qw (trim);
use version; our $VERSION = qw (1.1); use version; our $VERSION = qw (1.1);

8
lib/RedisLib.pm
View File

@@ -37,7 +37,13 @@ sub redis_parse_message {
$message->{parse_mode} = 'Markdown'; $message->{parse_mode} = 'Markdown';
} }
$message->{chat_id} = 0 + $m->{chatid}; $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!');
return;
}
$message->{text} = "$m->{message}"; $message->{text} = "$m->{message}";
my $can_talk = Teapot::Bot::Object::ChatPermissions->canTalk ($main::TGM, 0 + $m->{chatid}); my $can_talk = Teapot::Bot::Object::ChatPermissions->canTalk ($main::TGM, 0 + $m->{chatid});

4
lib/TelegramBot.pm
View File

@@ -71,6 +71,10 @@ sub __cron {
if ($hour == 8 && ($min >= 0 && $min <= 14)) { if ($hour == 8 && ($min >= 0 && $min <= 14)) {
foreach my $enabledfortunechat (FortuneToggleList ()) { foreach my $enabledfortunechat (FortuneToggleList ()) {
# Set it to strings, explicitly # Set it to strings, explicitly
next unless (defined $enabledfortunechat);
next if ("$enabledfortunechat" eq '');
next if ("$enabledfortunechat" eq '0');
$rmsg->{userid} = "$enabledfortunechat"; $rmsg->{userid} = "$enabledfortunechat";
$rmsg->{chatid} = "$enabledfortunechat"; $rmsg->{chatid} = "$enabledfortunechat";