Commit ab2dec77 authored by Simon Welsh's avatar Simon Welsh

Merge remote-tracking branch 'origin/master'

parents 9e55c57c ba6dadc2
......@@ -105,7 +105,7 @@ function build_stats(Redis $r) {
$stats = [];
$swears = array_filter(array_map('trim', file(__DIR__ . '/swears.txt')));
natcasesort($swears);
$query = 'SELECT COUNT(*) AS "Number", "Nick" FROM "Log" WHERE "Text" ILIKE \'%%%s%%\' GROUP BY "Nick" ORDER BY "Number" DESC LIMIT 50;';
$query = 'SELECT COUNT(*) AS "Number", "Nick" FROM "Log" WHERE "Text" ILIKE \'%%%s%%\' GROUP BY "Nick" ORDER BY "Number" DESC LIMIT 20;';
foreach($swears as $name) {
$res = DB::inst()->query(sprintf($query, $name));
$stats[$name] = [];
......@@ -115,7 +115,7 @@ function build_stats(Redis $r) {
}
$stats = array_filter($stats);
$full = [];
$query = 'SELECT COUNT(*) AS "Number", "Nick" FROM "Log" WHERE "Command" = \'ACTION\' OR "Command" = \'PRIVMSG\' GROUP BY "Nick" ORDER BY "Number" DESC LIMIT 50;';
$query = 'SELECT COUNT(*) AS "Number", "Nick" FROM "Log" WHERE "Command" = \'ACTION\' OR "Command" = \'PRIVMSG\' GROUP BY "Nick" ORDER BY "Number" DESC LIMIT 20;';
$res = DB::inst()->query($query);
while($row = pg_fetch_array($res)) {
$full[$row[1]] = $row[0];
......
Angular
Arsehole
Bastard
Behat
Bitch
Blink
Chrome
......@@ -10,30 +11,43 @@ composer
Crap
CSS
Cunt
CWP
deploynaut
Dick
doc
Drupal
ember
entwine
ffs
Firefox
Flow
Fuck
Gecko
git
Google
Hamish
html
Javascript
Joomla
jQuery
Laravel
Netscape Navigator
OCaml
Opera
OSX
Penis
Presto
react
Safari
Salad
Selenium
SEO
Shit
Slut
Smarty
ss23
subsites
Symfony
Synergy
tinymce
Trident
......@@ -44,4 +58,5 @@ Web 2.0
WebKit
WordDerp
WordPress
Workflow
wtf
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment