Fix redis message processing, duh

Fix !drink for newer perl, also delete unused/obsolete code
Bump version of Mojolicious 9.24 -> 9.26
2022-06-21 23:14:01 +03:00 · 2022-06-21 23:00:37 +03:00 · 2022-06-21 22:58:21 +03:00 · 2022-05-25 20:40:14 +03:00 · 2022-04-24 02:06:44 +03:00 · 2022-04-18 17:24:14 +03:00
3 changed files with 147 additions and 106 deletions
--- a/4
+++ b/4
@@ -2,6 +2,7 @@
 requires 'Carp',                    '==1.50';
 requires 'CHI',                     '==0.61';
 requires 'CHI::Driver::BerkeleyDB', '==0.05';
+requires 'Clone',                   '==0.45';
 requires 'Cwd',                     '==3.75';
 requires 'Cwd::utf8',               '==0.011';
 requires 'DateTime',                '==1.55';
@@ -22,7 +23,7 @@ requires 'Log::Any::Adapter',       '==1.710';
 requires 'Log::Any::For::Std',      '==0.05';
 requires 'Math::Random::Secure',    '==0.080001';
 requires 'MIME::Base64',            '==3.16';
-requires 'Mojolicious',             '==9.22';
+requires 'Mojolicious',             '==9.26';
 requires 'Mojo::IOLoop::Signal',    '==0.003';
 # Чтобы заткнуть Mojo::UserAgent::Cached
 requires 'Mojo::Log',               '0';
@@ -30,6 +31,5 @@ requires 'Mojo::Redis',             '==3.27';
 requires 'Mojo::UserAgent',         '0';
 requires 'Mojo::UserAgent::Cached', '==1.18';
 requires 'POSIX',                   '0';
-requires 'Protocol::Redis::XS',     '0';
 requires 'URI::Encode::XS',         '==0.11';
 requires 'URI::URL',                '==5.10';
--- a/lib/WebApp.pm
+++ b/lib/WebApp.pm
@@ -8,6 +8,7 @@ use utf8;
 use open qw (:std :utf8);

 # Модули для работы приложения
+use Clone qw (clone);
 use Data::Dumper qw (Dumper);
 use Log::Any qw ($log);
 use Math::Random::Secure qw (irand);
@@ -24,23 +25,51 @@ use Exporter qw (import);
 our @EXPORT_OK = qw (RunWebApp);

 my $c = LoadConf ();
-my $fwd_cnt = $c->{'forward_max'} // 5;
+my $fwd_cnt = 5;
+
+if (defined $c->{'forward_max'}) {
+	$fwd_cnt = $c->{'forward_max'};
+}

 # Основной парсер
 my $parse_message = sub {
 	my $self = shift;
 	my $m    = shift;
-	my $answer = $m;
+
+	$log->debug ('[DEBUG] Incoming message ' . Dumper ($m));
+
+	unless (defined $m->{message}) {
+		$log->error (sprintf 'Unable to process unknown message: %s', $m->{message});
+		return;
+	}
+
+	my $answer         = clone ($m);
 	$answer->{from}    = 'webapp';
+	$answer->{message} = undef;
+
 	my $send_to = $m->{plugin};
 	my $reply;

+	# Если $answer->{misc}->{answer} не существует, то проставим его как 1, предполагаем, что по-умолчанию ответ от нас
+	# всё-таки ожидают. Если что - уточним ниже.
 	if (defined $answer->{misc}) {
+		unless (defined $answer->{misc}->{answer}) {
+			$answer->{misc}->{answer} = 1;
+		}
+
+		unless (defined $answer->{misc}->{bot_nick}) {
+			$answer->{misc}->{bot_nick} = undef;
+		}
+
+		unless (defined $answer->{misc}->{csign}) {
+			$answer->{misc}->{csign} = '!';
+		}
+
 		unless (defined $answer->{misc}->{fwd_cnt}) {
 			$answer->{misc}->{fwd_cnt} = 1;
 		} else {
 			if ($answer->{misc}->{fwd_cnt} > $fwd_cnt) {
-				$log->error ('Forward loop detected, discarding message.');
+				$log->error ('[ERROR] Forward loop detected, discarding message.');
 				$log->debug (Dumper $m);
 				return;
 			} else {
@@ -48,111 +77,120 @@ my $parse_message = sub {
 			}
 		}

-		unless (defined $answer->{misc}->{answer}) {
-			$answer->{misc}->{answer} = 1;
+		unless (defined $answer->{misc}->{good_morning}) {
+			$answer->{misc}->{good_morning} = 0;
 		}

-		unless (defined $answer->{misc}->{csign}) {
-			$answer->{misc}->{csign} = '!';
-		}
-	} else {
-		$answer->{misc}->{answer} = 1;
-		$answer->{misc}->{csign} = '!';
+		unless (defined $answer->{misc}->{msg_format}) {
 			$answer->{misc}->{msg_format} = 0;
 		}

-	$log->debug ('[DEBUG] Incoming message ' . Dumper($m));
+		unless (defined $answer->{misc}->{username}) {
+			$answer->{misc}->{username} = 'user';
+		}
+	} else {
+		$answer->{misc}->{answer} = 1;
+		$answer->{misc}->{bot_nick} = undef;
+		$answer->{misc}->{csign} = $c->{csign};
+		$answer->{misc}->{fwd_cnt} = 1;
+		$answer->{misc}->{good_morning} = 0;
+		$answer->{misc}->{msg_format} = 0;
+		$answer->{misc}->{username} = 'user';
+	}

-	if (substr ($m->{message}, 1) eq 'buni') {
+	if (length $m->{message} <= length $answer->{misc}->{csign}) {
+		$log->info (sprintf 'Unable to process unknown message: %s', $m->{message});
+		return;
+	}
+
+	if (substr ($m->{message}, 0, length ($answer->{misc}->{csign})) ne $answer->{misc}->{csign}) {
+		$log->info (sprintf 'Unable to process unknown message: %s', $m->{message});
+		return;
+	}
+
+	my $cmd = substr $m->{message}, length ($answer->{misc}->{csign});
+
+	if ($cmd eq 'buni') {
+		if (($m->{plugin} eq 'telegram')  &&  $answer->{misc}->{msg_format}) {
+			$reply = sprintf '[buni](%s)', Buni ();
+		} else {
 			$reply = Buni ();
-	} elsif (substr ($m->{message}, 1) eq 'anek' || substr ($m->{message}, 1) eq 'анек' || substr ($m->{message}, 1) eq 'анекдот') {
-		if ($m->{plugin} eq 'telegram') {
+		}
+	} elsif ($cmd eq 'anek' || $cmd eq 'анек' || $cmd eq 'анекдот') {
+		if (($m->{plugin} eq 'telegram')  &&  $answer->{misc}->{msg_format}) {
 			$reply = "```\n" . Anek () . "\n```";
-			$answer->{misc}->{msg_format} = 1;
 		} else {
 			$reply = Anek ();
 		}
-	} elsif (substr ($m->{message}, 1) eq 'cat' || substr ($m->{message}, 1) eq 'кис') {
-		if ($m->{plugin} eq 'telegram') {
+	} elsif ($cmd eq 'cat' || $cmd eq 'кис') {
+		if (($m->{plugin} eq 'telegram')  &&  $answer->{misc}->{msg_format}) {
 			my @cats = ('龴ↀ◡ↀ龴', '=^..^=', '≧◔◡◔≦ ','^ↀᴥↀ^');
-			my $cat = Kitty ();
-			$reply = sprintf '[%s](%s)', $cats[irand ($#cats + 1)], $cat;
-			$answer->{misc}->{msg_format} = 1;
+			$reply = sprintf '[%s](%s)', $cats[irand ($#cats + 1)], Kitty ();
 		} else {
 			$reply = Kitty ();
 		}
-	} elsif (substr ($m->{message}, 1) eq 'drink' || substr ($m->{message}, 1) eq 'праздник') {
+	} elsif ($cmd eq 'drink' || $cmd eq 'праздник') {
 		$reply = Drink ();
-	} elsif (substr ($m->{message}, 1) eq 'fox' || substr ($m->{message}, 1) eq 'лис') {
-		if ($m->{plugin} eq 'telegram') {
-			my $fox = Fox ();
-			$reply = sprintf '[-^^,--,~](%s)', $fox;
-			$answer->{misc}->{msg_format} = 1;
+	} elsif ($cmd eq 'fox' || $cmd eq 'лис') {
+		if (($m->{plugin} eq 'telegram')  &&  $answer->{misc}->{msg_format}) {
+			$reply = sprintf '[-^^,--,~](%s)', Fox ();
 		} else {
 			$reply = Fox ();
 		}
-	} elsif (substr ($m->{message}, 1) eq 'frog' || substr ($m->{message}, 1) eq 'лягушка') {
-		if ($m->{plugin} eq 'telegram') {
+	} elsif ($cmd eq 'frog' || $cmd eq 'лягушка') {
+		if (($m->{plugin} eq 'telegram')  &&  $answer->{misc}->{msg_format}) {
 			my @art = qw (frog toad лягушка);
-			my $frog = Frog ();
-			$reply = sprintf '[%s](%s)', $art [irand ($#art + 1)], $frog;
-			$answer->{misc}->{msg_format} = 1;
+			$reply = sprintf '[%s](%s)', $art [irand ($#art + 1)], Frog ();
 		} else {
 			$reply = Frog ();
 		}
-	} elsif (substr ($m->{message}, 1) eq 'horse' || substr ($m->{message}, 1) eq 'лошадь' || substr ($m->{message}, 1) eq 'лошадка') {
-		if ($m->{plugin} eq 'telegram') {
+	} elsif ($cmd eq 'horse' || $cmd eq 'лошадь' || $cmd eq 'лошадка') {
+		if (($m->{plugin} eq 'telegram')  &&  $answer->{misc}->{msg_format}) {
 			my @art = qw (horse лошадь лошадка);
-			my $horse = Horse ();
-			$reply = sprintf '[%s](%s)', $art [irand ($#art + 1)], $horse;
-			$answer->{misc}->{msg_format} = 1;
+			$reply = sprintf '[%s](%s)', $art [irand ($#art + 1)], Horse ();
 		} else {
 			$reply = Horse ();
 		}
-	} elsif (substr ($m->{message}, 1) eq 'monkeyuser') {
+	} elsif ($cmd eq 'monkeyuser') {
+		if (($m->{plugin} eq 'telegram')  &&  $answer->{misc}->{msg_format}) {
+			$reply = sprintf '[monkeyuser](%s)', Monkeyuser ();
+		} else {
 			$reply = Monkeyuser ();
-	} elsif (substr ($m->{message}, 1) eq 'owl' || substr ($m->{message}, 1) eq 'сова' || substr ($m->{message}, 1) eq 'сыч') {
-		if ($m->{plugin} eq 'telegram') {
-			my $owl = Owl ();
-			$reply = sprintf '[{ O v O }](%s)', $owl;
-			$answer->{misc}->{msg_format} = 1;
+		}
+	} elsif ($cmd eq 'owl' || $cmd eq 'сова' || $cmd eq 'сыч') {
+		if (($m->{plugin} eq 'telegram')  &&  $answer->{misc}->{msg_format}) {
+			$reply = sprintf '[{ O v O }](%s)', Owl ();
 		} else {
 			$reply = Owl ();
 		}
-	} elsif (substr ($m->{message}, 1) eq 'rabbit' || substr ($m->{message}, 1) eq 'bunny' || substr ($m->{message}, 1) eq 'кролик') {
-		if ($m->{plugin} eq 'telegram') {
-			my $rabbit = Rabbit ();
-			$reply = sprintf '[(\_/)](%s)', $rabbit;
-			$answer->{misc}->{msg_format} = 1;
+	} elsif ($cmd eq 'rabbit' || $cmd eq 'bunny' || $cmd eq 'кролик') {
+		if (($m->{plugin} eq 'telegram')  &&  $answer->{misc}->{msg_format}) {
+			$reply = sprintf '[(\_/)](%s)', Rabbit ();
 		} else {
 			$reply = Rabbit ();
 		}
-	} elsif (substr ($m->{message}, 1) eq 'snail' || substr ($m->{message}, 1) eq 'улитка') {
-		if ($m->{plugin} eq 'telegram') {
+	} elsif ($cmd eq 'snail' || $cmd eq 'улитка') {
+		if (($m->{plugin} eq 'telegram')  &&  $answer->{misc}->{msg_format}) {
 			my @art = qw ('-'_@_ @╜ @_'-');
-			my $snail = Snail ();
-			$reply = sprintf '[%s](%s)', $art [irand ($#art + 1)], $snail;
-			$answer->{misc}->{msg_format} = 1;
+			$reply = sprintf '[%s](%s)', $art [irand ($#art + 1)], Snail ();
 		} else {
 			$reply = Snail ();
 		}
-	} elsif (substr ($m->{message}, 1) eq 'xkcd') {
+	} elsif ($cmd eq 'xkcd') {
+		if (($m->{plugin} eq 'telegram')  &&  $answer->{misc}->{msg_format}) {
+			$reply = sprintf '[xkcd](%s)', Xkcd ();
+		} else {
 			$reply = Xkcd ();
-	} elsif (substr ($m->{message}, 1, 2) eq 'w ' || substr ($m->{message}, 1, 2) eq 'п ') {
-		my $city = substr $m->{message}, 2;
+		}
+	} elsif ($cmd =~ /^(w|weather|п|погода|погодка|погадка)\s+(.+)$/gui) {
+		my $city = $2;
 		$reply = Weather ($city);
-	} elsif (substr ($m->{message}, 1, 8) eq 'weather ' || substr ($m->{message}, 1, 8) eq 'погодка ' || substr ($m->{message}, 1, 8) eq 'погадка ') {
-		my $city = substr $m->{message}, 9;
-		$reply = Weather ($city);
-	} elsif (substr ($m->{message}, 1, 7) eq 'погода ') {
-		my $city = substr $m->{message}, 8;
-		$reply = Weather ($city);
-	} elsif (substr ($m->{message}, 1) eq 'tits'    ||
-             substr ($m->{message}, 1) eq 'boobs'   ||
-             substr ($m->{message}, 1) eq 'tities'  ||
-             substr ($m->{message}, 1) eq 'boobies' ||
-             substr ($m->{message}, 1) eq 'сиси'    ||
-             substr ($m->{message}, 1) eq 'сисечки') {
+	} elsif ($cmd eq 'tits'    ||
+             $cmd eq 'boobs'   ||
+             $cmd eq 'tities'  ||
+             $cmd eq 'boobies' ||
+             $cmd eq 'сиси'    ||
+             $cmd eq 'сисечки') {
 		if ($m->{plugin} eq 'telegram') {
 			my @art = ('(. )( .)', '(  . Y .  )', '(o)(o)', '( @ )( @ )', '(.)(.)');
 			my $oboobs = Oboobs ();
@@ -161,11 +199,11 @@ my $parse_message = sub {
 		} else {
 			$reply = Oboobs ();
 		}
-	} elsif (substr ($m->{message}, 1) eq 'butt'  ||
-		     substr ($m->{message}, 1) eq 'booty' ||
-		     substr ($m->{message}, 1) eq 'ass'   ||
-		     substr ($m->{message}, 1) eq 'попа'  ||
-		     substr ($m->{message}, 1) eq 'попка') {
+	} elsif ($cmd eq 'butt'  ||
+		     $cmd eq 'booty' ||
+		     $cmd eq 'ass'   ||
+		     $cmd eq 'попа'  ||
+		     $cmd eq 'попка') {
 		if ($m->{plugin} eq 'telegram') {
 			my @art = ('(__(__)', '(_!_)', '(__.__)');
 			my $obutts = Obutts ();
@@ -243,10 +281,8 @@ sub RunWebApp {
 		);
 	}

-	Mojo::IOLoop::Signal->on (
-		TERM => $__signal_handler,
-		INT  => $__signal_handler,
-	);
+	Mojo::IOLoop::Signal->on (TERM => $__signal_handler);
+	Mojo::IOLoop::Signal->on (INT  => $__signal_handler);

 	do { Mojo::IOLoop->start } until Mojo::IOLoop->is_running;
 	return;
--- a/lib/WebApp/Client.pm
+++ b/lib/WebApp/Client.pm
@@ -176,7 +176,7 @@ sub Buni {
 				@a = $p->get_tag ('meta'); ## no critic (Variables::RequireLocalizedPunctuationVars)

 				if (defined $a[0][1]->{property} && $a[0][1]->{property} eq 'og:image') {
-					$ret = sprintf '[buni](%s)', $a[0][1]->{content};
+					$ret = $a[0][1]->{content};
 					last;
 				}

@@ -193,7 +193,7 @@ sub Drink {
 	my $r;
 	my $ret = 'Не знаю праздников - вджобываю весь день на шахтах, как проклятая.';
 	my ($dayNum, $monthNum) = (localtime ())[3, 4];
-	my $url = sprintf 'https://kakoysegodnyaprazdnik.ru/baza/%s/%s', $MONTH[$monthNum], $dayNum;
+	my $url = 'https://prazdniki-segodnya.ru/';

 	# Those POSIX assholes just forgot to add unix timestamps without TZ offset, so...
 	my ($mday, $mon, $year) = (gmtime ())[3, 4, 5];
@@ -254,28 +254,33 @@ sub Drink {
 	if ($r->is_success) {
 		my $p = HTML::TokeParser->new(\$r->body);
 		my @a;
-		my @holyday;
+		my %holiday;

 		do {
 			$#a = -1;
-			@a = $p->get_tag('span'); ## no critic (Variables::RequireLocalizedPunctuationVars)
+			@a = $p->get_tag ('div'); ## no critic (Variables::RequireLocalizedPunctuationVars)

-			if ($#{$a[0]} > 2 && defined $a[0][1]->{itemprop} && $a[0][1]->{itemprop} eq 'text') {
-				push @holyday,'* ' . decode ('UTF-8', $p->get_trimmed_text ('/span'));
+			if ($#{$a[0]} > 2) {
+				my @shitty_array = $a[0];
+				foreach my $item (@shitty_array) {
+					if (ref $item) {
+						foreach my $item1 (@{$item}) {
+							my %h = eval { %{$item1} };
+							
+							if (defined ($h{class}) && $h{class} eq 'list-group-item text-monospace') {
+								$holiday {'* ' . decode ('UTF-8', $p->get_trimmed_text ('/div'))} = 1;
+							}
+						}
+					}
+				}
 			}
-
 		} while ($#{$a[0]} > 1);

-		if ($#holyday > 0) {
-			# cut off something weird, definely not a "holyday"
-			$#holyday = $#holyday - 1;
-		}
-
-		if ($#holyday > 0) {
-			$ret = join "\n", @holyday;
+		if (int (keys (%holiday)) > 0) {
+			$ret = join "\n", sort (keys (%holiday));
 		}
 	} else {
-		$log->warn (sprintf '[WARN] Kakoysegodnyaprazdnik server return status %s with message: %s', $r->code, $r->message);
+		$log->warn (sprintf '[WARN] prazdniki-segodnya.ru server return status %s with message: %s', $r->code, $r->message);
 	}

 	return $ret;
@@ -314,7 +319,7 @@ sub Monkeyuser {
 		} while ($#{$a[0]} > 1);

 		if ($#link > 0) {
-			$ret = sprintf '[MonkeyUser](https://www.monkeyuser.com%s)', $link [irand (1 + $#link)];
+			$ret = sprintf 'https://www.monkeyuser.com%s', $link [irand (1 + $#link)];
 		}
 	} else {
 		$log->warn (sprintf '[WARN] MonkeyUser server return status %s with message: %s', $r->{status}, $r->{reason});
@@ -536,7 +541,7 @@ sub Xkcd {
 	} while ($c < 3 || $status >= 404);

 	if ($status == 200) {
-		return sprintf '[xkcd.ru](%s)', $location;
+		return $location;
 	}

 	return 'Комикс-стрип нарисовать не так-то просто :(';
Author	SHA1	Message	Date
eleksir	f25a4d9ea3	Fix redis message processing, duh	2022-06-21 23:14:01 +03:00
eleksir	3d6be5ae04	Fix !drink for newer perl, also delete unused/obsolete code	2022-06-21 23:00:37 +03:00
eleksir	4c6a1ea4cd	Bump version of Mojolicious 9.24 -> 9.26	2022-06-21 22:58:21 +03:00
eleksir	a891c7ed6f	Fix !drink command, kind of	2022-05-25 20:40:14 +03:00
eleksir	0daaa6f568	Update cpanfile: bump Mojolicious version 9.22 -> 9.24, drop Protocol::Redis::XS	2022-04-24 02:06:44 +03:00
eleksir	209c9f1ad7	Use less substrs, more deeply tidy incoming json data	2022-04-18 17:24:14 +03:00
eleksir	44a22a3382	Fix a bit code formatting in Client.pm	2022-04-18 17:22:56 +03:00
eleksir	b6a4aaa4c1	Fix handling formating for telegram	2022-04-17 17:09:53 +03:00