Merge branch 'hotfix/0.5.1-8'

CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
-## [0.5.1-4] and [0.5.1-7] - 2018-10-04
+## [0.5.1-4] and [0.5.1-8] - 2018-10-04
 ## Fixed
 - Fix user IP resolving when behind Cloudflare DNS with trusted proxies.
 - Dominion numbering on the realm page now correctly starts at 1, instead of 0.
@@ -110,7 +110,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 ### Added
 - This CHANGELOG file.
 
-[Unreleased]: https://github.com/WaveHack/OpenDominion/compare/0.5.1-7...HEAD
+[Unreleased]: https://github.com/WaveHack/OpenDominion/compare/0.5.1-8...HEAD
+[0.5.1-8]: https://github.com/WaveHack/OpenDominion/compare/0.5.1-7...0.5.1-8
 [0.5.1-7]: https://github.com/WaveHack/OpenDominion/compare/0.5.1-6...0.5.1-7
 [0.5.1-6]: https://github.com/WaveHack/OpenDominion/compare/0.5.1-5...0.5.1-6
 [0.5.1-5]: https://github.com/WaveHack/OpenDominion/compare/0.5.1-4...0.5.1-5

app/database/migrations/2019_01_03_213655_prune_unactivated_users_1.php

@@ -17,8 +17,6 @@ public function up()
         DB::transaction(function () use ($output) {
 
             // First pass: Delete unactivated users
-            $output->writeln('Pruning unactivated users');
-
             $users = DB::table('users')
                 ->where('activated', 0)
                 ->get();
@@ -33,11 +31,13 @@ public function up()
                     ->delete();
             });
 
-            $output->writeln("Pruned {$users->count()} users");
+            $usersCount = $users->count();
 
-            // Second pass: Delete all users with no dominions
-            $output->writeln('Pruning users with no dominion');
+            if ($usersCount > 0) {
+                $output->writeln("Pruned {$users->count()} users");
+            }
 
+            // Second pass: Delete all users with no dominions
             $usersPrunedCount = 0;
 
             DB::table('users')
@@ -62,7 +62,9 @@ public function up()
                     $usersPrunedCount++;
                 });
 
-            $output->writeln("Pruned {$usersPrunedCount} users");
+            if ($usersPrunedCount > 0) {
+                $output->writeln("Pruned {$usersPrunedCount} users");
+            }
         });
     }
 

app/routes/web.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Routing\Router;
+use Spatie\Honeypot\ProtectAgainstSpam;
 
 /** @var Router $router */
 $router->get('/')->uses('HomeController@getIndex')->name('home');
@@ -17,7 +18,7 @@
 
         // Registration
         $router->get('register')->uses('Auth\RegisterController@showRegistrationForm')->name('register');
-        $router->post('register')->uses('Auth\RegisterController@register');
+        $router->post('register')->uses('Auth\RegisterController@register')->middleware(ProtectAgainstSpam::class);
         $router->get('activate/{activation_code}')->uses('Auth\RegisterController@activate')->name('activate');
 
         // Password Reset

tests/AbstractBrowserKitTestCase.php

@@ -23,6 +23,8 @@ protected function setUp()
     {
         parent::setUp();
 
+        config()->set('honeypot.enabled', false);
+
 //        Bus::fake();
 //        Event::fake();
 //        Mail::fake();