Fix off-by-one error in view, fix whitespace

Author: soatok

bin/upgrade/v0.3.0-to-v0.4.0.php

@@ -0,0 +1,14 @@
+<?php
+if (!defined('UPGRADE_SCRIPT')) {
+    define('UPGRADE_SCRIPT', $argv[0]);
+}
+
+require_once dirname(__DIR__) . '/upgrade.php';
+
+$files = [
+    APP_ROOT . '/sql/updates/02-fix-view-offbyone.sql'
+];
+foreach ($files as $file) {
+    $sql = \file_get_contents($file);
+    $db->exec($sql);
+}

sql/09-analytics.sql

@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS faqoff_entry_accesslog (
 CREATE VIEW faqoff_view_entry_24h AS
     SELECT entry, COUNT(DISTINCT (ipaddr, entry)) AS count
     FROM faqoff_entry_accesslog
-    WHERE hittime + '1 day' > now()
+    WHERE hittime + '1 day' >= now()
     GROUP BY entry
     ORDER BY count DESC;
 

sql/updates/02-fix-view-offbyone.sql

@@ -0,0 +1,7 @@
+DROP VIEW faqoff_view_entry_24h;
+CREATE VIEW faqoff_view_entry_24h AS
+    SELECT entry, COUNT(DISTINCT (ipaddr, entry)) AS count
+    FROM faqoff_entry_accesslog
+    WHERE hittime + '1 day' >= now()
+    GROUP BY entry
+    ORDER BY count DESC;

src/FaqOff/Splices/Entry.php

@@ -213,8 +213,8 @@ public function getMostPopular(int $amount = 10, int $offset = 0): array
                 fc.url AS collection_url 
              FROM faqoff_entry entry
              JOIN faqoff_view_entry_24h stats ON entry.entryid = stats.entry
-            JOIN faqoff_collection fc on entry.collectionid = fc.collectionid
-            JOIN faqoff_author fa on entry.authorid = fa.authorid
+             JOIN faqoff_collection fc on entry.collectionid = fc.collectionid
+             JOIN faqoff_author fa on entry.authorid = fa.authorid
              ORDER BY stats.count DESC
              OFFSET {$offset} LIMIT {$amount}
             "