Perlbot/perlbuut
1
0
Fork 0
mirror of https://github.com/perlbot/perlbuut synced 2025-06-07 16:05:40 -04:00
Code Issues Releases Wiki Activity

almost there

Browse source
This commit is contained in:
Ryan Voots 2020-09-08 10:16:00 -07:00
parent e3a5ae97f5
commit 64e3c131cd
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
factoidtest.sql
View file

@ -19,7 +19,7 @@ get_latest_factoid (depth, factoid_id, subject, copula, predicate, author, modif
INNER JOIN factoid_lookup_order lo INNER JOIN factoid_lookup_order lo
ON f.generated_server = lo.gen_server ON f.generated_server = lo.gen_server
AND f.generated_namespace = lo.gen_namespace AND f.generated_namespace = lo.gen_namespace
WHERE original_subject = 'hi' -- PLACEHOLDER TARGET WHERE original_subject = 'hello' -- PLACEHOLDER TARGET
ORDER BY depth ASC, factoid_id DESC ORDER BY depth ASC, factoid_id DESC
) )
SELECT * FROM get_latest_factoid WHERE NOT deleted ORDER BY depth ASC, factoid_id DESC LIMIT 1; SELECT * FROM get_latest_factoid WHERE NOT deleted ORDER BY depth ASC, factoid_id DESC LIMIT 1;

24
plugins/factoids.pm
View file

@ -73,7 +73,7 @@ sub dbh($self) {
} }
my $dbh = $self->{dbh} = my $dbh = $self->{dbh} =
DBI->connect("dbi:Pg:dbname=$dbname", $dbuser, $dbpass, { RaiseError => 1, PrintError => 0 }); DBI->connect("dbi:Pg:dbname=$dbname;host=192.168.32.1", $dbuser, $dbpass, { RaiseError => 1, PrintError => 0 });
# DBD::SQLite::BundledExtensions->load_spellfix($dbh); # DBD::SQLite::BundledExtensions->load_spellfix($dbh);
@ -83,7 +83,7 @@ sub dbh($self) {
sub get_namespace($self, $said) { sub get_namespace($self, $said) {
my ($server, $channel) = $said->@{qw/server channel/}; my ($server, $channel) = $said->@{qw/server channel/};
$server = s/^.*?([^\.]\.[^\.]+)$/$1/; $server =~ s/^.*?([^\.]+\.[^\.]+)$/$1/;
return ($server, $channel); return ($server, $channel);
} }
@ -100,10 +100,10 @@ sub get_alias_namespace($self, $said) {
sub get_conf_for_channel ($self, $said) { sub get_conf_for_channel ($self, $said) {
my ($server, $namespace) = $self->get_namespace($said); my ($server, $namespace) = $self->get_namespace($said);
my $dbh = $self->{dbh}; my $dbh = $self->dbh;
my $result = $dbh->selectrow_hashref(qq{ my $result = $dbh->selectrow_hashref(qq{
SELECT * FROM factoid_config WHERE server = ? AND namespace = ? LIMIT 1 SELECT * FROM public.factoid_config WHERE server = ? AND namespace = ? LIMIT 1
}, {}, $server, $namespace); }, {}, $server, $namespace);
my $conf = { my $conf = {
@ -176,7 +176,7 @@ sub command ($self, $_said, $pm) {
return ($handled, $fact_out); return ($handled, $fact_out);
} }
sub sub_command ($self, $said, $pm, $realchannel, $realserver) { sub sub_command ($self, $said, $pm) {
return unless $said->{body} =~ /\S/; #Try to prevent "false positives" return unless $said->{body} =~ /\S/; #Try to prevent "false positives"
my $call_only = $said->{command_match} eq "call"; my $call_only = $said->{command_match} eq "call";
@ -199,17 +199,17 @@ sub sub_command ($self, $said, $pm, $realchannel, $realserver) {
|| ($subject =~ m{\w\s*=~\s*s <.+ > <.* >[gi]*\s*$}ix) || ($subject =~ m{\w\s*=~\s*s <.+ > <.* >[gi]*\s*$}ix)
|| ($subject =~ m{\w\s*=~\s*s\(.+\)\(.*\)[gi]*\s*$}ix)) || ($subject =~ m{\w\s*=~\s*s\(.+\)\(.*\)[gi]*\s*$}ix))
{ {
$fact_string = $self->get_fact_substitute($subject, $said->{name}, $said, $realchannel, $realserver); $fact_string = $self->get_fact_substitute($subject, $said->{name}, $said);
} elsif (!$call_only and $subject =~ /\s+$COPULA_RE\s+/) { } elsif (!$call_only and $subject =~ /\s+$COPULA_RE\s+/) {
return if $said->{nolearn}; return if $said->{nolearn};
my @ret = $self->store_factoid($said, $realchannel, $realserver); my @ret = $self->store_factoid($said);
$fact_string = "Failed to store $said->{body}" unless @ret; $fact_string = "Failed to store $said->{body}" unless @ret;
$fact_string = "@ret" if ($ret[0] =~ /^insuff/i); $fact_string = "@ret" if ($ret[0] =~ /^insuff/i);
$fact_string = "Stored @ret"; $fact_string = "Stored @ret";
} else { } else {
$fact_string = $self->get_fact($pm, $said, $subject, $said->{name}, $call_only, $realchannel, $realserver); $fact_string = $self->get_fact($pm, $said, $subject, $said->{name}, $call_only);
} }
if (defined $fact_string) { if (defined $fact_string) {
@ -221,7 +221,7 @@ sub sub_command ($self, $said, $pm, $realchannel, $realserver) {
# Handler code stolen from the old nfacts plugin # Handler code stolen from the old nfacts plugin
sub handle ($self, $said, $pm) { sub handle ($self, $said, $pm) {
my $conf = $self->get_conf_for_channel($pm, $said->{server}, $said->{channel}); my $conf = $self->get_conf_for_channel($said);
$said->{body} =~ s/^\s*(what|who|where|how|when|why)\s+($COPULA_RE)\s+(?<fact>.*?)\??\s*$/$+{fact}/i; $said->{body} =~ s/^\s*(what|who|where|how|when|why)\s+($COPULA_RE)\s+(?<fact>.*?)\??\s*$/$+{fact}/i;
@ -769,7 +769,7 @@ sub basic_get_fact ($self, $pm, $said, $subject, $name, $call_only) {
for my $variant (0, 1) { for my $variant (0, 1) {
if (!$fact) { if (!$fact) {
($key, $arg) = _clean_subject_func($subject, $variant); ($key, $arg) = _clean_subject_func($subject, $variant);
$fact = $self->_db_get_fact($key, $name, 1, $server, $namespace); $fact = $self->_db_get_fact($key, 1, $server, $namespace);
} }
} }
@ -803,7 +803,7 @@ sub basic_get_fact ($self, $pm, $said, $subject, $name, $call_only) {
return $self->basic_get_fact($pm, $said, $newsubject, $name, $call_only); return $self->basic_get_fact($pm, $said, $newsubject, $name, $call_only);
} }
my $metaphone = Metaphone(_clean_subject($subject, 1)); my $metaphone = Metaphone(_clean_subject($subject));
my $matches = $self->_metaphone_matches($metaphone, $subject, $server, $namespace); my $matches = $self->_metaphone_matches($metaphone, $subject, $server, $namespace);
@ -820,6 +820,8 @@ sub basic_get_fact ($self, $pm, $said, $subject, $name, $call_only) {
sub _metaphone_matches($self, $metaphone, $subject, $server, $namespace) { sub _metaphone_matches($self, $metaphone, $subject, $server, $namespace) {
my $dbh = $self->dbh; my $dbh = $self->dbh;
return [];
# TODO this should be using the trigram stuff once it's ready # TODO this should be using the trigram stuff once it's ready
my $rows = $dbh->selectall_arrayref( my $rows = $dbh->selectall_arrayref(
"SELECT f.factoid_id, f.subject, f.predicate, f.metaphone, spellfix1_editdist(f.metaphone, ?) AS score FROM (SELECT max(factoid_id) AS factoid_id FROM factoid GROUP BY original_subject) as subquery JOIN factoid AS f USING (factoid_id) WHERE NOT (f.predicate = ' ' OR f.predicate = '') AND f.predicate IS NOT NULL AND length(f.metaphone) > 1 AND score < 200 ORDER BY score ASC;", "SELECT f.factoid_id, f.subject, f.predicate, f.metaphone, spellfix1_editdist(f.metaphone, ?) AS score FROM (SELECT max(factoid_id) AS factoid_id FROM factoid GROUP BY original_subject) as subquery JOIN factoid AS f USING (factoid_id) WHERE NOT (f.predicate = ' ' OR f.predicate = '') AND f.predicate IS NOT NULL AND length(f.metaphone) > 1 AND score < 200 ORDER BY score ASC;",