Merge branch 'main' into feat/1173-implement-fallback-article-images

Author: driesvints

.github/dependabot.yml

@@ -4,7 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: weekly
-      day: wednesday
+      day: friday
     groups:
       php-dependencies:
         update-types:
@@ -18,7 +18,7 @@ updates:
     directory: "/"
     schedule:
       interval: weekly
-      day: wednesday
+      day: friday
     groups:
       js-dependencies:
         update-types:

.github/workflows/tests.yml

@@ -1,6 +1,10 @@
 name: Tests
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
   tests:

README.md

@@ -24,10 +24,9 @@ We'd like to thank these **amazing companies** for sponsoring us. If you are int
 - [Envoyer](https://envoyer.io)
 - [Fathom](https://usefathom.com)
 - [Tinkerwell](https://tinkerwell.app)
-- [Skynet Technologies](https://www.skynettechnologies.com/hire-laravel-developer)
 - [BairesDev](https://www.bairesdev.com/sponsoring-open-source-projects/)
-- [Remotely Works](https://www.remotely.works/sponsoring-open-source-projects)
 - [Dotcom-monitor](https://www.dotcom-monitor.com/sponsoring-open-source-projects/)
+- [N-iX](https://www.n-ix.com/)
 
 ## Requirements
 
@@ -94,9 +93,9 @@ New threads will be automatically added to the index and threads which get updat
 php artisan scout:flush App\\Models\\Thread
 ```
 
-### Twitter Sharing (optional)
+### X (Twitter) Sharing (optional)
 
-To enable published articles to be automatically shared on Twitter, you'll need to [create a Twitter app](https://developer.twitter.com/apps/). Once the app has been created, update the below variables in your `.env` file. The consumer key and secret and access token and secret can be found in the `Keys and tokens` section of the Twitter developers UI.
+To enable published articles to be automatically shared on X, you'll need to [create an app](https://developer.x.com/apps/). Once the app has been created, update the below variables in your `.env` file. The consumer key and secret and access token and secret can be found in the `Keys and tokens` section of the X developers UI.
 
 ```
 TWITTER_CONSUMER_KEY=

app/Console/Commands/PostArticleToTwitter.php

@@ -11,7 +11,7 @@ final class PostArticleToTwitter extends Command
 {
     protected $signature = 'lio:post-article-to-twitter';
 
-    protected $description = 'Posts the latest unshared article to Twitter';
+    protected $description = 'Posts the latest unshared article to X';
 
     public function handle(AnonymousNotifiable $notifiable): void
     {

app/Http/Controllers/Admin/UsersController.php

@@ -7,6 +7,7 @@
 use App\Http\Requests\BanRequest;
 use App\Jobs\BanUser;
 use App\Jobs\DeleteUser;
+use App\Jobs\DeleteUserThreads;
 use App\Jobs\UnbanUser;
 use App\Models\User;
 use App\Policies\UserPolicy;
@@ -39,6 +40,10 @@ public function ban(BanRequest $request, User $user): RedirectResponse
 
         $this->dispatchSync(new BanUser($user, $request->get('reason')));
 
+        if ($request->willDeleteThreads()) {
+            $this->dispatchSync(new DeleteUserThreads($user));
+        }
+
         $this->success($user->name().' was banned!');
 
         return redirect()->route('profile', $user->username());
@@ -65,4 +70,15 @@ public function delete(User $user): RedirectResponse
 
         return redirect()->route('admin.users');
     }
+
+    public function deleteThreads(User $user): RedirectResponse
+    {
+        $this->authorize(UserPolicy::DELETE, $user);
+
+        $this->dispatchSync(new DeleteUserThreads($user));
+
+        $this->success($user->name().' threads were deleted!');
+
+        return redirect()->route('admin.users');
+    }
 }

app/Http/Requests/BanRequest.php

@@ -15,11 +15,17 @@ public function rules(): array
     {
         return [
             'reason' => 'required|string',
+            'delete_threads' => 'boolean',
         ];
     }
 
     public function reason(): string
     {
         return $this->get('reason');
     }
+
+    public function willDeleteThreads(): bool
+    {
+        return $this->boolean('delete_threads');
+    }
 }

app/Jobs/DeleteUserThreads.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\User;
+
+final class DeleteUserThreads
+{
+    public function __construct(private User $user) {}
+
+    public function handle(): void
+    {
+        $this->user->deleteThreads();
+    }
+}

composer.json

@@ -8,7 +8,7 @@
         "algolia/scout-extended": "^3.1",
         "blade-ui-kit/blade-heroicons": "^2.3",
         "blade-ui-kit/blade-icons": "^1.6",
-        "blade-ui-kit/blade-ui-kit": "^0.6",
+        "blade-ui-kit/blade-ui-kit": "^0.6.3",
         "blade-ui-kit/blade-zondicons": "^1.5",
         "codeat3/blade-simple-icons": "^5.0",
         "guzzlehttp/guzzle": "^7.2",