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

first pass is done, need to make some methods for namespace config lookup

Browse source
This commit is contained in:
Ryan Voots 2020-09-06 21:03:08 -07:00
parent 6c1f320557
commit 8e67d51e8a
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
plugins/factoids.pm
View file

@ -173,8 +173,7 @@ sub postload {
sub command ($self, $_said, $pm) { sub command ($self, $_said, $pm) {
my $said = +{ $_said->%* }; my $said = +{ $_said->%* };
my $conf = my $conf = $self->get_conf_for_channel($pm, $said->{server}, $said->{channel});
$self->get_conf_for_channel($pm, $said->{server}, $said->{channel});
open(my $fh, ">/tmp/wut"); open(my $fh, ">/tmp/wut");
print $fh "COMMAND INCOMING\n"; print $fh "COMMAND INCOMING\n";
@ -763,18 +762,17 @@ sub _db_get_fact ($self, $subj, $func, $namespace, $server) {
} else { } else {
return $fact; return $fact;
} }
} }
sub basic_get_fact { sub basic_get_fact ($self, $pm, $said, $subject, $name, $call_only) {
my ($self, $pm, $said, $subject, $name, $call_only) = @_; my ($server, $namespace) = $self->get_namespace($said);
# open(my $fh, ">>/tmp/facts"); # open(my $fh, ">>/tmp/facts");
my ($fact, $key, $arg); my ($fact, $key, $arg);
$key = _clean_subject($subject); $key = _clean_subject($subject);
if (!$call_only) { if (!$call_only) {
$fact = $self->_db_get_fact($key, $name); $fact = $self->_db_get_fact($key, $name, $server, $namespace);
} }
# Attempt to determine if our subject matches a previously defined # Attempt to determine if our subject matches a previously defined
@ -784,7 +782,7 @@ sub basic_get_fact {
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); $fact = $self->_db_get_fact($key, $name, 1, $server, $namespace);
} }
} }
@ -803,9 +801,6 @@ sub basic_get_fact {
use Data::Dumper; use Data::Dumper;
print $fh Dumper({ key => $key, arg => $arg, fact => $fact, ret => $ret }); print $fh Dumper({ key => $key, arg => $arg, fact => $fact, ret => $ret });
# $ret = "die 'fuck me silly';";
# $ret = unpack("H*", decode('utf8',$ret));
$ret = "\x00$ret" if ($key eq "tell"); $ret = "\x00$ret" if ($key eq "tell");
return $ret; return $ret;
@ -813,8 +808,8 @@ sub basic_get_fact {
return "$fact->{predicate}"; return "$fact->{predicate}";
} }
} else { } else {
if ($subject =~ /[\?\.\!]$/ if ($subject =~ /[\?\.\!]$/)
) #check if some asshole decided to add a ? at the end of the factoid, if so remove it and recurse, this should only be able to recurse N times so it should be fine #check if some asshole decided to add a ? at the end of the factoid, if so remove it and recurse, this should only be able to recurse N times so it should be fine
{ {
my $newsubject = $subject; my $newsubject = $subject;
$newsubject =~ s/[\?\.\!]$//; $newsubject =~ s/[\?\.\!]$//;
@ -823,7 +818,7 @@ sub basic_get_fact {
my $metaphone = Metaphone(_clean_subject($subject, 1)); my $metaphone = Metaphone(_clean_subject($subject, 1));
my $matches = $self->_metaphone_matches($metaphone, $subject); my $matches = $self->_metaphone_matches($metaphone, $subject, $server, $namespace);
push @{ $said->{metaphone_matches} }, @$matches; push @{ $said->{metaphone_matches} }, @$matches;
@ -835,12 +830,10 @@ sub basic_get_fact {
} }
} }
sub _metaphone_matches { sub _metaphone_matches($self, $metaphone, $subject, $server, $namespace) {
my ($self, $metaphone, $subject) = @_;
my $dbh = $self->dbh; my $dbh = $self->dbh;
# TODO this needs to be rewritten to do an edit distance based on the metaphone columns, rather than a direct comparison # TODO this should be using the trigram stuff once it's ready
#XXX HACK WARNING: not really a hack, but something to document, the inner query here seems to work fine on sqlite, but i suspect on other databases it might need an ORDER BY factoid_id clause to enforce that it picks the last entry in the database
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;",
undef, $metaphone undef, $metaphone