merge develop

.bladeformatterrc.json

@@ -0,0 +1,6 @@
+{
+    "indentSize": 4,
+    "wrapLineLength": 250,
+    "endWithNewLine": true,
+    "useTabs": false
+}

.bladeignore

@@ -0,0 +1 @@
+vendor/*

.github/workflows/format_blade.yml

@@ -0,0 +1,30 @@
+name: Format (Blade)
+
+on:
+  push:
+    branches:
+      - '**'
+
+jobs:
+    blade-formatter:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+              with:
+                ref: ${{ github.head_ref }}
+
+            - name: Use Node.js 16.x
+              uses: actions/setup-node@v3
+              with:
+                node-version: 16.x
+                cache: 'npm'
+
+            - name: Install packages
+              run: npm install
+
+            - name: Run blade-formatter
+              run: npm run format
+
+            - uses: stefanzweifel/git-auto-commit-action@v4
+              with:
+                  commit_message: 'refactor: fix blade formatting'

.github/workflows/format_php.yml

@@ -0,0 +1,27 @@
+name: Format (PHP)
+
+on:
+  push:
+    branches:
+      - '**'
+
+jobs:
+    pint:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
+              with:
+                php-version: '8.1'
+            - uses: actions/checkout@v2
+              with:
+                  ref: ${{ github.head_ref }}
+
+            - name: Install
+              run: composer install
+
+            - name: Run pint
+              run: composer lint
+
+            - uses: stefanzweifel/git-auto-commit-action@v4
+              with:
+                  commit_message: 'refactor: fix PHP styling'

.gitignore

@@ -9,6 +9,6 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
-/composer.lock
 *.env
 /composer.phar
+*.cache

app/Console/Commands/AddSiteSettings.php

@@ -2,12 +2,10 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
-
 use DB;
+use Illuminate\Console\Command;
 
-class AddSiteSettings extends Command
-{
+class AddSiteSettings extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -24,45 +22,17 @@ class AddSiteSettings extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
-    /**
-     * Add a site setting.
-     * 
-     * Example usage:
-     * $this->addSiteSetting("site_setting_key", 1, "0: does nothing. 1: does something.");
-     * 
-     * @param  string  $key
-     * @param  int     $value
-     * @param  string  $description
-     */
-    private function addSiteSetting($key, $value, $description) {
-        if(!DB::table('site_settings')->where('key', $key)->exists()) {
-            DB::table('site_settings')->insert([
-                [
-                    'key'         => $key,
-                    'value'       => $value,
-                    'description' => $description,
-                ],
-            ]);
-            $this->info( "Added:   ".$key." / Default: ".$value);
-        }
-        else $this->line("Skipped: ".$key);
-    }
-
     /**
      * Execute the console command.
      *
      * @return mixed
      */
-    public function handle()
-    {
+    public function handle() {
         $this->info('*********************');
         $this->info('* ADD SITE SETTINGS *');
         $this->info('*********************'."\n");
@@ -111,6 +81,41 @@ public function handle()
 
         $this->addSiteSetting('shop_type', 0, '0: Default, 1: Collapsible.');
 
+        $this->addSiteSetting('is_maintenance_mode', 0, '0: Site is normal, 1: Users without the Has Maintenance Access power will be redirected to the home page.');
+
+        $this->addSiteSetting('deactivated_privacy', 0, 'Who can view the deactivated list? 0: Admin only, 1: Staff only, 2: Members only, 3: Public.');
+
+        $this->addSiteSetting('deactivated_link', 0, '0: No link to the deactivated list is displayed anywhere, 1: Link to the deactivated list is shown on the user list.');
+
+        $this->addSiteSetting('deactivated_key', 0, 'Optional key to view the deactivated list. Enter "0" to not require one.');
+
+        $this->addSiteSetting('comment_dislikes_enabled', 0, '0: Dislikes disabled, 1: Dislikes enabled.');
+
         $this->line("\nSite settings up to date!");
     }
+
+    /**
+     * Add a site setting.
+     *
+     * Example usage:
+     * $this->addSiteSetting("site_setting_key", 1, "0: does nothing. 1: does something.");
+     *
+     * @param string $key
+     * @param int    $value
+     * @param string $description
+     */
+    private function addSiteSetting($key, $value, $description) {
+        if (!DB::table('site_settings')->where('key', $key)->exists()) {
+            DB::table('site_settings')->insert([
+                [
+                    'key'         => $key,
+                    'value'       => $value,
+                    'description' => $description,
+                ],
+            ]);
+            $this->info('Added:   '.$key.' / Default: '.$value);
+        } else {
+            $this->line('Skipped: '.$key);
+        }
+    }
 }

app/Console/Commands/AddTextPages.php

@@ -2,13 +2,12 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
+use Carbon\Carbon;
 use Config;
 use DB;
-use Carbon\Carbon;
+use Illuminate\Console\Command;
 
-class AddTextPages extends Command
-{
+class AddTextPages extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -25,11 +24,8 @@ class AddTextPages extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -38,34 +34,33 @@ public function __construct()
      *
      * @return mixed
      */
-    public function handle()
-    {
+    public function handle() {
         //
         $pages = Config::get('lorekeeper.text_pages');
 
-
         $this->info('******************');
         $this->info('* ADD SITE PAGES *');
         $this->info('******************'."\n");
 
         $this->line("Adding site pages...existing entries will be skipped.\n");
 
-        foreach($pages as $key => $page) {
-            if(!DB::table('site_pages')->where('key', $key)->exists()) {
+        foreach ($pages as $key => $page) {
+            if (!DB::table('site_pages')->where('key', $key)->exists()) {
                 DB::table('site_pages')->insert([
                     [
-                        'key' => $key,
-                        'title' => $page['title'],
-                        'text' => $page['text'],
+                        'key'         => $key,
+                        'title'       => $page['title'],
+                        'text'        => $page['text'],
                         'parsed_text' => $page['text'],
-                        'created_at' => Carbon::now(),
-                        'updated_at' => Carbon::now(),
-                    ]
+                        'created_at'  => Carbon::now(),
+                        'updated_at'  => Carbon::now(),
+                    ],
 
                 ]);
-                $this->info("Added:   ".$page['title']);
+                $this->info('Added:   '.$page['title']);
+            } else {
+                $this->line('Skipped: '.$page['title']);
             }
-            else $this->line("Skipped: ".$page['title']);
         }
     }
 }

app/Console/Commands/CheckNews.php

@@ -2,11 +2,10 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
 use App\Services\NewsService;
+use Illuminate\Console\Command;
 
-class CheckNews extends Command
-{
+class CheckNews extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -23,11 +22,8 @@ class CheckNews extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -36,8 +32,7 @@ public function __construct()
      *
      * @return mixed
      */
-    public function handle()
-    {
+    public function handle() {
         //
         (new NewsService)->updateQueue();
     }

app/Console/Commands/CheckSales.php

@@ -2,11 +2,10 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
 use App\Services\SalesService;
+use Illuminate\Console\Command;
 
-class CheckSales extends Command
-{
+class CheckSales extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -23,11 +22,8 @@ class CheckSales extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -36,8 +32,7 @@ public function __construct()
      *
      * @return mixed
      */
-    public function handle()
-    {
+    public function handle() {
         //
         (new SalesService)->updateQueue();
     }

app/Console/Commands/ClearDeletedCharacterAttachments.php

@@ -2,17 +2,14 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
-
-use DB;
-
 use App\Models\Character\Character;
 use App\Models\Character\CharacterCurrency;
 use App\Models\Character\CharacterFeature;
 use App\Models\Character\CharacterImage;
+use DB;
+use Illuminate\Console\Command;
 
-class ClearDeletedCharacterAttachments extends Command
-{
+class ClearDeletedCharacterAttachments extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -29,11 +26,8 @@ class ClearDeletedCharacterAttachments extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -42,8 +36,7 @@ public function __construct()
      *
      * @return mixed
      */
-    public function handle()
-    {
+    public function handle() {
         // Get deleted character IDs
         $deletedCharacterIds = DB::table('characters')->whereNotNull('deleted_at')->pluck('id');