Merge pull request #293 from P3D-Legacy/develop

.github/workflows/laravel.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['8.1']
+        php-versions: ['8.2']
     steps:
       - name: Checkout
         uses: actions/checkout@v4

app/Helpers/XenForoHelper.php

@@ -27,6 +27,10 @@ public static function sendRequest($endpoint, $data = [], $method = self::METHOD
             'XF-Api-Key' => config('services.xenforo.api_key'),
         ])->$method($url, $data);
 
+        if ($response->failed()) {
+            return ['errors' => []];
+        }
+
         return json_decode($response, true);
     }
 

app/Http/Controllers/BlogController.php

@@ -3,32 +3,32 @@
 namespace App\Http\Controllers;
 
 use App\Models\Post;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Contracts\View\View;
 
 class BlogController extends Controller
 {
     /**
      * Display a listing of the resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return Application|Factory|View
      */
     public function index()
     {
         $posts = Post::where('published_at', '<=', now())
             ->where('active', true)
             ->orderBy('sticky', 'desc')
             ->orderByDesc('published_at')
-            ->paginate(5);
+            ->paginate(9);
 
         return view('blog.index', ['posts' => $posts]);
     }
 
     /**
      * Display the specified resource.
-     *
-     * @param  \App\Models\Post  $post
-     * @return \Illuminate\Http\Response
      */
-    public function show($param)
+    public function show($param): Application|Factory|View
     {
         $post = Post::where('uuid', $param)
             ->where('active', true)

app/Http/Controllers/ServerController.php

@@ -7,40 +7,34 @@
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 
 class ServerController extends Controller
 {
-
     public function __construct()
     {
         $this->middleware(['auth', 'verified'])->only(['edit', 'update', 'destroy']);
     }
 
     /**
      * Display a listing of the resource.
-     *
-     * @return Response
      */
-    public function index()
+    public function index(): View|Factory|Application
     {
         return view('server.index');
     }
 
     /**
      * Show the form for creating a new resource.
-     *
-     * @return Response
      */
-    public function create()
+    public function create(): View|Factory|Application
     {
         return view('server.create');
     }
 
     /**
      * Store a newly created resource in storage.
      *
-     * @return Response
+     * @return void
      */
     public function store(Request $request)
     {
@@ -50,21 +44,17 @@ public function store(Request $request)
     /**
      * Display the specified resource.
      *
-     * @param  int  $id
-     * @return Response
+     * @return void
      */
-    public function show($id)
+    public function show(int $id)
     {
         //return redirect()->route('server.index');
     }
 
     /**
      * Show the form for editing the specified resource.
-     *
-     * @param Server $server
-     * @return Application|Factory|View
      */
-    public function edit(Server $server)
+    public function edit(Server $server): View|Factory|Application
     {
         abort_if(! $server->user_id == auth()->user()->id, 403);
 
@@ -74,21 +64,19 @@ public function edit(Server $server)
     /**
      * Update the specified resource in storage.
      *
-     * @param  int  $id
-     * @return Response
+     * @return void
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, int $id)
     {
         //
     }
 
     /**
      * Remove the specified resource from storage.
      *
-     * @param  int  $id
-     * @return Response
+     * @return void
      */
-    public function destroy($id)
+    public function destroy(int $id)
     {
         //
     }

app/Http/Livewire/Notifications.php

@@ -4,12 +4,16 @@
 
 use App\Models\User;
 use Auth;
-use Illuminate\Notifications\DatabaseNotificationCollection;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Contracts\View\View;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Http\RedirectResponse;
 use Livewire\Component;
 
 class Notifications extends Component
 {
-    public DatabaseNotificationCollection $unreadNotifications;
+    public Collection $unreadNotifications;
 
     public User $user;
 
@@ -21,40 +25,40 @@ class Notifications extends Component
         'notificationsUpdated' => 'update',
     ];
 
-    public function mount()
+    public function mount(): void
     {
         $this->user = Auth::user();
         $this->unreadNotifications = $this->user->unreadNotifications->take($this->max);
         $this->count = $this->user->unreadNotifications->count();
     }
 
-    public function update()
+    public function update(): void
     {
         $this->unreadNotifications = $this->user->unreadNotifications->take($this->max);
         $this->count = $this->user->unreadNotifications->count();
     }
 
-    public function open($id)
+    public function open($id): RedirectResponse
     {
         $notification = $this->user->notifications->find($id);
         $this->dismiss($id);
 
         return redirect()->to($notification->data['url']);
     }
 
-    public function dismiss($id)
+    public function dismiss($id): void
     {
         $this->user->notifications->find($id)->markAsRead();
         $this->emit('notificationsUpdated');
     }
 
-    public function dismissAll()
+    public function dismissAll(): void
     {
         $this->user->unreadNotifications->markAsRead();
         $this->emit('notificationsUpdated');
     }
 
-    public function render()
+    public function render(): Factory|View|Application
     {
         return view('livewire.notifications');
     }

app/Http/Livewire/Resource/RatingCreate.php

@@ -22,7 +22,7 @@ public function mount(int|Resource $resource)
         }
         $this->resource = $resource;
         $this->user = auth()->user();
-        if(!$this->user) {
+        if (! $this->user) {
             $this->closeModal();
         }
         if ($this->user == $this->resource->user) {

app/Http/Livewire/Resource/ResourceForm.php

@@ -21,7 +21,7 @@ class ResourceForm extends ModalComponent
         'category' => 'required|exists:categories,id',
     ];
 
-    public function mount(int|Resource $resource = null)
+    public function mount(int|Resource|null $resource = null)
     {
         $this->resource = $resource ? Resource::find($resource) : new Resource();
         $this->category = $this->resource->categories->first()->id ?? 0;

app/Http/Livewire/Resource/UpdateShow.php

@@ -18,7 +18,7 @@ public function mount(int|ResourceUpdate $update)
     public function download()
     {
         $mediaItem = $this->update->getFirstMedia('resource_update_file');
-        if (!$mediaItem) {
+        if (! $mediaItem) {
             session()->flash('flash.banner', trans('File not found on server!'));
             session()->flash('flash.bannerStyle', 'danger');
 

app/Http/Livewire/Server/ServerEditForm.php

@@ -44,7 +44,16 @@ public function save()
             'description' => ['nullable', 'string'],
         ]);
 
-        Server::find($this->server->uuid)->update([
+        $server = Server::find($this->server->uuid);
+
+        if (! $server) {
+            session()->flash('flash.banner', trans('Server not found.'));
+            session()->flash('flash.bannerStyle', 'danger');
+
+            return redirect()->route('server.index');
+        }
+
+        $server->update([
             'name' => $this->name,
             'host' => $this->host,
             'port' => $this->port,

app/Http/Middleware/CustomRestrictedDocsAccess.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
+
+class CustomRestrictedDocsAccess
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        if (app()->environment(['local', 'staging'])) {
+            return $next($request);
+        }
+
+        if (Gate::allows('viewApiDocs')) {
+            return $next($request);
+        }
+
+        abort(403);
+    }
+}

app/Models/BanReason.php

@@ -11,8 +11,8 @@
 class BanReason extends BaseModel
 {
     use HasFactory;
-    use SoftDeletes;
     use LogsActivity;
+    use SoftDeletes;
 
     protected $primaryKey = 'id';
 

app/Models/Comment.php

@@ -8,8 +8,8 @@
 
 class Comment extends \AliBayat\LaravelCommentable\Comment
 {
-    use LogsActivity;
     use Likeable;
+    use LogsActivity;
 
     /**
      * The attributes that should be logged for the user.

app/Models/DiscordAccount.php

@@ -11,8 +11,8 @@
 class DiscordAccount extends BaseModel
 {
     use HasFactory;
-    use SoftDeletes;
     use LogsActivity;
+    use SoftDeletes;
 
     public static function boot()
     {

app/Models/FacebookAccount.php

@@ -11,8 +11,8 @@
 class FacebookAccount extends BaseModel
 {
     use HasFactory;
-    use SoftDeletes;
     use LogsActivity;
+    use SoftDeletes;
 
     public static function boot()
     {

app/Models/ForumAccount.php

@@ -11,10 +11,10 @@
 
 class ForumAccount extends BaseModel
 {
-    use HasFactory;
     use EncryptableDbAttribute;
-    use SoftDeletes;
+    use HasFactory;
     use LogsActivity;
+    use SoftDeletes;
 
     public static function boot()
     {

app/Models/GJUser.php

@@ -11,9 +11,9 @@
 class GJUser extends BaseModel
 {
     use HasFactory;
-    use SoftDeletes;
-    use LogsActivity;
     use Liker;
+    use LogsActivity;
+    use SoftDeletes;
 
     /**
      * The table associated with the model.

app/Models/GamejoltAccount.php

@@ -11,10 +11,10 @@
 
 class GamejoltAccount extends BaseModel
 {
-    use HasFactory;
     use EncryptableDbAttribute;
-    use SoftDeletes;
+    use HasFactory;
     use LogsActivity;
+    use SoftDeletes;
 
     protected $primaryKey = 'aid';
 

app/Models/GamejoltAccountBan.php

@@ -11,8 +11,8 @@
 class GamejoltAccountBan extends BaseModel
 {
     use HasFactory;
-    use SoftDeletes;
     use LogsActivity;
+    use SoftDeletes;
 
     public static function boot()
     {