feat/fix(user ips): fixes and admin panel recent regs widget + v3 catchup

.github/workflows/Lint.yml

@@ -9,19 +9,89 @@ on:
       - '**'
     types:
       - opened
-      - edited
       - synchronize
       - reopened
 
 jobs:
   pint:
-    uses: itinerare/github-actions/.github/workflows/pint.yml@main
-    with:
-      php-version: '8.1'
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
     concurrency:
-      group: ci-${{ github.head_ref || github.ref_name }}
+      group: ci-pint-${{ github.head_ref || github.ref_name }}
+      cancel-in-progress: true
+
+    steps:
+    - uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2
+      with:
+        php-version: 8.1
+
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      with:
+        repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
+        ref: ${{ github.event.pull_request.head.ref || github.ref_name }}
+
+    - name: Get composer cache directory
+      id: composer-cache
+      run: |
+        echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+    - name: Cache or restore composer cache
+      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-composer-
+
+    - name: Install dependencies
+      run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --ignore-platform-reqs
+
+    - name: Run pint
+      run: composer lint
+
+    - name: Commit changes
+      uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9
+      with:
+          pull: '--rebase --autostash'
+          message: 'refactor: fix PHP styling'
+          committer_name: github-actions[bot]
+          committer_email: github-actions[bot]@users.noreply.github.com
 
   blade-formatter:
-    uses: itinerare/github-actions/.github/workflows/blade_formatter.yml@main
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
     concurrency:
-      group: ci-${{ github.head_ref || github.ref_name }}
+      group: ci-blade-formatter-${{ github.head_ref || github.ref_name }}
+      cancel-in-progress: true
+
+    steps:
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      with:
+        repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
+        ref: ${{ github.event.pull_request.head.ref || github.ref_name }}
+
+    - name: Set up node
+      uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
+      with:
+        node-version: 22.x
+        cache: 'npm'
+
+    - name: Install packages
+      run: npm install
+
+    - name: Run blade-formatter
+      run: npm run format
+
+    - name: Commit changes
+      uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9
+      with:
+          pull: '--rebase --autostash'
+          message: 'refactor: fix blade formatting'
+          committer_name: github-actions[bot]
+          committer_email: github-actions[bot]@users.noreply.github.com

CONTRIBUTING.md

@@ -4,7 +4,7 @@ For support and general questions and discussions, please visit the [support Dis
 
 The following are accepted uses for the [issue tracker](https://github.com/corowne/Lorekeeper/issues):
 - Bug reports
-- Feature or enhancement requests (within reason)-- note that these may be denied if they are deemed out of scope of the project and/or are not feasible to implement for any reason.
+- Feature or enhancement requests *or* discussion of potential new features (within reason)-- note that these may be denied if they are deemed out of scope of the project and/or are not feasible to implement for any reason.
 
 ## Opening an Issue
 ### Reporting a bug
@@ -24,7 +24,7 @@ Avoid listing multiple requests in one issue. One issue per request makes it eas
 
 ## Contributing Code
 
-Please see the full [Contribution Guide](http://wiki.lorekeeper.me/index.php?title=Contributing_to_Lorekeeper) for more information!
+Please see the full [Contribution Guide](https://lk-arpg.github.io/lk-docs/prerelease/contributing/) for more information!
 
 ### About abandoned pull requests
 

app/Actions/Fortify/CreateNewUser.php

@@ -3,6 +3,7 @@
 namespace App\Actions\Fortify;
 
 use App\Models\Invitation;
+use App\Models\Rank\Rank;
 use App\Models\User\User;
 use App\Services\InvitationService;
 use App\Services\UserService;
@@ -20,11 +21,14 @@ class CreateNewUser implements CreatesNewUsers {
     public function create(array $input) {
         (new UserService)->validator($input)->validate();
 
+        // Create a user with the lowest existing rank
+        $rank_id = Rank::orderBy('sort')->first()->id;
+
         $user = User::create([
             'name'     => $input['name'],
             'email'    => $input['email'],
             'password' => Hash::make($input['password']),
-            'rank_id'  => 2,
+            'rank_id'  => $rank_id,
             'birthday' => $input['dob'],
         ]);
         $user->settings()->create([

app/Console/Commands/FixCharacterImageFormats.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Character\CharacterDesignUpdate;
+use App\Models\Character\CharacterImage;
+use Illuminate\Console\Command;
+use Intervention\Image\Facades\Image;
+
+class FixCharacterImageFormats extends Command {
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:fix-character-image-formats';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Converts existing fullsize character and design update images not stored as the configured file format.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle() {
+        $masterlistFormat = config('lorekeeper.settings.masterlist_image_format');
+        $fullsizeFormat = config('lorekeeper.settings.masterlist_fullsizes_format');
+
+        $images = CharacterImage::where('fullsize_extension', '!=', $fullsizeFormat);
+        if ($images->count()) {
+            $this->info('Processing '.$images->count().' images...');
+            $images->update(['fullsize_extension' => $fullsizeFormat]);
+
+            foreach ($images->get() as $image) {
+                if (file_exists($image->imagePath.'/'.$image->id.'_'.$image->hash.'_'.$image->fullsize_hash.'_full.'.$masterlistFormat)) {
+                    Image::make($image->imagePath.'/'.$image->id.'_'.$image->hash.'_'.$image->fullsize_hash.'_full.'.$masterlistFormat)->save($image->imagePath.'/'.$image->fullsizeFileName, 100, $fullsizeFormat);
+
+                    if (file_exists($image->imagePath.'/'.$image->fullsizeFileName)) {
+                        unlink($image->imagePath.'/'.$image->id.'_'.$image->hash.'_'.$image->fullsize_hash.'_full.'.$masterlistFormat);
+                    }
+                }
+            }
+        }
+
+        $updates = CharacterDesignUpdate::where('status', '!=', 'Approved');
+        if ($updates->count()) {
+            $this->info('Processing '.$updates->count().' updates...');
+            foreach ($updates->get() as $update) {
+                $updates->update(['extension' => $fullsizeFormat]);
+
+                if (file_exists($update->imagePath.'/'.$update->id.'_'.$update->hash.'.'.$masterlistFormat)) {
+                    Image::make($update->imagePath.'/'.$update->id.'_'.$update->hash.'.'.$masterlistFormat)->save($update->imagePath.'/'.$update->imageFileName, 100, $fullsizeFormat);
+
+                    if (file_exists($update->imagePath.'/'.$update->imageFileName)) {
+                        unlink($update->imagePath.'/'.$update->id.'_'.$update->hash.'.'.$masterlistFormat);
+                    }
+                }
+
+                if (!file_exists($update->imagePath.'/'.$update->thumbnailFileName) && file_exists($update->imagePath.'/'.$update->id.'_'.$update->hash.'_th.'.$fullsizeFormat)) {
+                    Image::make($update->imagePath.'/'.$update->id.'_'.$update->hash.'_th.'.$fullsizeFormat)->save($update->imagePath.'/'.$update->thumbnailFileName, 100, $masterlistFormat);
+
+                    if (file_exists($update->imagePath.'/'.$update->thumbnailFileName)) {
+                        unlink($update->imagePath.'/'.$update->id.'_'.$update->hash.'_th.'.$fullsizeFormat);
+                    }
+                }
+            }
+        }
+    }
+}

app/Console/Commands/SetupAdminUser.php

@@ -46,14 +46,16 @@ public function handle() {
         if (!Rank::count()) {
             // These need to be created even if the seeder isn't run for the site to work correctly.
             $adminRank = Rank::create([
-                'name'        => 'Admin',
-                'description' => 'The site admin. Has the ability to view/edit any data on the site.',
-                'sort'        => 1,
+                'name'               => 'Admin',
+                'description'        => 'The site admin. Has the ability to view/edit any data on the site.',
+                'parsed_description' => 'The site admin. Has the ability to view/edit any data on the site.',
+                'sort'               => 1,
             ]);
             Rank::create([
-                'name'        => 'Member',
-                'description' => 'A regular member of the site.',
-                'sort'        => 0,
+                'name'               => 'Member',
+                'description'        => 'A regular member of the site.',
+                'parsed_description' => 'A regular member of the site.',
+                'sort'               => 0,
             ]);
 
             $this->line('User ranks not found. Default user ranks (admin and basic member) created.');

app/Http/Controllers/Admin/Characters/CharacterImageController.php

@@ -249,6 +249,7 @@ public function getImageReupload($id) {
      * @return \Illuminate\Http\RedirectResponse
      */
     public function postImageReupload(Request $request, CharacterManager $service, $id) {
+        $request->validate(['image' => CharacterImage::$createRules['image'], 'thumbnail' => CharacterImage::$createRules['thumbnail']]);
         $data = $request->only(['image', 'thumbnail', 'x0', 'x1', 'y0', 'y1', 'use_cropper']);
         $image = CharacterImage::find($id);
         if (!$image) {

app/Http/Controllers/Admin/HomeController.php

@@ -42,6 +42,7 @@ public function getIndex() {
             'galleryCurrencyAwards'  => $galleryCurrencyAwards,
             'gallerySubmissionCount' => GallerySubmission::collaboratorApproved()->where('status', 'Pending')->count(),
             'galleryAwardCount'      => GallerySubmission::requiresAward()->where('is_valued', 0)->count(),
+            'recentUsers'            => User::orderBy('id', 'DESC')->take(10)->get(),
         ]);
     }
 

app/Http/Controllers/Admin/Users/UserController.php

@@ -460,7 +460,9 @@ public function getUserIpList(Request $request) {
                     $query->orderBy('updated_at', 'ASC');
                     break;
                 case 'most_users':
-                    $query->select('ip', DB::raw('COUNT(ip) as count'))->groupBy('ip')->orderBy('count', 'DESC');
+                    $query->select('ip', DB::raw('COUNT(ip) as user_count'), DB::raw('MAX(updated_at) as updated_at'))
+                        ->groupBy('ip')
+                        ->orderBy('user_count', 'DESC');
                     break;
                 case 'closely_updated':
                     $query->whereExists(function ($query) {
@@ -472,10 +474,10 @@ public function getUserIpList(Request $request) {
                     });
                     break;
             }
+        } else {
+            $query->select('ip', DB::raw('MAX(updated_at) as updated_at'))->groupBy('ip')->orderBy('updated_at', 'DESC');
         }
 
-        $query->select('ip', DB::raw('MAX(updated_at)'))->groupBy('ip')->orderBy(DB::raw('MAX(updated_at)'), 'DESC');
-
         return view('admin.users.user_ips', [
             'ips'   => $query->paginate(30)->appends($request->query()),
             'users' => User::orderBy('name')->pluck('name', 'id')->toArray(),

app/Http/Controllers/Auth/LoginController.php

@@ -64,7 +64,7 @@ public function getAuthCallback(LinkService $service, $provider) {
         $socialite->redirectUrl(str_replace('auth', 'login', url(config('services.'.$provider.'.redirect'))));
         $result = $socialite->user();
 
-        $user = UserAlias::where('user_snowflake', $result->id)->first();
+        $user = UserAlias::where('site', $provider)->where('user_snowflake', $result->id)->first();
         if (!$user) {
             return redirect('/register/'.$provider)->with(['userData' => $result]);
         }