From 20b3e163593f6b14c5f52fd6c12807e97d45b29f Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Sat, 24 Dec 2016 02:22:01 -0800
Subject: [PATCH] Change sorting and such so that we handle thread=>threads
 better

---
 etc/plugins.conf    | 2 +-
 plugins/factoids.pm | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/etc/plugins.conf b/etc/plugins.conf
index 31f9b59..3e2802b 100644
--- a/etc/plugins.conf
+++ b/etc/plugins.conf
@@ -24,7 +24,6 @@ server "*" {
         plugin "eval" {addressed: false; }
         plugin "deparse" {addressed: false; }
         plugin "badfacts" {addressed: false; }
-	plugin "default" {plugin: "nfacts"}
     }
     channel "#buubot" {
         plugin "eval" {addressed: false; }
@@ -42,6 +41,7 @@ server "*.freenode.net" {
             serverspace: "freenode.net";
             filtersep: false;
         }
+        plugin "default" {plugin: "factoid"; }
     }
     channel "#regex" {
         plugin "nfacts" {
diff --git a/plugins/factoids.pm b/plugins/factoids.pm
index bad25fe..08067eb 100644
--- a/plugins/factoids.pm
+++ b/plugins/factoids.pm
@@ -651,14 +651,16 @@ sub _metaphone_matches {
         # TODO this needs to be rewritten to do an edit distance based on the metaphone columns, rather than a direct comparison
         #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(
-        "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 subject) as subquery JOIN factoid AS f USING (factoid_id) WHERE NOT (f.predicate = ' ') AND f.predicate IS NOT NULL AND length(f.metaphone) > 1 ORDER BY score ASC LIMIT 10;",
+        "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 subject) as subquery JOIN factoid AS f USING (factoid_id) WHERE NOT (f.predicate = ' ') AND f.predicate IS NOT NULL AND length(f.metaphone) > 1 AND score < 200 ORDER BY score ASC;",
 		undef,
 		$metaphone
 	);
 
     use Text::Levenshtein qw/distance/; # only import it in this scope
 
-	return [ map {$_->[0]} sort {$a->[1] <=> $b->[1]} map {[$_->[1], distance($subject, $_->[1])]} grep {$_->[2] =~ /\S/} @$rows ];
+	my @sorted =  map {$_->[0]} sort {$a->[1] <=> $b->[1]} map {[$_->[1], distance($subject, $_->[1])]} grep {$_->[2] =~ /\S/} @$rows ;
+
+    return [@sorted[0..9]];
 }
 
 no warnings 'void';