Merge pull request #601 from Kovah/dev

v1 Release

.env.docker

@@ -24,6 +24,7 @@ DB_PORT=3306
 DB_DATABASE=linkace
 # Set both username and password of the user accessing the database
 DB_USERNAME=linkace
+# Wrap your password into quotes (") if it contains special characters
 DB_PASSWORD=ChangeThisToASecurePassword!
 
 ## Redis cache configuration

.env.docker.production

@@ -20,6 +20,7 @@ DB_PORT=3306
 DB_DATABASE=linkace
 # Set both username and password of the user accessing the database
 DB_USERNAME=linkace
+# Wrap your password into quotes (") if it contains special characters
 DB_PASSWORD=ChangeThisToASecurePassword!
 
 ## Redis cache configuration

.env.example

@@ -16,4 +16,5 @@ DB_PORT=3306
 DB_DATABASE=linkace
 # Set both username and password of the user accessing the database
 DB_USERNAME=linkace
+# Wrap your password into quotes (") if it contains special characters
 DB_PASSWORD=ChangeThisToASecurePassword!

app/Actions/ImportHtmlBookmarks.php

@@ -58,7 +58,6 @@ public function run(string $data, string $userId, bool $generateMeta = true): bo
                 $description = $link['note'];
             }
 
-            Log::debug($link['uri'] .': '. $link['pub']);
             $newLink = new Link([
                 'user_id' => $userId,
                 'url' => $link['uri'],
@@ -80,6 +79,7 @@ public function run(string $data, string $userId, bool $generateMeta = true): bo
                     $newTag = Tag::firstOrCreate([
                         'user_id' => $userId,
                         'name' => $tag,
+                        'is_private' => usersettings('tags_private_default') === '1',
                     ]);
                     $newTags[] = $newTag->id;
                 }

app/Console/Commands/CompleteSetupCommand.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Setting;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Log;
+
+class CompleteSetupCommand extends Command
+{
+    protected $signature = 'setup:complete';
+
+    protected $description = 'Use this command in case the setup cannot be completed automatically.';
+
+    public function handle()
+    {
+        try {
+            Setting::updateOrCreate(
+                ['key' => 'system_setup_completed'],
+                ['key' => 'system_setup_completed', 'value' => true]
+            );
+            Cache::forget('systemsettings');
+        } catch (\Exception $e) {
+            $this->error('Could not complete the setup because of an error: ' . $e->getMessage());
+            $this->error('Check the log files for further details.');
+            Log::warning($e);
+            return;
+        }
+
+        $this->info('Successfully marked the setup as completed. You can now visit the web interface.');
+        $this->line('Hint: If you install LinkAce with PostgreSQL or SQLite, use the <options=reverse>registeruser</> command now.');
+    }
+}

app/Console/Kernel.php

@@ -2,33 +2,11 @@
 
 namespace App\Console;
 
-use App\Console\Commands\CheckLinksCommand;
-use App\Console\Commands\CleanupLinkHistoriesCommand;
-use App\Console\Commands\ImportCommand;
-use App\Console\Commands\ListUsersCommand;
-use App\Console\Commands\RegisterUserCommand;
-use App\Console\Commands\ResetPasswordCommand;
-use App\Console\Commands\UpdateLinkThumbnails;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 class Kernel extends ConsoleKernel
 {
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
-     */
-    protected $commands = [
-        RegisterUserCommand::class,
-        CheckLinksCommand::class,
-        ResetPasswordCommand::class,
-        CleanupLinkHistoriesCommand::class,
-        ImportCommand::class,
-        UpdateLinkThumbnails::class,
-        ListUsersCommand::class,
-    ];
-
     /**
      * Define the application's command schedule.
      *

app/Models/User.php

@@ -7,6 +7,7 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Collection;
 use Laravel\Fortify\TwoFactorAuthenticatable;
 
 /**
@@ -52,7 +53,7 @@ public function rawSettings(): HasMany
         return $this->hasMany(Setting::class, 'user_id', 'id');
     }
 
-    public function settings(): \Illuminate\Support\Collection
+    public function settings(): Collection
     {
         if ($this->rawSettings->isEmpty()) {
             $this->load('rawSettings');