4 Commits

4 changed files with 26 additions and 11 deletions

View File

@@ -1,4 +1,5 @@
#!/usr/bin/env perlcritic
# Задействованные модули критика:
#
# Perl::Critic::More
@@ -9,6 +10,9 @@
# Perl::Critic::Policy::CompileTime
# Perl::Critic::Policy::ProhibitImplicitImport
# Perl::Critic::Policy::Dynamic::NoIndirect
# Perl::Critic::StricterSubs
# Perl::Critic::Policy::ProhibitImplicitImport
# Perl::Critic::Policy::CodeLayout::RequireUseUTF8
[-ControlStructures::ProhibitUnlessBlocks]
# oh. c'mon. just a little bit

View File

@@ -83,8 +83,8 @@ if ($UID == 0) {
make_path (
$logdir, {
uid => $uid,
group => $gid
}
group => $gid,
},
) or die "Unable to create $logdir: $OS_ERROR\n";
}
}
@@ -115,7 +115,7 @@ my $apath = abs_path $PROGRAM_NAME;
unless (defined $apath) {
$log->fatal ("[FATAL] Unable to get abs_path: $OS_ERROR\n");
exit 1;
};
}
my $pidfile = sprintf '%s/%s.pid', $piddir, basename $apath;
$log->info ("[INFO] Creating pidfile at $pidfile");

View File

@@ -1,4 +1,5 @@
package Karma;
# Хранит и выдаёт карму фразы
use 5.018; ## no critic (ProhibitImplicitImport)
use strict;
@@ -22,15 +23,19 @@ my $c = LoadConf ();
my $cachedir = $c->{cachedir};
my $max = 5;
# swallow phrase and return answer
sub KarmaSet (@) {
my $chatid = shift;
my $phrase = shift;
my $action = shift;
unless (defined $phrase) {
$phrase = '';
}
$phrase = trim ($phrase);
if ((! defined $phrase) || $phrase eq '') {
# Костылёк для кармы пустоты
if ($phrase eq '') {
$phrase = ' ';
}
@@ -80,9 +85,14 @@ sub KarmaGet (@) {
my $chatid = shift;
my $phrase = shift;
unless (defined $phrase) {
$phrase = '';
}
$phrase = trim ($phrase);
if ((! defined $phrase) || $phrase eq '') {
# Костылёк для кармы пустоты
if ($phrase eq '') {
$phrase = ' ';
}

View File

@@ -97,7 +97,7 @@ my $parse_message = sub {
} else {
$reply = trim (Fortune ());
}
} elsif (length ($cmd) >= length ('karma ') && substr ($cmd, 0, length ('karma ') eq 'karma ')) {
} elsif (length ($cmd) >= length ('karma ') && substr ($cmd, 0, length ('karma ')) eq 'karma ') {
# По-умолчанию достаём карму пустоты
my $text = undef;
@@ -106,7 +106,7 @@ my $parse_message = sub {
}
$reply = KarmaGet ($m->{chatid}, $text);
} elsif (length ($cmd) >= length ('карма ') && substr ($cmd, 0, length ('карма ') eq 'карма ')) {
} elsif (length ($cmd) >= length ('карма ') && substr ($cmd, 0, length ('карма ')) eq 'карма ') {
# По-умолчанию достаём карму пустоты
my $text = undef;
@@ -123,7 +123,7 @@ my $parse_message = sub {
$reply = KarmaGet ($m->{chatid}, undef);
}
# Скорее всего изменение кармы, но это не точно
} elsif ($m->{message} > length ('++')) {
} elsif (length ($m->{message}) > length ('++')) {
if (substr ($m->{message}, 0 - length ('++')) eq '++' || substr ($m->{message}, 0 - length ('--')) eq '--') {
my @arr = split /\n/s, $m->{message};
@@ -142,14 +142,15 @@ my $parse_message = sub {
}
}
$log->debug ("[DEBUG] Sending message to channel $send_to " . Dumper ($answer));
if (defined $reply && $answer->{misc}->{answer}) {
$answer->{message} = $reply;
$log->debug ("[DEBUG] Sending message to channel $send_to " . Dumper ($answer));
$self->json ($send_to)->notify (
$send_to => $answer,
);
} else {
$log->debug ('[DEBUG] No reply generated, skip sending message.');
}
return;