Default to null for invalid geoip queries #381

2 files changed, 12 insertions, 11 deletions

diff --git a/app/Helpers/StatsHelper.php b/app/Helpers/StatsHelper.php
index d1b4716..af57cce 100644
--- a/app/Helpers/StatsHelper.php
+++ b/app/Helpers/StatsHelper.php
@@ -61,6 +61,7 @@ class StatsHelper {
             ->select(DB::raw("country AS label, count(*) AS clicks"))
             ->groupBy('country')
             ->orderBy('clicks', 'desc')
+            ->whereNotNull('country')
             ->get();
 
         return $stats;
diff --git a/config/geoip.php b/config/geoip.php
index 7713d0d..8225f0a 100644
--- a/config/geoip.php
+++ b/config/geoip.php
@@ -126,18 +126,18 @@ return [
 
     'default_location' => [
         'ip' => '127.0.0.0',
-        'iso_code' => 'US',
-        'country' => 'United States',
-        'city' => 'New Haven',
-        'state' => 'CT',
-        'state_name' => 'Connecticut',
-        'postal_code' => '06510',
-        'lat' => 41.31,
-        'lon' => -72.92,
-        'timezone' => 'America/New_York',
-        'continent' => 'NA',
+        'iso_code' => null,
+        'country' => null,
+        'city' => null,
+        'state' => null,
+        'state_name' => null,
+        'postal_code' => null,
+        'lat' => 0,
+        'lon' => 0,
+        'timezone' => 'UTC',
+        'continent' => null,
         'default' => true,
-        'currency' => 'USD',
+        'currency' => null,
     ],
 
 ];