Bump pinned versions in cpanfile, again

README

@@ -72,3 +72,10 @@ service aleesa-webapp start
 
 в автозагрузку его можно прописать через команду:
 rc-update add aleesa-webapp default
+
+
+На MacOS вылазит ошибка BerkeleyDB.xs:82:2: error: db.h is from Berkeley DB 1.x - need at least Berkeley DB 2.6.4
+------------------------------------------------------------------------------------------------------------------------
+На момент 04.02.2023 в Mac OS Ventura (13.1), это чинится установкой через brew пакета berkeley-db4:
+brew install berkeley-db4
+brew link berkeley-db4 --force

bin/aleesa-webapp

@@ -43,7 +43,6 @@ sub __fork;
 sub __signal_handler;
 
 local $OUTPUT_AUTOFLUSH = 1;
-my $runAsUid = $UID;
 
 my $piddir = '/var/run/' . basename (abs_path $PROGRAM_NAME);
 my $C = LoadConf ();

cpanfile

@@ -2,34 +2,36 @@
 requires 'Carp',                    '==1.50';
 requires 'CHI',                     '==0.61';
 requires 'CHI::Driver::BerkeleyDB', '==0.05';
-requires 'Clone',                   '==0.45';
+requires 'Clone',                   '==0.46';
 requires 'Cwd',                     '==3.75';
 requires 'Cwd::utf8',               '==0.011';
-requires 'DateTime',                '==1.55';
+requires 'DateTime',                '==1.59';
 requires 'Digest::HMAC_SHA1',       '==1.04';
-requires 'Encode',                  '==3.16';
+requires 'Encode',                  '==3.19';
 requires 'English',                 '0';
 requires 'EV',                      '==4.33';
-requires 'File::Basename',          '==2.85';
+requires 'File::Basename',          '0';
 requires 'File::Path',              '==2.18';
 requires 'File::Spec',              '==3.75';
-requires 'HTML::TokeParser',        '==3.76';
+requires 'HTML::TokeParser',        '==3.81';
-requires 'IO::Socket::SSL',         '==2.073';
+requires 'IO::Socket::SSL',         '==2.081';
-requires 'JSON',                    '==4.04';
+requires 'JSON',                    '==4.10';
 requires 'JSON::XS',                '==4.03';
-requires 'local::lib',              '==2.000028';
+requires 'local::lib',              '==2.000029';
-requires 'Log::Any',                '==1.710';
+requires 'Log::Any',                '==1.714';
-requires 'Log::Any::Adapter',       '==1.710';
+requires 'Log::Any::Adapter',       '==1.714';
 requires 'Log::Any::For::Std',      '==0.05';
 requires 'Math::Random::Secure',    '==0.080001';
 requires 'MIME::Base64',            '==3.16';
-requires 'Mojolicious',             '==9.24';
+requires 'Mojolicious',             '==9.31';
 requires 'Mojo::IOLoop::Signal',    '==0.003';
 # Чтобы заткнуть Mojo::UserAgent::Cached
 requires 'Mojo::Log',               '0';
-requires 'Mojo::Redis',             '==3.27';
+requires 'Mojo::Redis',             '==3.29';
 requires 'Mojo::UserAgent',         '0';
-requires 'Mojo::UserAgent::Cached', '==1.18';
+requires 'Mojo::UserAgent::Cached', '==1.25';
 requires 'POSIX',                   '0';
+# Рекомендованный модуль для DateTime
+requires 'Sub::Util',               '==1.63';
 requires 'URI::Encode::XS',         '==0.11';
-requires 'URI::URL',                '==5.10';
+requires 'URI::URL',                '==5.19';

lib/WebApp.pm

@@ -98,17 +98,17 @@ my $parse_message = sub {
 		$answer->{misc}->{username} = 'user';
 	}
 
-	if (length $m->{message} <= length $answer->{csign}) {
+	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->{csign})) ne $answer->{csign}) {
+	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->{csign});
+	my $cmd = substr $m->{message}, length ($answer->{misc}->{csign});
 
 	if ($cmd eq 'buni') {
 		if (($m->{plugin} eq 'telegram')  &&  $answer->{misc}->{msg_format}) {

lib/WebApp/Client.pm

@@ -31,7 +31,6 @@ use version; our $VERSION = qw (1.0);
 use Exporter qw (import);
 our @EXPORT_OK = qw (Anek Buni Drink Monkeyuser Kitty Fox Oboobs Obutts Rabbit Owl Frog Horse Snail Xkcd Weather);
 
-my @MONTH = qw (yanvar fevral mart aprel may iyun iyul avgust sentyabr oktyabr noyabr dekabr);
 my $c = LoadConf ();
 my $cachedir = $c->{cachedir};
 
@@ -193,7 +192,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 +253,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') {
+			if ($#{$a[0]} > 2) {
-				push @holyday,'* ' . decode ('UTF-8', $p->get_trimmed_text ('/span'));
+				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) {
+		if (int (keys (%holiday)) > 0) {
-			# cut off something weird, definely not a "holyday"
+			$ret = join "\n", sort (keys (%holiday));
-			$#holyday = $#holyday - 1;
-		}
-
-		if ($#holyday > 0) {
-			$ret = join "\n", @holyday;
 		}
 	} 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;
@@ -616,7 +620,6 @@ sub __weather {
 	my $city = shift;
 	$city = urlencode $city;
 	my $appid = $c->{openweathermap}->{appid};
-	my $now = time ();
 	my $fc;
 	my $w;