From 74a0b0aa3b0e0b3549b28c95dec4fff96d83f9be Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Mon, 26 Oct 2020 12:36:33 -0700
Subject: [PATCH 01/41] Add github actions for my self hosted runner

---
 .github/workflows/ci.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..445d729
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,22 @@
+name: CI
+
+on: [push]
+
+jobs:
+  perl-job:
+    runs-on: [self-hosted]
+    container:
+      image: perl:${{ matrix.perl-version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        perl-version:
+          - '5.32'
+          - 'latest'
+    name: Perl ${{ matrix.perl-version }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Regular tests
+        run: |
+            cpanm --installdeps --notest .
+            prove

From 0e6cede20a42ca518d39fa42050c3eb84d2bc41f Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Mon, 26 Oct 2020 12:59:32 -0700
Subject: [PATCH 02/41] Creating new cpanfile that only covers the bot

---
 cpanfile2                              |   7 -
 cpanfile_diffed                        | 164 ------------------
 cpanfile_scanned                       |  50 ------
 cpanfiletest.pl                        |  23 ---
 cpanfile_sorted => evalserver_cpanfile | 230 ++++++++++++++++---------
 5 files changed, 152 insertions(+), 322 deletions(-)
 delete mode 100644 cpanfile2
 delete mode 100644 cpanfile_diffed
 delete mode 100644 cpanfile_scanned
 delete mode 100644 cpanfiletest.pl
 rename cpanfile_sorted => evalserver_cpanfile (55%)

diff --git a/cpanfile2 b/cpanfile2
deleted file mode 100644
index 5b1864f..0000000
--- a/cpanfile2
+++ /dev/null
@@ -1,7 +0,0 @@
-Usage:
-        % scan-prereqs-cpanfile
-
-            --diff=META.json      # Generate diff from META.json
-            --diff=cpanfile       # Generate diff from cpanfile
-            --ignore=extlib/
-
diff --git a/cpanfile_diffed b/cpanfile_diffed
deleted file mode 100644
index ab50b1e..0000000
--- a/cpanfile_diffed
+++ /dev/null
@@ -1,164 +0,0 @@
---- cpanfile_scanned	2017-06-21 17:40:10.000000000 -0400
-+++ cpanfile_sorted	2017-06-21 17:41:53.000000000 -0400
-@@ -1,80 +1,91 @@
-
-requires 'autodie';
-requires 'Cache::FastMmap';
-requires 'Cache::File';
-requires 'Cache::Mmap';
-requires 'Config::General';
-requires 'Cpanel::JSON::XS';
-requires 'Data::Dumper';
-requires 'DBD::SQLite';
-requires 'DBI';
-requires 'Encode';
-requires 'HTTP::Status';
-requires 'IO::String';
-requires 'JSON::MaybeXS';
-requires 'perl', '5.24';
-requires 'POE';
-requires 'POE::Component::IRC';
-requires 'POE::Component::IRC::Common';
-requires 'POE::Component::IRC::Plugin::AutoJoin';
-requires 'POE::Component::IRC::Plugin::Connector';
-requires 'POE::Component::IRC::Plugin::NickReclaim';
-requires 'POE::Component::IRC::State';
-requires 'POE::Component::Server::SimpleHTTP';
-requires 'POE::Component::Server::TCP';
-requires 'POE::Filter::Line';
-requires 'POE::Filter::Reference';
-requires 'POE::Filter::Stream';
-requires 'POE::Session';
-requires 'POE::Wheel::ReadWrite';
-requires 'POE::Wheel::Run';
-requires 'POE::Wheel::SocketFactory';
-requires 'Scalar::Util';
-requires 'Socket';
-requires 'Sys::Linux::Mount';
-requires 'Sys::Linux::Namespace';
-requires 'Template';
-requires 'Term::ANSIColor';
-requires 'Text::ParseWords';
-requires 'Tie::Hash::NamedCapture';
-requires 'Data::Dumper';
- requires 'BSD::Resource';
- requires 'Cache::FastMmap';
- requires 'Parse::RecDescent';
-
- requires 'Text::Glob';
-
--requires 'Memoize';
-
-feature 'perlbot_plugins' => sub {
-	requires 'App::EvalServerAdvanced::Protocol';
- requires 'Text::Metaphone';
- 	requires 'Geo::IP';
- requires 'WWW::Mechanize';
- requires 'WWW::Shorten';
--requires 'WWW::Shorten::TinyURL';
- requires 'DBD::SQLite::BundledExtensions';
-};
-
-feature 'eval_needed' => {
--requires 'Linux::Clone';
- requires 'Moo';
- requires 'Linux::Seccomp';
-+requires 'Mojo::Collection';
-+requires 'Mojo::DOM';
-+requires 'Mojo::DOM::CSS';
- requires 'Moo';
-+requires 'Marpa::R2';
- requires 'JSON';
-+requires 'JSON::PP';
-+requires 'JSON::Tiny';
-+requires 'JSON::XS';
-+requires 'arybase';
-+requires 'autovivification';
-+requires 'bigint';
-+requires 'Capture::Tiny';
-+requires 'Class::Tiny';
- requires 'BSD::Resource';
-+requires 'Syntax::Keyword::Try';
-+requires 'Capture::Tiny';
-+requires 'Class::Tiny';
-+requires 'Cpanel::JSON::XS';
-+requires 'Cwd';
-+requires 'Data::Munge';
-+requires 'Date::Parse';
-+requires 'DateTime';
-+requires 'DateTimeX::Easy';
-+requires 'Digest::MD5';
-+requires 'Digest::SHA';
-+requires 'Errno';
-+requires 'File::Glob';
-+requires 'File::Open';
- requires 'File::Slurper';
- requires 'File::Temp';
-}
-
-feature 'eval_optional' => {
-}
-
---- cpanfile_scanned	2017-06-21 18:24:13.000000000 -0400
-+++ cpanfile_sorted	2017-06-21 17:41:53.000000000 -0400
-@@ -1,50 +1,91 @@
- requires 'Encode';
-+requires 'Function::Parameters';
-+requires 'Future';
-+requires 'Geo::IP';
-+requires 'HTML::TreeBuilder';
-+requires 'HTML::TreeBuilder::XPath';
-+requires 'indirect';
-+requires 'IO::Async'; 
-+requires 'IPC::Run';
-+requires 'JSON';
- requires 'JSON::MaybeXS';
-+requires 'JSON::PP';
-+requires 'JSON::Tiny';
-+requires 'JSON::XS';
--requires 'Linux::Clone';
- requires 'Linux::Seccomp';
-+requires 'List::MoreUtils';
-+requires 'List::SomeUtils';
- requires 'List::Util';
-+requires 'List::UtilsBy';
-+requires 'LWP::Protocol::https';
-+requires 'Marpa::R2';
-+requires 'Math::BigFloat';
-+requires 'Math::BigInt';
-+requires 'Math::BigRat';
-+requires 'Math::Round';
-+requires 'Mojo::Collection';
-+requires 'Mojo::DOM';
-+requires 'Mojo::DOM::CSS';
-+requires 'Moose';
-+requires 'MooseX::Declare';
-+requires 'Net::Dict';
-+requires 'Net::DNS';
-+requires 'Net::INET6Glue::INET_is_INET6';
-+requires 'Path::Tiny';
- requires 'Perl::Tidy';
- requires 'Permute::Named::Iter';
-+requires 'POE';
-+requires 'POE::Component::IRC';
-+requires 'POE::Component::IRC::Common';
-+requires 'POSIX';
-+requires 'Quote::Code';
-+requires 'Rand::MersenneTwister';
-+requires 'Regexp::Common';
-+requires 'Return::MultiLevel';
-+requires 'Scalar::MoreUtils';
-+requires 'Scalar::Util'; #Required by Data::Dumper
-+requires 'Switch::Plain';
-+requires 'Syntax::Keyword::Try';
-+requires 'Sys::Linux::Namespace'.013;
-+requires 'Text::Levenshtein';
-+requires 'Text::Metaphone';
-+requires 'Time::Moment';
-+requires 'Try::Tiny::ByClass';
-+requires 'Types::Standard';
-+requires 'URI::Encode';
-+requires 'WWW::Mechanize';
-+requires 'WWW::Shorten';
-+requires 'XML::RSS::Parser';
-+requires 'YAPE::Regex::Explain';
diff --git a/cpanfile_scanned b/cpanfile_scanned
deleted file mode 100644
index fe2d6bb..0000000
--- a/cpanfile_scanned
+++ /dev/null
@@ -1,50 +0,0 @@
-requires 'BSD::Resource';
-requires 'Cache::FastMmap';
-requires 'Cache::File';
-requires 'Cache::Mmap';
-requires 'Config::General';
-requires 'DBD::SQLite';
-requires 'DBI';
-requires 'Encode';
-requires 'File::Slurper';
-requires 'File::Temp';
-requires 'HTTP::Status';
-requires 'IO::String';
-requires 'JSON::MaybeXS';
-requires 'Linux::Clone';
-requires 'Linux::Seccomp';
-requires 'List::Util';
-requires 'Memoize';
-requires 'Moo';
-requires 'POE';
-requires 'POE::Component::IRC';
-requires 'POE::Component::IRC::Common';
-requires 'POE::Component::IRC::Plugin::AutoJoin';
-requires 'POE::Component::IRC::Plugin::Connector';
-requires 'POE::Component::IRC::Plugin::NickReclaim';
-requires 'POE::Component::IRC::State';
-requires 'POE::Component::Server::SimpleHTTP';
-requires 'POE::Component::Server::TCP';
-requires 'POE::Filter::Line';
-requires 'POE::Filter::Reference';
-requires 'POE::Filter::Stream';
-requires 'POE::Session';
-requires 'POE::Wheel::ReadWrite';
-requires 'POE::Wheel::Run';
-requires 'POE::Wheel::SocketFactory';
-requires 'Parse::RecDescent';
-requires 'Perl::Tidy';
-requires 'Permute::Named::Iter';
-requires 'Scalar::Util';
-requires 'Socket';
-requires 'Sys::Linux::Mount';
-requires 'Sys::Linux::Namespace';
-requires 'Template';
-requires 'Term::ANSIColor';
-requires 'Text::Glob';
-requires 'Text::Handlebars';
-requires 'Text::Metaphone';
-requires 'Text::ParseWords';
-requires 'Tie::Hash::NamedCapture';
-requires 'autodie';
-requires 'perl', '5.24';
diff --git a/cpanfiletest.pl b/cpanfiletest.pl
deleted file mode 100644
index 9c694ed..0000000
--- a/cpanfiletest.pl
+++ /dev/null
@@ -1,23 +0,0 @@
-use strict;
-use warnings;
-
-use Module::CPANfile;
-use Data::Dumper;
-
-my $file = Module::CPANfile->load("/home/ryan/bots/perlbuut/cpanfile");
-
-my $prereqs = $file->prereqs;
-
-my @phases = $prereqs->phases;
-my @prereqs;
-
-for my $phase (@phases) {
-  # TODO try/catch and check other types
-  for my $type (qw/requires recommends/) {
-    push @prereqs, $prereqs->requirements_for($phase, $type)->required_modules;
-  }
-}
-
-# TODO uniq
-
-print Dumper(\@prereqs);
diff --git a/cpanfile_sorted b/evalserver_cpanfile
similarity index 55%
rename from cpanfile_sorted
rename to evalserver_cpanfile
index f544932..3b5388f 100644
--- a/cpanfile_sorted
+++ b/evalserver_cpanfile
@@ -1,91 +1,165 @@
-requires 'App::EvalServerAdvanced';
-requires 'arybase';
-requires 'autovivification';
-requires 'bigint';
-requires 'BSD::Resource';
-requires 'Cache::FastMmap';
-requires 'Capture::Tiny';
-requires 'Class::Tiny';
+requires 'Sys::Linux::Namespace' => 'v0.13.0';
+requires 'POE';
+requires 'Parse::RecDescent';
 requires 'Config::General';
-requires 'Cpanel::JSON::XS';
-requires 'Cwd';
-requires 'Data::Dumper';
-requires 'Data::Munge';
-requires 'Date::Parse';
-requires 'DateTime';
-requires 'DateTimeX::Easy';
+requires 'Cache::FastMmap';
+requires 'POE::Component::IRC::Common';
+requires 'POE::Component::IRC';
+requires 'Text::Handlebars';
+
+requires 'Geo::IP';
+requires 'XML::RSS::Parser';
+requires 'WWW::Shorten';
+requires 'WWW::Mechanize';
+requires 'URI::Encode';
+requires 'Text::Glob';
+
 requires 'DBD::SQLite';
-requires 'DBD::SQLite::BundledExtensions';
 requires 'DBI';
+requires 'Net::DNS';
+requires 'HTML::TreeBuilder';
+requires 'Net::INET6Glue::INET_is_INET6';
+
+requires 'Net::Dict';
+requires 'HTML::TreeBuilder::XPath';
+
+requires 'Data::Dumper';
+requires 'Scalar::Util'; #Required by Data::Dumper
+requires 'BSD::Resource';
+requires 'File::Glob';
+requires 'POSIX';
+requires 'POSIX::strptime';
+
+requires 'List::Util';
+requires 'List::MoreUtils';
+requires 'List::UtilsBy';
+requires 'Data::Munge';
+requires 'Scalar::MoreUtils';
+requires 'Regexp::Common';
+requires 'Encode';
 requires 'Digest::MD5';
 requires 'Digest::SHA';
-requires 'Encode';
-requires 'Errno';
-requires 'File::Glob';
-requires 'File::Open';
-requires 'File::Slurper';
-requires 'File::Temp';
-requires 'Function::Parameters';
-requires 'Future';
-requires 'Geo::IP';
-requires 'HTML::TreeBuilder';
-requires 'HTML::TreeBuilder::XPath';
-requires 'indirect';
-requires 'IO::Async'; 
-requires 'IPC::Run';
-requires 'JSON';
-requires 'JSON::MaybeXS';
-requires 'JSON::PP';
-requires 'JSON::Tiny';
-requires 'JSON::XS';
-requires 'Linux::Seccomp';
-requires 'List::MoreUtils';
-requires 'List::SomeUtils';
-requires 'List::Util';
-requires 'List::UtilsBy';
-requires 'LWP::Protocol::https';
-requires 'Marpa::R2';
-requires 'Math::BigFloat';
-requires 'Math::BigInt';
-requires 'Math::BigRat';
-requires 'Math::Round';
-requires 'Mojo::Collection';
-requires 'Mojo::DOM';
-requires 'Mojo::DOM::CSS';
-requires 'Moo';
+requires 'DateTime';
+requires 'DateTimeX::Easy';
+requires 'Date::Parse';
+
 requires 'Moose';
 requires 'MooseX::Declare';
-requires 'Net::Dict';
-requires 'Net::DNS';
-requires 'Net::INET6Glue::INET_is_INET6';
-requires 'Parse::RecDescent';
-requires 'Path::Tiny';
-requires 'Perl::Tidy';
-requires 'Permute::Named::Iter';
-requires 'POE';
-requires 'POE::Component::IRC';
-requires 'POE::Component::IRC::Common';
-requires 'POSIX';
-requires 'Quote::Code';
+
+requires 'Function::Parameters';
+
 requires 'Rand::MersenneTwister';
-requires 'Regexp::Common';
-requires 'Return::MultiLevel';
-requires 'Scalar::MoreUtils';
-requires 'Scalar::Util'; #Required by Data::Dumper
+# requires 'arybase'; # removed in 5.29
+requires 'Errno';
+requires 'JSON';
+requires 'JSON::PP';
+requires 'JSON::XS';
+requires 'JSON::MaybeXS';
+requires 'Cpanel::JSON::XS';
+
+requires 'LWP::Protocol::https';
+requires 'Mojo::DOM';
+requires 'Mojo::DOM::CSS';
+requires 'Mojo::Collection';
+requires 'YAPE::Regex::Explain';
+requires 'bigint';
+requires 'Math::BigInt';
+requires 'Math::BigFloat';
+requires 'Math::BigRat';
+requires 'indirect';
+requires 'Moo';
+requires 'autovivification';
+
+requires 'Linux::Seccomp';
+requires 'Cwd';
+# requires 'Algorithm::Permute';
+requires 'File::Slurper';
+requires 'Path::Tiny';
+requires 'Time::Moment';
 requires 'Switch::Plain';
-requires 'Syntax::Keyword::Try';
-requires 'Sys::Linux::Namespace'.013;
-requires 'Text::Glob';
-requires 'Text::Handlebars';
+requires 'Quote::Code';
+# requires 'JSON::Tiny'; # broken in the canary
+
+requires 'List::SomeUtils';
+requires 'IO::Async'; 
+requires 'Future';
+requires 'Class::Tiny';
+requires 'Capture::Tiny';
+
+requires 'Return::MultiLevel';
+requires 'Try::Tiny::ByClass';
+requires 'IPC::Run';
+requires 'Text::Metaphone';
+
+requires 'DBD::SQLite::BundledExtensions';
 requires 'Text::Levenshtein';
 requires 'Text::Metaphone';
-requires 'Text::Metaphone';
-requires 'Time::Moment';
-requires 'Try::Tiny::ByClass';
+requires 'Math::Round';
 requires 'Twitter::API';
 requires 'Types::Standard';
-requires 'URI::Encode';
-requires 'WWW::Mechanize';
-requires 'WWW::Shorten';
-requires 'XML::RSS::Parser';
-requires 'YAPE::Regex::Explain';
+requires 'Perl::Tidy';
+requires 'File::Temp';
+requires 'Permute::Named::Iter';
+requires 'Marpa::R2';
+requires 'Syntax::Keyword::Try';
+requires 'File::Open';
+requires 'App::EvalServerAdvanced';
+requires 'Dir::ls';
+requires 'Object::Tap';
+requires 'XML::LibXML';
+# requires 'Sereal'; # comment out temporarily
+
+requires 'Email::Sender::Transport::Test';
+requires 'Task::Kensho::Async';
+requires 'Task::Kensho::Config';
+#requires 'Task::Kensho::Date';
+#requires 'Task::Kensho::DBDev';
+requires 'Task::Kensho::Email';
+requires 'Task::Kensho::Logging';
+requires 'Task::Kensho::ModuleDev';
+requires 'Task::Kensho::OOP';
+#requires 'Task::Kensho::Testing';
+#requires 'Task::Kensho::XML';
+requires 'Text::Unidecode';
+requires 'experimental';
+
+requires 'Math::Calc::Parser';
+
+requires 'ReadonlyX';
+requires 'Const::Fast';
+requires 'DateTime::Event::Holiday::US';
+requires 'App::EvalServerAdvanced::ConstantCalc';
+
+requires 'Crypt::OpenSSL::X509';
+
+requires 'Math::Random::Secure'; # undeclared dep of Data::Random::Flexible
+requires 'Data::Random::Flexible';
+requires 'Acme::AsciiEmoji';
+requires 'PadWalker';
+requires 'Encode::Simple';
+requires 'PPR';
+requires 'Keyword::Simple';
+requires 'Unicode::UTF8';
+requires 'List::Gather';
+requires 'Lingua::EN::Inflexion';
+requires 'local::lib';
+requires 'Array::Utils';
+requires 'DBD::SQLite';
+requires 'Mojo::SQLite';
+requires 'FFI::Platypus';
+requires 'Perl6::Take';
+requires 'List::AllUtils';
+requires 'IRC::FromANSI::Tiny';
+requires 'Unicode::GCString';
+requires 'Unicode::Util';
+requires 'Unicode::Collate';
+requires 'more';
+requires 'Data::Dumper::Compact';
+requires 'Carp::Always';
+requires 'V';
+requires 'Path::Tiny';
+requires 'CryptX';
+requires 'MIME::Base64';
+requires 'DateTime::Event::Cron';
+requires 'Regexp::Assemble';
+requires 'Regexp::Optimizer';

From e7670c8f9d60e1a60b527ad95d7e47b8bc2ce478 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Mon, 26 Oct 2020 13:24:36 -0700
Subject: [PATCH 03/41] new cpanfile is mostly ready

---
 cpanfile      | 250 +++++++++++++++++---------------------------------
 myscandeps.pl |  22 +++++
 2 files changed, 107 insertions(+), 165 deletions(-)
 create mode 100644 myscandeps.pl

diff --git a/cpanfile b/cpanfile
index 3b5388f..60ae89f 100644
--- a/cpanfile
+++ b/cpanfile
@@ -1,165 +1,85 @@
-requires 'Sys::Linux::Namespace' => 'v0.13.0';
-requires 'POE';
-requires 'Parse::RecDescent';
-requires 'Config::General';
-requires 'Cache::FastMmap';
-requires 'POE::Component::IRC::Common';
-requires 'POE::Component::IRC';
-requires 'Text::Handlebars';
-
-requires 'Geo::IP';
-requires 'XML::RSS::Parser';
-requires 'WWW::Shorten';
-requires 'WWW::Mechanize';
-requires 'URI::Encode';
-requires 'Text::Glob';
-
-requires 'DBD::SQLite';
-requires 'DBI';
-requires 'Net::DNS';
-requires 'HTML::TreeBuilder';
-requires 'Net::INET6Glue::INET_is_INET6';
-
-requires 'Net::Dict';
-requires 'HTML::TreeBuilder::XPath';
-
-requires 'Data::Dumper';
-requires 'Scalar::Util'; #Required by Data::Dumper
-requires 'BSD::Resource';
-requires 'File::Glob';
-requires 'POSIX';
-requires 'POSIX::strptime';
-
-requires 'List::Util';
-requires 'List::MoreUtils';
-requires 'List::UtilsBy';
-requires 'Data::Munge';
-requires 'Scalar::MoreUtils';
-requires 'Regexp::Common';
-requires 'Encode';
-requires 'Digest::MD5';
-requires 'Digest::SHA';
-requires 'DateTime';
-requires 'DateTimeX::Easy';
-requires 'Date::Parse';
-
-requires 'Moose';
-requires 'MooseX::Declare';
-
-requires 'Function::Parameters';
-
-requires 'Rand::MersenneTwister';
-# requires 'arybase'; # removed in 5.29
-requires 'Errno';
-requires 'JSON';
-requires 'JSON::PP';
-requires 'JSON::XS';
-requires 'JSON::MaybeXS';
-requires 'Cpanel::JSON::XS';
-
-requires 'LWP::Protocol::https';
-requires 'Mojo::DOM';
-requires 'Mojo::DOM::CSS';
-requires 'Mojo::Collection';
-requires 'YAPE::Regex::Explain';
-requires 'bigint';
-requires 'Math::BigInt';
-requires 'Math::BigFloat';
-requires 'Math::BigRat';
-requires 'indirect';
-requires 'Moo';
-requires 'autovivification';
-
-requires 'Linux::Seccomp';
-requires 'Cwd';
-# requires 'Algorithm::Permute';
-requires 'File::Slurper';
-requires 'Path::Tiny';
-requires 'Time::Moment';
-requires 'Switch::Plain';
-requires 'Quote::Code';
-# requires 'JSON::Tiny'; # broken in the canary
-
-requires 'List::SomeUtils';
-requires 'IO::Async'; 
-requires 'Future';
-requires 'Class::Tiny';
-requires 'Capture::Tiny';
-
-requires 'Return::MultiLevel';
-requires 'Try::Tiny::ByClass';
-requires 'IPC::Run';
-requires 'Text::Metaphone';
-
-requires 'DBD::SQLite::BundledExtensions';
-requires 'Text::Levenshtein';
-requires 'Text::Metaphone';
-requires 'Math::Round';
-requires 'Twitter::API';
-requires 'Types::Standard';
-requires 'Perl::Tidy';
-requires 'File::Temp';
-requires 'Permute::Named::Iter';
-requires 'Marpa::R2';
-requires 'Syntax::Keyword::Try';
-requires 'File::Open';
-requires 'App::EvalServerAdvanced';
-requires 'Dir::ls';
-requires 'Object::Tap';
-requires 'XML::LibXML';
-# requires 'Sereal'; # comment out temporarily
-
-requires 'Email::Sender::Transport::Test';
-requires 'Task::Kensho::Async';
-requires 'Task::Kensho::Config';
-#requires 'Task::Kensho::Date';
-#requires 'Task::Kensho::DBDev';
-requires 'Task::Kensho::Email';
-requires 'Task::Kensho::Logging';
-requires 'Task::Kensho::ModuleDev';
-requires 'Task::Kensho::OOP';
-#requires 'Task::Kensho::Testing';
-#requires 'Task::Kensho::XML';
-requires 'Text::Unidecode';
-requires 'experimental';
-
-requires 'Math::Calc::Parser';
-
-requires 'ReadonlyX';
-requires 'Const::Fast';
-requires 'DateTime::Event::Holiday::US';
-requires 'App::EvalServerAdvanced::ConstantCalc';
-
-requires 'Crypt::OpenSSL::X509';
-
-requires 'Math::Random::Secure'; # undeclared dep of Data::Random::Flexible
-requires 'Data::Random::Flexible';
-requires 'Acme::AsciiEmoji';
-requires 'PadWalker';
-requires 'Encode::Simple';
-requires 'PPR';
-requires 'Keyword::Simple';
-requires 'Unicode::UTF8';
-requires 'List::Gather';
-requires 'Lingua::EN::Inflexion';
-requires 'local::lib';
-requires 'Array::Utils';
-requires 'DBD::SQLite';
-requires 'Mojo::SQLite';
-requires 'FFI::Platypus';
-requires 'Perl6::Take';
-requires 'List::AllUtils';
-requires 'IRC::FromANSI::Tiny';
-requires 'Unicode::GCString';
-requires 'Unicode::Util';
-requires 'Unicode::Collate';
-requires 'more';
-requires 'Data::Dumper::Compact';
-requires 'Carp::Always';
-requires 'V';
-requires 'Path::Tiny';
-requires 'CryptX';
-requires 'MIME::Base64';
-requires 'DateTime::Event::Cron';
-requires 'Regexp::Assemble';
-requires 'Regexp::Optimizer';
+requires "App::EvalServerAdvanced::Protocol";
+requires "autodie";
+requires "CGI";
+requires "Config::General";
+requires "Crypt::Mode::CBC";
+requires "CryptX";
+requires "Data::Dumper";
+requires "DateTime::Event::Cron";
+requires "DateTime::Event::Holiday::US";
+requires "DBD::SQLite";
+requires "DBI";
+requires "Encode";
+requires "Encode";
+requires "Encode";
+requires "Encode";
+requires "EvalServer::Sandbox";
+requires "experimental";
+requires "Exporter";
+requires "feature";
+requires "FindBin";
+requires "GeoIP2::Database::Reader";
+requires "HTML::Entities";
+requires "HTML::TreeBuilder";
+requires "HTML::TreeBuilder::XPath";
+requires "HTTP::Status";
+requires "IO::Socket::INET";
+requires "IRC::FromANSI::Tiny";
+requires "IRC::Utils";
+requires "JSON";
+requires "JSON::MaybeXS";
+requires "JSON::MaybeXS";
+requires "JSON::MaybeXS";
+requires "JSON::MaybeXS";
+requires "lib";
+requires "List::Util";
+requires "List::Util";
+requires "LWP::Simple";
+requires "LWP::UserAgent";
+requires "Memoize";
+requires "Memoize";
+requires "MIME::Base64";
+requires "Module::ScanDeps";
+requires "Net::CIDR";
+requires "Net::Dict";
+requires "Net::DNS";
+requires "Net::INET6Glue::INET_is_INET6";
+requires "Parse::RecDescent";
+requires "Path::Tiny";
+requires "Paws";
+requires "Paws::Credential::Explicit";
+requires "POE";
+requires "POE::Component::IRC";
+requires "POE::Component::IRC::Common";
+requires "POE::Component::IRC::Common";
+requires "POE::Component::IRC::Plugin::AutoJoin";
+requires "POE::Component::IRC::Plugin::Connector";
+requires "POE::Component::IRC::Plugin::NickReclaim";
+requires "POE::Component::IRC::State";
+requires "POE::Component::Server::SimpleHTTP";
+requires "POE::Component::Server::TCP";
+requires "POE::Filter::Reference";
+requires "POE::Session";
+requires "POE::Wheel::ReadWrite";
+requires "POE::Wheel::Run";
+requires "POE::Wheel::SocketFactory";
+requires "Regexp::Assemble";
+requires "Regexp::Optimizer";
+requires "Socket";
+requires "strict";
+requires "Template";
+requires "Term::ANSIColor";
+requires "Text::Glob";
+requires "Text::Metaphone";
+requires "Twitter::API";
+requires "Unicode::UCD";
+requires "URI::Encode";
+requires "URI::Escape";
+requires "utf8";
+requires "v5.20.0";
+requires "v5.30";
+requires "warnings";
+requires "WWW::Mechanize";
+requires "WWW::Shorten";
+requires "WWW::Shorten::TinyURL";
+requires "XML::RSS::Parser";
diff --git a/myscandeps.pl b/myscandeps.pl
new file mode 100644
index 0000000..7ded9a5
--- /dev/null
+++ b/myscandeps.pl
@@ -0,0 +1,22 @@
+use Module::ScanDeps;
+use Data::Dumper;
+
+my @files = ('./bin/cpan_fetch.pl', './bin/generate_metaphones.pl', './bin/test_eval.pl', './asndb/mkasn.pl', './plugins/head.pm', './plugins/echo.pm', './plugins/packages.pm', './plugins/translate.pm', './plugins/save_config.pm', './plugins/nick_lookup.pm', './plugins/tell.pm', './plugins/conf.pm', './plugins/oeis.pm', './plugins/reload_plugins.pm', './plugins/seen.pm', './plugins/part.pm', './plugins/utf8.pm', './plugins/cache_check.pm', './plugins/title.pm', './plugins/geoip.pm', './plugins/twitter.pm', './plugins/8ball.pm', './plugins/conf_dump.pm', './plugins/unicode.pm', './plugins/shorten.pm', './plugins/karma.pm', './plugins/join.pm', './plugins/perldoc.pm', './plugins/allowpaste.pm', './plugins/help.pm', './plugins/rss_title.pm', './plugins/get.pm', './plugins/plugins.pm', './plugins/define.pm', './plugins/default.pm', './plugins/host.pm', './plugins/arg.pm', './plugins/quote.pm', './plugins/pastebinadmin.pm', './plugins/null.pm', './plugins/host_lookup.pm', './plugins/zippit.pm', './plugins/talktome.pm', './plugins/factoids.pm', './plugins/karma_modify.pm', './plugins/google.pm', './plugins/compose.pm', './plugins/more.pm', './plugins/core.pm', './plugins/chatbot.pm', './plugins/rss.pm', './plugins/supereval.pm', './plugins/restart.pm', './plugins/karmatop.pm', './package_lists/generate_list_debian.pl', './lib/Bot/BB3.pm', './lib/Bot/BB3/Logger.pm', './lib/Bot/BB3/PluginManager.pm', './lib/Bot/BB3/ConfigParser.pm', './lib/Bot/BB3/DebugCrypt.pm', './lib/Bot/BB3/MacroQuote.pm', './lib/Bot/BB3/Roles/Console.pm', './lib/Bot/BB3/Roles/RestAPI.pm', './lib/Bot/BB3/Roles/Evalpastebin.pm', './lib/Bot/BB3/Roles/SocketMessageIRC.pm', './lib/Bot/BB3/Roles/IRC.pm', './lib/Bot/BB3/Roles/PasteBot.pm', './lib/Bot/BB3/PluginConfigParser.pm', './lib/Bot/BB3/PluginWrapper.pm');
+
+my $hash_ref = scan_deps(
+  #  files => \@files,
+  files => ["plugins/geoip.pm"],
+  recurse => 0,
+);
+
+my @keys = keys %$hash_ref;
+
+my @used = sort {$a cmp $b} grep {!m|Bot/BB3|} grep {exists $hash_ref->{$_}{used_by} } @keys;
+
+my @mods = map {s|/|::|g; s|.pm$||r} @used;
+
+#print Dumper(\@mods);
+
+for my $mod (@mods) {
+  printf "requires '%s';\n", $mod;
+}

From e96b21ace4b176c0679e11c46bf8f2a04ae6812f Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Mon, 26 Oct 2020 13:26:19 -0700
Subject: [PATCH 04/41] Better file

---
 cpanfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cpanfile b/cpanfile
index 60ae89f..e5af0c2 100644
--- a/cpanfile
+++ b/cpanfile
@@ -13,7 +13,6 @@ requires "Encode";
 requires "Encode";
 requires "Encode";
 requires "Encode";
-requires "EvalServer::Sandbox";
 requires "experimental";
 requires "Exporter";
 requires "feature";
@@ -67,7 +66,6 @@ requires "Regexp::Assemble";
 requires "Regexp::Optimizer";
 requires "Socket";
 requires "strict";
-requires "Template";
 requires "Term::ANSIColor";
 requires "Text::Glob";
 requires "Text::Metaphone";
@@ -76,8 +74,6 @@ requires "Unicode::UCD";
 requires "URI::Encode";
 requires "URI::Escape";
 requires "utf8";
-requires "v5.20.0";
-requires "v5.30";
 requires "warnings";
 requires "WWW::Mechanize";
 requires "WWW::Shorten";

From 577b862a5d7db95371a1559517fa40905a784639 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Mon, 26 Oct 2020 14:05:00 -0700
Subject: [PATCH 05/41] just install stuff

---
 .github/workflows/ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 445d729..fc6b4b0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,5 +18,6 @@ jobs:
       - uses: actions/checkout@v2
       - name: Regular tests
         run: |
-            cpanm --installdeps --notest .
-            prove
+            apt install libprotobuf-dev libprotoc-dev
+            # cpanm --installdeps --notest .
+            #            prove

From 384468148ac68e99435f5e40b2340b250c9455a9 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Mon, 26 Oct 2020 14:09:13 -0700
Subject: [PATCH 06/41] almost to deps

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fc6b4b0..e6d2226 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,6 +18,6 @@ jobs:
       - uses: actions/checkout@v2
       - name: Regular tests
         run: |
-            apt install libprotobuf-dev libprotoc-dev
+            apt update && apt -y install libprotobuf-dev libprotoc-dev
             # cpanm --installdeps --notest .
             #            prove

From 2bb104044cfcdc89344d1d96e0c3afb5eec65e08 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Mon, 26 Oct 2020 14:11:14 -0700
Subject: [PATCH 07/41] c deps installed now

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e6d2226..b625f3c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,5 +19,5 @@ jobs:
       - name: Regular tests
         run: |
             apt update && apt -y install libprotobuf-dev libprotoc-dev
-            # cpanm --installdeps --notest .
+            cpanm --installdeps --notest .
             #            prove

From f10008f7d174da2b118b8d7305fdbe3b2083ef70 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Mon, 26 Oct 2020 14:35:31 -0700
Subject: [PATCH 08/41] Merge shlomif's beginning of tests

---
 .github/workflows/ci.yml |  2 +-
 bin/run-tests            | 45 ++++++++++++++++++++++++++++++++++++++++
 t/unicode-plugin.t       | 36 ++++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 bin/run-tests
 create mode 100644 t/unicode-plugin.t

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b625f3c..8b328b8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,4 +20,4 @@ jobs:
         run: |
             apt update && apt -y install libprotobuf-dev libprotoc-dev
             cpanm --installdeps --notest .
-            #            prove
+            bin/run-tests
diff --git a/bin/run-tests b/bin/run-tests
new file mode 100644
index 0000000..40e9e3e
--- /dev/null
+++ b/bin/run-tests
@@ -0,0 +1,45 @@
+#! /usr/bin/env perl
+#
+# Author Shlomi Fish <shlomif@cpan.org>
+# Version 0.0.1
+#
+use strict;
+use warnings;
+use autodie;
+
+# We'd rather avoid exec() here because from our experience, it sometimes
+# does not work too reliably on MSWin32.
+exit( ( system( "prove", glob("t/*.t") ) == 0 ) ? 0 : 1 );
+
+__END__
+
+=head1 COPYRIGHT & LICENSE
+
+Copyright 2019 by Shlomi Fish
+
+This program is distributed under the MIT / Expat License:
+L<http://www.opensource.org/licenses/mit-license.php>
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+=cut
+
diff --git a/t/unicode-plugin.t b/t/unicode-plugin.t
new file mode 100644
index 0000000..d6e4ecd
--- /dev/null
+++ b/t/unicode-plugin.t
@@ -0,0 +1,36 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use utf8;
+use Test::More tests => 4;
+use Test::Differences qw/ eq_or_diff /;
+use lib '.';
+use plugins::unicode;
+
+sub check
+{
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+    my ( $body, $want, $blurb ) = @_;
+    my ( $err, $out ) = unip( map speng($_), split " ", $body );
+
+    return eq_or_diff( $err, [], "no errors" )
+        && eq_or_diff( $out, $want, $blurb );
+}
+
+# TEST*2
+check(
+    "perl",
+    [
+        "U+0070 (70): LATIN SMALL LETTER P [p]",
+        "U+0065 (65): LATIN SMALL LETTER E [e]",
+        "U+0072 (72): LATIN SMALL LETTER R [r]",
+        "U+006C (6c): LATIN SMALL LETTER L [l]",
+    ],
+    "ascii"
+);
+
+# TEST*2
+check( "💟", [ "U+1F49F (f0 9f 92 9f): HEART DECORATION [💟]", ],
+    "emoji", );
+

From c577473a2b937eafd0aead52d7eee83764684c45 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Mon, 26 Oct 2020 14:51:48 -0700
Subject: [PATCH 09/41] whoops forgot to make it executable

---
 bin/run-tests | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 bin/run-tests

diff --git a/bin/run-tests b/bin/run-tests
old mode 100644
new mode 100755

From 4e918fe9f3ead4fb459846f5eb285aec367bb953 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Mon, 26 Oct 2020 14:54:41 -0700
Subject: [PATCH 10/41] attempt to add badge

---
 README.pod | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.pod b/README.pod
index 7a2b2e4..4e50b97 100644
--- a/README.pod
+++ b/README.pod
@@ -2,6 +2,10 @@
 
 =head1 ABOUT
 
+=for html
+<a href="https://github.com/perlbot/perlbuut/actions?query=workflow%3ACI"><img src="https://github.com/perlbot/perlbuut/workflows/CI/badge.svg"></a>
+=cut
+
 This is the source code for perlbot, the resident infobot on Freenode’s
 #perl channel. See:
 

From 8f3dc07a03fa9938b95120b1548df74e985d8172 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Mon, 26 Oct 2020 14:55:53 -0700
Subject: [PATCH 11/41] Fix up pod for badge

---
 README.pod | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.pod b/README.pod
index 4e50b97..e38d56b 100644
--- a/README.pod
+++ b/README.pod
@@ -2,9 +2,10 @@
 
 =head1 ABOUT
 
-=for html
+=begin html
 <a href="https://github.com/perlbot/perlbuut/actions?query=workflow%3ACI"><img src="https://github.com/perlbot/perlbuut/workflows/CI/badge.svg"></a>
-=cut
+=end html
+
 
 This is the source code for perlbot, the resident infobot on Freenode’s
 #perl channel. See:

From c7496d198def299b8303f4a7e570682835b9bb5f Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Mon, 26 Oct 2020 14:56:19 -0700
Subject: [PATCH 12/41] Fix up pod for badge again

---
 README.pod | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.pod b/README.pod
index e38d56b..e687acf 100644
--- a/README.pod
+++ b/README.pod
@@ -3,9 +3,10 @@
 =head1 ABOUT
 
 =begin html
-<a href="https://github.com/perlbot/perlbuut/actions?query=workflow%3ACI"><img src="https://github.com/perlbot/perlbuut/workflows/CI/badge.svg"></a>
-=end html
 
+<a href="https://github.com/perlbot/perlbuut/actions?query=workflow%3ACI"><img src="https://github.com/perlbot/perlbuut/workflows/CI/badge.svg"></a>
+
+=end html
 
 This is the source code for perlbot, the resident infobot on Freenode’s
 #perl channel. See:

From ee98747c24f992b7c7f401d8d3ad8b7f55a9cc60 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Tue, 27 Oct 2020 16:50:08 +0200
Subject: [PATCH 13/41] Correct some broken grammar / spelling.

See: https://en.wiktionary.org/wiki/license#Usage_notes - the verb is
always "to license".
---
 README.pod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.pod b/README.pod
index e687acf..84fc767 100644
--- a/README.pod
+++ b/README.pod
@@ -30,6 +30,6 @@ This is a semi-complicated situation as while the code is obstensibly open sourc
 
 buu has agreed to put his code under the GPL version 3 ( L<https://en.wikipedia.org/wiki/GNU_General_Public_License#Version_3> ) or at your option any later version.
 
-Shlomi Fish licences his changes under any and all of the Expat license, the
+Shlomi Fish licenses his changes under any and all of the Expat license, the
 CC0, the same terms as perl 5, and the Artistic 2.0 license.
 =cut

From 4e5414f8ed33f0df1884b4fb39b4a101cea03ef1 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Thu, 29 Oct 2020 19:41:41 -0700
Subject: [PATCH 14/41] try to add the new raspberry pi into the mix

---
 .github/workflows/ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8b328b8..d9689b4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,12 +4,15 @@ on: [push]
 
 jobs:
   perl-job:
-    runs-on: [self-hosted]
+    runs-on: [self-hosted, ${{ matrix.architecture }}]
     container:
       image: perl:${{ matrix.perl-version }}
     strategy:
       fail-fast: false
       matrix:
+        architecture:
+          - X64
+          - ARM
         perl-version:
           - '5.32'
           - 'latest'

From 000c40a557dc13112a5979473adff5daa9868826 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Thu, 29 Oct 2020 19:43:00 -0700
Subject: [PATCH 15/41] this syntax?

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9689b4..d29bd58 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   perl-job:
-    runs-on: [self-hosted, ${{ matrix.architecture }}]
+    runs-on: [self-hosted, "${{ matrix.architecture }}" ]
     container:
       image: perl:${{ matrix.perl-version }}
     strategy:

From ac6bdeb9953b18d6d0d9672dec3702ce8fd4ac3d Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Thu, 29 Oct 2020 20:45:36 -0700
Subject: [PATCH 16/41] Make the builds easier to tell apart

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d29bd58..a1bdb9e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
         perl-version:
           - '5.32'
           - 'latest'
-    name: Perl ${{ matrix.perl-version }}
+    name: Perl ${{ matrix.perl-version }}:${{ matrix.architecture }}
     steps:
       - uses: actions/checkout@v2
       - name: Regular tests

From a3d869314e1669eb18f5873a818c808039bd0e05 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Thu, 29 Oct 2020 21:27:58 -0700
Subject: [PATCH 17/41] increase timeout so arm succeeds

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a1bdb9e..ca31b57 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,5 +22,5 @@ jobs:
       - name: Regular tests
         run: |
             apt update && apt -y install libprotobuf-dev libprotoc-dev
-            cpanm --installdeps --notest .
+            cpanm --installdeps --notest --build-timeout 180 .
             bin/run-tests

From e67d7d6bdc6504ff50d585f64cb774ed7e9967f1 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Thu, 29 Oct 2020 21:28:59 -0700
Subject: [PATCH 18/41] wrong timeouts before

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ca31b57..9369e79 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,5 +22,5 @@ jobs:
       - name: Regular tests
         run: |
             apt update && apt -y install libprotobuf-dev libprotoc-dev
-            cpanm --installdeps --notest --build-timeout 180 .
+            cpanm --installdeps --notest --configure-timeout 180 --build-timeout 600 .
             bin/run-tests

From ebd8d58f8684304e3ff282a3347d34ae7df29f8f Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Thu, 29 Oct 2020 22:05:58 -0700
Subject: [PATCH 19/41] switch to the local caching proxy

---
 .github/workflows/ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9369e79..e961dc1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Regular tests
+        env:
         run: |
             apt update && apt -y install libprotobuf-dev libprotoc-dev
-            cpanm --installdeps --notest --configure-timeout 180 --build-timeout 600 .
+        cpanm --installdeps --notest --mirror-only --mirror http://cpanproxy/ --configure-timeout 180 --build-timeout 600 .
             bin/run-tests

From 53cff4b3a5c7fac5fc8d5b4b2e90298375b847cc Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Thu, 29 Oct 2020 22:35:08 -0700
Subject: [PATCH 20/41] bah yaml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e961dc1..83919a3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,5 +23,5 @@ jobs:
         env:
         run: |
             apt update && apt -y install libprotobuf-dev libprotoc-dev
-        cpanm --installdeps --notest --mirror-only --mirror http://cpanproxy/ --configure-timeout 180 --build-timeout 600 .
+            cpanm --installdeps --notest --mirror-only --mirror http://cpanproxy/ --configure-timeout 180 --build-timeout 600 .
             bin/run-tests

From 72f3ddf6fa230560e03e83455e912156b746fba9 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Thu, 29 Oct 2020 22:38:09 -0700
Subject: [PATCH 21/41] fix yaml and switch to cpm to hopefully speed up

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 83919a3..258cbe4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Regular tests
-        env:
         run: |
             apt update && apt -y install libprotobuf-dev libprotoc-dev
-            cpanm --installdeps --notest --mirror-only --mirror http://cpanproxy/ --configure-timeout 180 --build-timeout 600 .
+            cpanm install App::cpm
+            cpm -v --resolver http://cpanproxy/ --configure-timeout 180 --build-timeout 600 --with-cpanfile=./cpanfile
             bin/run-tests

From 83fbd0702aa80f14b7fafe378c8688e52dfb05b8 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Thu, 29 Oct 2020 22:41:22 -0700
Subject: [PATCH 22/41] Split things up a bit for better results

---
 .github/workflows/ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 258cbe4..c1e597a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,9 +19,13 @@ jobs:
     name: Perl ${{ matrix.perl-version }}:${{ matrix.architecture }}
     steps:
       - uses: actions/checkout@v2
-      - name: Regular tests
+      - name: Install libraries and cpm
         run: |
             apt update && apt -y install libprotobuf-dev libprotoc-dev
             cpanm install App::cpm
+      - name: Install depedencies
+        run: |
             cpm -v --resolver http://cpanproxy/ --configure-timeout 180 --build-timeout 600 --with-cpanfile=./cpanfile
+      - name: Run tests
+        run: |
             bin/run-tests

From b5fe72d63b908859218601420404bc06068fd9d6 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Thu, 29 Oct 2020 22:42:15 -0700
Subject: [PATCH 23/41] Missing cpm subcommand

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c1e597a..37d11e2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
             cpanm install App::cpm
       - name: Install depedencies
         run: |
-            cpm -v --resolver http://cpanproxy/ --configure-timeout 180 --build-timeout 600 --with-cpanfile=./cpanfile
+            cpm install -v --resolver http://cpanproxy/ --configure-timeout 180 --build-timeout 600 --with-cpanfile=./cpanfile
       - name: Run tests
         run: |
             bin/run-tests

From e1937d5590aba5d34e32cb9f2a3b21b6b5c08be1 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Thu, 29 Oct 2020 22:47:41 -0700
Subject: [PATCH 24/41] use correct option

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 37d11e2..b4cf3e2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
             cpanm install App::cpm
       - name: Install depedencies
         run: |
-            cpm install -v --resolver http://cpanproxy/ --configure-timeout 180 --build-timeout 600 --with-cpanfile=./cpanfile
+            cpm install -v --resolver http://cpanproxy/ --configure-timeout 180 --build-timeout 600 --cpanfile=./cpanfile
       - name: Run tests
         run: |
             bin/run-tests

From bd2f4948b96ae7cfeecc7419f0f8d3c8ac143a94 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Thu, 29 Oct 2020 22:54:48 -0700
Subject: [PATCH 25/41] resolver syntax is hard

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b4cf3e2..b0c2f2d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
             cpanm install App::cpm
       - name: Install depedencies
         run: |
-            cpm install -v --resolver http://cpanproxy/ --configure-timeout 180 --build-timeout 600 --cpanfile=./cpanfile
+            cpm install -v --resolver 02packages,http://cpanproxy/ --configure-timeout 180 --build-timeout 600 --cpanfile=./cpanfile
       - name: Run tests
         run: |
             bin/run-tests

From 98ca1394842879651d05d896194b2f69715b0382 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Fri, 30 Oct 2020 00:52:24 -0700
Subject: [PATCH 26/41] missing test files

---
 cpanfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cpanfile b/cpanfile
index e5af0c2..bb9deed 100644
--- a/cpanfile
+++ b/cpanfile
@@ -79,3 +79,4 @@ requires "WWW::Mechanize";
 requires "WWW::Shorten";
 requires "WWW::Shorten::TinyURL";
 requires "XML::RSS::Parser";
+requires "Test::Differences";

From 1eb9b21f0293157d4f1eb360e2ea59522b945d93 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Fri, 30 Oct 2020 00:56:05 -0700
Subject: [PATCH 27/41] use proxy mirror

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b0c2f2d..f5a29e5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install libraries and cpm
         run: |
             apt update && apt -y install libprotobuf-dev libprotoc-dev
-            cpanm install App::cpm
+            cpanm install --mirror http://cpanproxy/ --mirror-only App::cpm
       - name: Install depedencies
         run: |
             cpm install -v --resolver 02packages,http://cpanproxy/ --configure-timeout 180 --build-timeout 600 --cpanfile=./cpanfile

From 13c1b167f942e151081a8f70528d41809ec93c56 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Fri, 30 Oct 2020 01:09:51 -0700
Subject: [PATCH 28/41] Update ci.yml

change a bit?
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f5a29e5..66708ad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,4 +28,4 @@ jobs:
             cpm install -v --resolver 02packages,http://cpanproxy/ --configure-timeout 180 --build-timeout 600 --cpanfile=./cpanfile
       - name: Run tests
         run: |
-            bin/run-tests
+            prove

From c8ed8f00abcc015c1dc8e61b5a102c652cfdeb2a Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Fri, 30 Oct 2020 01:25:37 -0700
Subject: [PATCH 29/41] setup local::lib properly

---
 .github/workflows/ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 66708ad..6c1afb9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,10 +22,14 @@ jobs:
       - name: Install libraries and cpm
         run: |
             apt update && apt -y install libprotobuf-dev libprotoc-dev
-            cpanm install --mirror http://cpanproxy/ --mirror-only App::cpm
+            cpanm local::lib
+            eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"
+            cpanm --mirror http://cpanproxy/ --mirror-only App::cpm
       - name: Install depedencies
         run: |
+            eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"
             cpm install -v --resolver 02packages,http://cpanproxy/ --configure-timeout 180 --build-timeout 600 --cpanfile=./cpanfile
       - name: Run tests
         run: |
+            eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"
             prove

From 721504d4078422ecaced60386ece47c7a1091c47 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Fri, 30 Oct 2020 01:40:52 -0700
Subject: [PATCH 30/41] speed things up a bit more

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6c1afb9..98cdf2d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,11 +24,11 @@ jobs:
             apt update && apt -y install libprotobuf-dev libprotoc-dev
             cpanm local::lib
             eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"
-            cpanm --mirror http://cpanproxy/ --mirror-only App::cpm
+            cpanm --mirror http://cpanproxy/ --mirror-only --notest App::cpm
       - name: Install depedencies
         run: |
             eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"
-            cpm install -v --resolver 02packages,http://cpanproxy/ --configure-timeout 180 --build-timeout 600 --cpanfile=./cpanfile
+            cpm install -v --no-test --resolver 02packages,http://cpanproxy/ --configure-timeout 180 --build-timeout 600 --cpanfile=./cpanfile
       - name: Run tests
         run: |
             eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"

From 2e11d8bcc28b09ae528b1c89207a44938b31019a Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Fri, 30 Oct 2020 01:43:56 -0700
Subject: [PATCH 31/41] found the problem

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 98cdf2d..34b8ffe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Install depedencies
         run: |
             eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"
-            cpm install -v --no-test --resolver 02packages,http://cpanproxy/ --configure-timeout 180 --build-timeout 600 --cpanfile=./cpanfile
+            cpm install -g -v --no-test --resolver 02packages,http://cpanproxy/ --configure-timeout 180 --build-timeout 600 --cpanfile=./cpanfile
       - name: Run tests
         run: |
             eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"

From a1f08b131529d7295678775997baadfe11944ff1 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Fri, 30 Oct 2020 12:09:36 +0200
Subject: [PATCH 32/41] Add a test for the oeis plugin.

In the process I extracted a function.
---
 plugins/oeis.pm | 26 +++++++++++++++-----------
 t/oeis-plugin.t | 15 +++++++++++++++
 2 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 t/oeis-plugin.t

diff --git a/plugins/oeis.pm b/plugins/oeis.pm
index 67d753c..dedf201 100644
--- a/plugins/oeis.pm
+++ b/plugins/oeis.pm
@@ -6,15 +6,13 @@ use CGI;
 use LWP::Simple;
 use WWW::Shorten 'TinyURL';
 
-sub {
-	my($said) = @_;
-	my $q = $said->{"body"};
+sub query_oeis {
+    my ($q)=@_;
 
 	warn 1;
 	if( $q =~ /^\s*(?:(?:help|wtf|\?|\:)\s*)?$/i )
 	{
-		print "see http://oeis.org/";
-		return;
+		return([], ["see http://oeis.org/"]);
 	}
 	warn 2;
 	my $uri = "http://oeis.org/search?q=" . CGI::escape($q)."&fmt=text";
@@ -24,8 +22,7 @@ sub {
 		my $nrfound = $1;
 		unless( /^%N (\S+) (.*)/m )
 		{
-			print "Reply from OEIS in unknown format 2";
-			return;
+			return([ "Reply from OEIS in unknown format 2"],[]);
 		}
 		warn 3;
 		my($anum, $title) = ($1, $2);
@@ -35,21 +32,28 @@ sub {
 		warn 3.5;
 		if (1 == $nrfound) {
 			my $outuri = sprintf "http://oeis.org/%s", $anum;
-			print sprintf "%s %.256s: %.512s", $outuri, $title, $elts;
+			return ([],[sprintf( "%s %.256s: %.512s", $outuri, $title, $elts)]);
 		} else {
 			my $outuri1 = "http://oeis.org/searchs?q=" . CGI::escape($q);
 			warn 3.6;
 #			my $outuri = makeashorterlink($outuri1) || $outuri1;
-			print sprintf "%s %.10s(1/%d) %.256s: %.512s", $outuri1, $anum, $nrfound, $title, $elts;
+			return([], [sprintf( "%s %.10s(1/%d) %.256s: %.512s", $outuri1, $anum, $nrfound, $title, $elts)]);
 		}
 	} elsif (/^no matches/mi) {
-		print "No matches found";
+		return([], ["No matches found"]);
 		warn 4
 	} else {
 	warn 5;
-		print "Reply from OEIS in unknown format: $_";
+		return([ "Reply from OEIS in unknown format: $_"], []);
 	}
 }
 
+sub {
+	my($said) = @_;
+	my $q = $said->{"body"};
+    my ($err, $out) = query_oeis($q);
+	print "Error: @$err\n" if @$err;
+	print "@$out\n";
+}
 __DATA__
 Search for a sequence in the On-Line Encyclopedia of Integer Sequences (http://tinyurl.com/2blo2w) Syntax, oeis 1,1,2,3,5
diff --git a/t/oeis-plugin.t b/t/oeis-plugin.t
new file mode 100644
index 0000000..bcb17da
--- /dev/null
+++ b/t/oeis-plugin.t
@@ -0,0 +1,15 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use utf8;
+use Test::More tests => 1;
+use lib '.';
+use plugins::oeis;
+
+# TEST
+like(
+    (query_oeis("1,2,6,24"))[1][0],
+    qr#https?://oeis\.org/.*?Factorial numbers: n!#ms,
+    "factorials",
+);

From 3cbdab2454e237b26ab39d0df39ce0ed9ec59729 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Fri, 30 Oct 2020 10:00:28 -0700
Subject: [PATCH 33/41] Try to run on pull requests too

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 34b8ffe..63f2e81 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,6 @@
 name: CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   perl-job:

From a23c30227fb82bc23434364513f5e1473ebd7686 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Fri, 30 Oct 2020 11:25:26 -0700
Subject: [PATCH 34/41] Add test fore core plugin and make it a PR to test
 actions on prs

---
 plugins/core.pm |  4 ++++
 t/core-plugin.t | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 t/core-plugin.t

diff --git a/plugins/core.pm b/plugins/core.pm
index b425fb6..d6f63f0 100644
--- a/plugins/core.pm
+++ b/plugins/core.pm
@@ -29,10 +29,12 @@ sub {
         if ( Module::CoreList->can('deprecated_in') ) {
             my $dep = Module::CoreList->deprecated_in($module);
             print " and deprecated in $dep" if $dep;
+            return 'handled';
         }
         if ( Module::CoreList->can('removed_from') ) {
             my $rem = Module::CoreList->removed_from($module);
             print " and removed from $rem" if $rem;
+            return 'handled';
         }
     }
     else {
@@ -42,10 +44,12 @@ sub {
             print 'Found', scalar @modules, ':', join ',',
               map { $_ . ' in ' . Module::CoreList->first_release($_) }
               @modules;
+              return 'handled';
 
         }
         else {
             print "Module $module does not appear to be in core. Perhaps capitalization matters or try using the 'cpan' command to search for it.";
+            return 'handled';
         }
     }
   }
diff --git a/t/core-plugin.t b/t/core-plugin.t
new file mode 100644
index 0000000..64f6ce4
--- /dev/null
+++ b/t/core-plugin.t
@@ -0,0 +1,41 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use utf8;
+use Test::More;
+use Test::Differences qw/ eq_or_diff /;
+use Capture::Tiny qw/capture/;
+use lib '.';
+my $sub = require plugins::core;
+
+sub make_said
+{
+    my ($body, $who, $server, $channel) = @_;
+
+    my @args = split /\s+/, $body; 
+    my $said = {
+      body => $body,
+      recommended_args => \@args,
+    };
+}
+
+sub check
+{
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+    my ( $body, $want, $res, $blurb ) = @_;
+
+    my $said = make_said($body);
+    my ($out, $err, @result) = capture {
+      $sub->( $said );
+    };
+
+    return eq_or_diff( $err, "", "no errors" )
+        && eq_or_diff(\@result, $res, "Result is correct")
+        && eq_or_diff( $out, $want, $blurb );
+}
+
+check("", "usage: core Module::Here", ["handled"], "usage help");
+check("CGI", "CGI Added to perl core as of 5.004 and deprecated in 5.019007", ["handled"], "deprecated");
+check("Data::Dumper", "Data::Dumper Added to perl core as of 5.005", ["handled"], "never gonna give it up");
+done_testing();

From 8bf44ea5566d88f77b99fc4be8bc463bc34b2dd7 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Fri, 30 Oct 2020 11:30:28 -0700
Subject: [PATCH 35/41] dont setup actions on non-master branches

---
 .github/workflows/ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 63f2e81..914e21d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,12 @@
 name: CI
 
-on: [push, pull_request]
+on: 
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   perl-job:

From d391c25cfb91b979744d7686c3ae29079a7d2643 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Fri, 30 Oct 2020 13:59:45 -0700
Subject: [PATCH 36/41] remove this unneeded dependency, the plugin does not
 function anymore

---
 cpanfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cpanfile b/cpanfile
index bb9deed..249ff52 100644
--- a/cpanfile
+++ b/cpanfile
@@ -45,8 +45,6 @@ requires "Net::DNS";
 requires "Net::INET6Glue::INET_is_INET6";
 requires "Parse::RecDescent";
 requires "Path::Tiny";
-requires "Paws";
-requires "Paws::Credential::Explicit";
 requires "POE";
 requires "POE::Component::IRC";
 requires "POE::Component::IRC::Common";

From ec29915d74b89a6ccdd5170ce0e968f6cef14917 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Fri, 30 Oct 2020 15:05:04 -0700
Subject: [PATCH 37/41] Refactor tests, use lib::relative to correctly find
 things, and add a quote plugin test

---
 cpanfile                 |  1 +
 t/core-plugin.t          | 32 +++-----------------------------
 t/lib/t/common.pm        | 35 +++++++++++++++++++++++++++++++++++
 t/lib/t/simple_plugin.pm | 29 +++++++++++++++++++++++++++++
 t/quote-plugin.t         | 20 ++++++++++++++++++++
 t/unicode-plugin.t       | 36 +++++++++++++++---------------------
 6 files changed, 103 insertions(+), 50 deletions(-)
 create mode 100644 t/lib/t/common.pm
 create mode 100644 t/lib/t/simple_plugin.pm
 create mode 100644 t/quote-plugin.t

diff --git a/cpanfile b/cpanfile
index 249ff52..2a20261 100644
--- a/cpanfile
+++ b/cpanfile
@@ -31,6 +31,7 @@ requires "JSON::MaybeXS";
 requires "JSON::MaybeXS";
 requires "JSON::MaybeXS";
 requires "lib";
+requires "lib::relative";
 requires "List::Util";
 requires "List::Util";
 requires "LWP::Simple";
diff --git a/t/core-plugin.t b/t/core-plugin.t
index 64f6ce4..e69efa2 100644
--- a/t/core-plugin.t
+++ b/t/core-plugin.t
@@ -4,36 +4,10 @@ use strict;
 use warnings;
 use utf8;
 use Test::More;
-use Test::Differences qw/ eq_or_diff /;
-use Capture::Tiny qw/capture/;
-use lib '.';
-my $sub = require plugins::core;
+use lib::relative './lib', '../lib', '..';
+use t::simple_plugin;
 
-sub make_said
-{
-    my ($body, $who, $server, $channel) = @_;
-
-    my @args = split /\s+/, $body; 
-    my $said = {
-      body => $body,
-      recommended_args => \@args,
-    };
-}
-
-sub check
-{
-    local $Test::Builder::Level = $Test::Builder::Level + 1;
-    my ( $body, $want, $res, $blurb ) = @_;
-
-    my $said = make_said($body);
-    my ($out, $err, @result) = capture {
-      $sub->( $said );
-    };
-
-    return eq_or_diff( $err, "", "no errors" )
-        && eq_or_diff(\@result, $res, "Result is correct")
-        && eq_or_diff( $out, $want, $blurb );
-}
+load_plugin("core");
 
 check("", "usage: core Module::Here", ["handled"], "usage help");
 check("CGI", "CGI Added to perl core as of 5.004 and deprecated in 5.019007", ["handled"], "deprecated");
diff --git a/t/lib/t/common.pm b/t/lib/t/common.pm
new file mode 100644
index 0000000..a334f7a
--- /dev/null
+++ b/t/lib/t/common.pm
@@ -0,0 +1,35 @@
+package t::common;
+
+use strict;
+use warnings;
+use utf8;
+use parent 'Exporter';
+
+our @EXPORT=qw/load_plugin make_said/;
+
+# This doesn't let us test multiple plugins at a time, which might be needed for the compose plugin
+# This can be fixed later
+our $plugin;
+
+sub load_plugin {
+    my $name = shift;
+
+    my $fullname = "plugins/$name.pm";
+
+    $plugin = require $fullname;
+}
+
+sub make_said
+{
+    my ($body, $who, $server, $channel) = @_;
+
+    # TODO make this fill out a lot more of the said object
+
+    my @args = split /\s+/, $body; 
+    my $said = {
+      body => $body,
+      recommended_args => \@args,
+    };
+}
+
+1;
diff --git a/t/lib/t/simple_plugin.pm b/t/lib/t/simple_plugin.pm
new file mode 100644
index 0000000..f9f0368
--- /dev/null
+++ b/t/lib/t/simple_plugin.pm
@@ -0,0 +1,29 @@
+package t::simple_plugin;
+
+use strict;
+use warnings;
+use utf8;
+use parent 'Exporter';
+use t::common;
+
+our @EXPORT=qw/load_plugin make_said check/;
+
+use Test::Differences qw/ eq_or_diff /;
+use Capture::Tiny qw/capture/;
+
+sub check
+{
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+    my ( $body, $want, $res, $blurb ) = @_;
+
+    my $said = make_said($body);
+    my ($out, $err, @result) = capture {
+      $t::common::plugin->( $said );
+    };
+
+    return eq_or_diff( $err, "", "no errors" )
+        && eq_or_diff(\@result, $res, "Result is correct")
+        && eq_or_diff( $out, $want, $blurb );
+}
+
+1;
diff --git a/t/quote-plugin.t b/t/quote-plugin.t
new file mode 100644
index 0000000..788c9cc
--- /dev/null
+++ b/t/quote-plugin.t
@@ -0,0 +1,20 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use utf8;
+use Test::More;
+use lib::relative './lib', '../lib', '..';
+use t::simple_plugin;
+
+load_plugin("quote");
+
+check("", "", [], "do nothing");
+check('d TESTING HERE', q{"TESTING HERE"}, [1], 'quote d simple');
+check('c TESTING HERE', q{TESTING HERE}, [1], 'quote d simple');
+check(qq{d "TESTING \nHERE"}, q{"\\x22TESTING \\x0aHERE\\x22"}, [1], 'quote d complex');
+check(qq{c "TESTING \nHERE"}, q{\\x22TESTING \\x0aHERE\\x22}, [1], 'quote c complex');
+check(qq{e "TESTING \nHERE"}, q{\\x22TESTING\\x20\\x0aHERE\\x22}, [1], 'quote e complex');
+check(qq{f "TESTING \nHERE"}, q{"\\x22TESTING\\x20\\x0aHERE\\x22"}, [1], 'quote f complex');
+check('h TESTING HERE', q{54455354494e472048455245}, [1], 'quote h');
+done_testing();
diff --git a/t/unicode-plugin.t b/t/unicode-plugin.t
index d6e4ecd..f255137 100644
--- a/t/unicode-plugin.t
+++ b/t/unicode-plugin.t
@@ -3,34 +3,28 @@
 use strict;
 use warnings;
 use utf8;
-use Test::More tests => 4;
-use Test::Differences qw/ eq_or_diff /;
-use lib '.';
-use plugins::unicode;
+use Test::More;
+use lib::relative './lib', '../lib', '..';
+use t::simple_plugin;
+use Encode qw/encode/;
 
-sub check
-{
-    local $Test::Builder::Level = $Test::Builder::Level + 1;
-    my ( $body, $want, $blurb ) = @_;
-    my ( $err, $out ) = unip( map speng($_), split " ", $body );
-
-    return eq_or_diff( $err, [], "no errors" )
-        && eq_or_diff( $out, $want, $blurb );
-}
+load_plugin("unicode");
 
 # TEST*2
 check(
     "perl",
-    [
-        "U+0070 (70): LATIN SMALL LETTER P [p]",
-        "U+0065 (65): LATIN SMALL LETTER E [e]",
-        "U+0072 (72): LATIN SMALL LETTER R [r]",
-        "U+006C (6c): LATIN SMALL LETTER L [l]",
-    ],
+    "U+0070 (70): LATIN SMALL LETTER P [p] ".
+    "U+0065 (65): LATIN SMALL LETTER E [e] ".
+    "U+0072 (72): LATIN SMALL LETTER R [r] ".
+    "U+006C (6c): LATIN SMALL LETTER L [l]\n",
+    [1],
     "ascii"
 );
 
 # TEST*2
-check( "💟", [ "U+1F49F (f0 9f 92 9f): HEART DECORATION [💟]", ],
-    "emoji", );
+check( 
+  "💟", 
+  encode("utf8", "U+1F49F (f0 9f 92 9f): HEART DECORATION [💟]\n"), 
+  [1],
+  "emoji" );
 

From ad8fe37b8a2f0394532f2b6be6fee550363e2931 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Fri, 30 Oct 2020 15:07:28 -0700
Subject: [PATCH 38/41] Forgot done_testing when fixing this

---
 t/unicode-plugin.t | 1 +
 1 file changed, 1 insertion(+)

diff --git a/t/unicode-plugin.t b/t/unicode-plugin.t
index f255137..290678b 100644
--- a/t/unicode-plugin.t
+++ b/t/unicode-plugin.t
@@ -28,3 +28,4 @@ check(
   [1],
   "emoji" );
 
+done_testing();

From 440c75037df939463fc7cc38cbec39b78a221f19 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Fri, 30 Oct 2020 18:16:40 -0700
Subject: [PATCH 39/41] Fill out more mock said object, the rest of the plugins
 need more complete support

---
 t/arg-plugin.t    | 23 +++++++++++++++++++++++
 t/echo-plugin.t   | 16 ++++++++++++++++
 t/lib/t/common.pm | 11 +++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 t/arg-plugin.t
 create mode 100644 t/echo-plugin.t

diff --git a/t/arg-plugin.t b/t/arg-plugin.t
new file mode 100644
index 0000000..4ecaca6
--- /dev/null
+++ b/t/arg-plugin.t
@@ -0,0 +1,23 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use utf8;
+use Test::More;
+use lib::relative './lib', '../lib', '..';
+use t::simple_plugin;
+use Encode qw/encode/;
+
+load_plugin("arg");
+
+check("n", "perlbot", [1], "empty but valid");
+
+check("a", "a", [1], "macro args"); # this one is difficult to test for, it really gets the arguments to the parent macro
+check("", "", [1], "empty arguments, needs better check");
+
+check("h", "irc.client.example.com", [1], "host");
+check("c", "##NULL", [1], "channel");
+check("o", 0, [1], "is op?");
+check("s", "irc.server.example.com", [1], "server");
+
+done_testing();
diff --git a/t/echo-plugin.t b/t/echo-plugin.t
new file mode 100644
index 0000000..fabc036
--- /dev/null
+++ b/t/echo-plugin.t
@@ -0,0 +1,16 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use utf8;
+use Test::More;
+use lib::relative './lib', '../lib', '..';
+use t::simple_plugin;
+use Encode qw/encode/;
+
+load_plugin("echo");
+
+check("", "", [1], "empty but valid");
+check("Hello World", "Hello World", [1], "HW");
+check("\N{SNOWMAN}", encode("utf8", "\N{SNOWMAN}"), [1], "Encoding correctly");
+done_testing();
diff --git a/t/lib/t/common.pm b/t/lib/t/common.pm
index a334f7a..7dcfe63 100644
--- a/t/lib/t/common.pm
+++ b/t/lib/t/common.pm
@@ -25,10 +25,21 @@ sub make_said
 
     # TODO make this fill out a lot more of the said object
 
+    $who //= "perlbot";
+
     my @args = split /\s+/, $body; 
     my $said = {
       body => $body,
       recommended_args => \@args,
+      macro_args => $body,
+      name => $who,
+      ircname => $who."irc",
+      host => "irc.client.example.com",
+      sender_raw => "", # this never gets filled out
+      channel => $channel // "##NULL",
+      server => $server // "irc.server.example.com",
+      by_chan_op => 0,
+      captured => "",
     };
 }
 

From 8bde0b52af25415ca0050d08f683a2dc459291dc Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Fri, 30 Oct 2020 18:44:48 -0700
Subject: [PATCH 40/41] bad test, forgot to check it

---
 t/arg-plugin.t    | 14 +++++++-------
 t/lib/t/common.pm |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/t/arg-plugin.t b/t/arg-plugin.t
index 4ecaca6..2344c7b 100644
--- a/t/arg-plugin.t
+++ b/t/arg-plugin.t
@@ -10,14 +10,14 @@ use Encode qw/encode/;
 
 load_plugin("arg");
 
-check("n", "perlbot", [1], "empty but valid");
+check("&n", "perlbot", ['FOO'], "empty but valid");
 
-check("a", "a", [1], "macro args"); # this one is difficult to test for, it really gets the arguments to the parent macro
-check("", "", [1], "empty arguments, needs better check");
+check("&a", "", ['FOO'], "macro args"); # this one is difficult to test for, it really gets the arguments to the parent macro
+check("", "", ['FOO'], "empty arguments, needs better check");
 
-check("h", "irc.client.example.com", [1], "host");
-check("c", "##NULL", [1], "channel");
-check("o", 0, [1], "is op?");
-check("s", "irc.server.example.com", [1], "server");
+check("&h", "irc.client.example.com", ['FOO'], "host");
+check("&c", "##NULL", ['FOO'], "channel");
+check("&o", 0, ['FOO'], "is op?");
+check("&s", "irc.server.example.com", ['FOO'], "server");
 
 done_testing();
diff --git a/t/lib/t/common.pm b/t/lib/t/common.pm
index 7dcfe63..9663356 100644
--- a/t/lib/t/common.pm
+++ b/t/lib/t/common.pm
@@ -41,6 +41,8 @@ sub make_said
       by_chan_op => 0,
       captured => "",
     };
+
+    return $said;
 }
 
 1;

From 0e17dea2711c3a1af4d2153b2c1f9f26b7018aed Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Fri, 30 Oct 2020 22:52:04 -0700
Subject: [PATCH 41/41] looks ok

---
 cpanfile            |  1 +
 plugins/factoids.pm | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/cpanfile b/cpanfile
index 2a20261..fc23cae 100644
--- a/cpanfile
+++ b/cpanfile
@@ -61,6 +61,7 @@ requires "POE::Session";
 requires "POE::Wheel::ReadWrite";
 requires "POE::Wheel::Run";
 requires "POE::Wheel::SocketFactory";
+requires "PPI";
 requires "Regexp::Assemble";
 requires "Regexp::Optimizer";
 requires "Socket";
diff --git a/plugins/factoids.pm b/plugins/factoids.pm
index 9bc8d06..2a1535c 100644
--- a/plugins/factoids.pm
+++ b/plugins/factoids.pm
@@ -10,6 +10,8 @@ use Text::Metaphone;
 use strict;
 use Encode qw/decode/;
 use JSON::MaybeXS qw/encode_json/;
+use PPI; 
+use PPI::Dumper; 
 
 use Data::Dumper;
 use List::Util qw/min max/;
@@ -553,13 +555,20 @@ sub get_fact_substitute ($self, $subject, $name, $said) {
     my ($aliasserver, $aliasnamespace) = $self->get_alias_namespace($said);
     my ($server,      $namespace)      = $self->get_namespace($said);
 
-    if (   ($said->{body} =~ m{^(?:\s*substitute)?\s*(.*?)\s*=~\s*s /([^/]+ )   /([^/]*  )/([gi]*)\s*$}ix)
-        || ($said->{body} =~ m{^(?:\s*substitute)?\s*(.*?)\s*=~\s*s\|([^|]+ )  \|([^|]*  )\|([gi]*)\s*$}ix)
-        || ($said->{body} =~ m{^(?:\s*substitute)?\s*(.*?)\s*=~\s*s\{([^\}]+)\}\{([^\}]*?)\}([gi]*)\s*$}ix)
-        || ($said->{body} =~ m{^(?:\s*substitute)?\s*(.*?)\s*=~\s*s\(([^)]+ )\)\(([^)]*? )\)([gi]*)\s*$}ix)
-        || ($said->{body} =~ m{^(?:\s*substitute)?\s*(.*?)\s*=~\s*s <([^>]+ ) > <([^>]*? ) >([gi]*)\s*$}ix))
+    if ($said->{body} =~ m{^(?:\s*substitute)?\s*(.*?)\s*=~\s*s(.*)$}ix)
     {
-        my ($subject, $match, $subst, $flags) = ($1, $2, $3, $4);
+        my ($subject, $regex) = ($1, $2);
+        my $pdoc = PPI::Document->new(\$regex);
+        return "Failed to parse $regex" unless $pdoc;
+
+        # TODO handle tr|y///
+        my $token = $pdoc->find(sub {$_[1]->isa('PPI::Token::Regexp::Substitute')})->[0];
+
+        return "Couldn't find s/// in $regex" unless $token;
+
+        my $match = $token->get_match_string;
+        my $subst = $token->get_substitute_string;
+        my $flags = join '', keys +{$token->get_modifiers()}->%*;
 
         # TODO does this need to be done via the ->get_fact() instead now?
         my $fact = $self->_db_get_fact(_clean_subject($subject), 0, $server, $namespace);
@@ -572,11 +581,6 @@ sub get_fact_substitute ($self, $subject, $name, $said) {
                 #moving this to its own function for cleanliness
                 $result = $self->_fact_substitute($pred, $match, $subst, $flags);
 
-                #	my( $self, $body, $name, $said ) = @_;
-
-                #	$body =~ s/^\s*learn\s+//;
-                #	my( $subject, $predicate ) = split /\s+as\s+/, $body, 2;
-
                 # TODO why is this calling there?
                 # let this fail for now
                 my $ret = $self->get_fact_learn("learn $subject as $result", $name, $said, $subject, $result);