3.6.7

backend/Dockerfile

@@ -1,5 +1,5 @@
 #syntax=docker/dockerfile:1
-FROM dunglas/frankenphp:1.8.0-php8.3-bookworm AS build
+FROM dunglas/frankenphp:1.11.3-php8.3-bookworm AS build
 
 RUN apt-get update && apt-get install -y --no-install-recommends supervisor
 

backend/app/Console/Kernel.php

@@ -6,7 +6,6 @@
 use App\Jobs\CalculateModCounts;
 use App\Jobs\CalculatePopularity;
 use App\Jobs\CalculateThreadComments;
-use App\Jobs\CheckUsersSubscriptionStatus;
 use App\Jobs\DeleteLoosePendingFiles;
 use App\Jobs\DeleteOldAuditLogs;
 use App\Jobs\DeleteUnverifiedUsers;
@@ -39,7 +38,6 @@ protected function schedule(Schedule $schedule)
         $schedule->job(new DeleteOldAuditLogs)->everySixHours();
         $schedule->job(new CalculateThreadComments)->everyTwoHours();
         $schedule->job(new RemoveExpiredRequests)->everyTwoHours();
-        $schedule->job(new CheckUsersSubscriptionStatus)->everyThirtyMinutes();
         $schedule->job(new DeleteLoosePendingFiles)->everyThreeMinutes();
 
         $schedule->command('sitemap:generate')->everyTwoHours();

backend/app/Http/Controllers/ModController.php

@@ -26,6 +26,7 @@
 use App\Services\Utils;
 use Arr;
 use Auth;
+use Carbon\Carbon;
 use DB;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Http\Request;
@@ -369,7 +370,9 @@ public function registerView(Request $request, Mod $mod)
             return;
         }
 
-        $view = new ModView();
+        $view = new ModView([
+            'created_at' => Carbon::now()
+        ]);
         $view->mod_id = $mod->id;
         if (isset($user)) {
             $view->user_id = $user->id;

backend/app/Http/Controllers/SupporterController.php

@@ -8,10 +8,16 @@
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use App\Http\Resources\BaseResource;
-use App\Models\Subscription;
+use App\Models\SupporterPackage;
+use App\Models\SupporterSubscription;
+use App\Models\SupporterTransaction;
+use App\Models\User;
 use App\Services\APIService;
-use Illuminate\Http\Response;
 
+const PAYMENT_STATUS = [
+    1 => 'complete',
+    2 => 'refunded'
+];
 /**
  * @group Supporters
  */
@@ -103,14 +109,122 @@ public function destroy(Supporter $supporter)
         $supporter->delete();
     }
 
-    /**
-     * Checks nitro to update the subscription data
-     * 
-     * @authenticated
-     * 
-     * @hideFromApiDocumentation
-     */
-    public function nitroCheck() {
-        return APIService::nitroCheck($this->user());
-    }
+    // public function getTebexProject() {
+    //     return Headless::setProject(env('TEBEX_PUBLIC_KEY'));
+    // }
+
+    // public function createTebexBasketWithPackage(Request $request) {
+    //     $val = $request->validate([
+    //         'supporter_package_id' => "int|required|exists:supporter_packages,id"
+    //     ]);
+
+    //     Checkout::setApiKeys(env('TEBEX_PROJECT_ID'), env('TEBEX_PRIVATE_KEY'));
+
+    //     $userId = $this->userId();
+    //     $package = SupporterPackage::find($val['supporter_package_id']);
+
+    //     $project = $this->getTebexProject();
+    //     $basket = $project->createBasket(env('TEBEX_RETURN_URL'), env('TEBEX_RETURN_URL'));
+
+    //     $basket->addPackage($project->getPackage($package->package_id));
+    //     $basket = $basket->getBasket();
+    //     $ident = $basket->getIdent();
+
+    //     SupporterSubscription::create([ // Save the basket in the DB so we know who initiated this basket and who to give it to when webhook sends purchase complete
+    //         'user_id' => $userId,
+    //         'supporter_package_id' => $package->id,
+    //         'price' => $package->price,
+    //         'status' => 'waiting',
+    //         'provider' => 'tebex',
+    //         'provider_id' => 'tbx-r-'.$basket->getId()
+    //     ]);
+
+    //     return ['ident' => $ident];
+    // }
+
+    // public function tebexWebhook() {
+    //     // Issue: Tebex uses REMOTE_ADDR to ensure the IP is not tempered with
+    //     // This however isn't an issue on our end as we use a Proxy and replace that header with Caddy
+    //     if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+    //         $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
+    //     }
+
+    //     Webhooks::setSecretKey(env('TEBEX_WEBHOOK_SECRET_KEY'));
+
+    //     $json = file_get_contents('php://input');
+    //     $webhook = Webhook::parse($json);
+
+    //     // Respond to validation endpoint
+    //     if ($webhook->isType(\Tebex\Webhook\VALIDATION_WEBHOOK)) {
+    //         return ["id" => $webhook->getId()];
+    //     } else if ($webhook->isTypeOfPayment()) {
+    //         /**
+    //          * @var PaymentSubject
+    //         */
+    //         $subject = $webhook->getSubject();
+    //         $prod = $subject->getProducts()[0];
+    //         $ref = $subject->getRecurringPaymentReference();
+    //         $sub = SupporterSubscription::find($ref);
+
+    //         assert(isset($sub), "Reference {$ref} does not exist on site. Fix manually.");
+
+    //         $user = User::find($sub->user_id);
+    //         $expiryDate = Carbon::parse($prod->getExpiresAt());
+
+    //         $transId = $subject->getTransactionId();
+    //         $trans = SupporterTransaction::where('provider', 'tebex')->where('provider_id', $transId);
+    //         if (!isset($trans)) {
+    //             $trans = SupporterTransaction::create([
+    //                 'user_id' => $user->id,
+    //                 'supporter_package_id' => $sub->supporter_package_id,
+    //                 'supporter_subcription_id' => $sub->id,
+    //                 'price' => $sub->price,
+    //                 'status' => 'complete',
+    //                 'provider' => 'tebex',
+    //                 'provider_id' => $subject->getTransactionId()
+    //             ]);
+    //         }
+    //         $trans->update([
+    //             'status' => PAYMENT_STATUS[$subject->getStatus()] ?? 'failed'
+    //         ]);
+
+    //         switch ($webhook->getType()) {
+    //             case PAYMENT_COMPLETED:
+    //                 Supporter::create([
+    //                     'supporter_transaction_id' => $trans->id,
+    //                     'user_id' => $user->id,
+    //                     'expire_date' => Carbon::create($expiryDate),
+    //                     'expired' => false
+    //                 ]);
+    //                 break;
+    //             case PAYMENT_DECLINED:
+    //             case PAYMENT_REFUNDED:
+    //                 if (isset($trans->supporter)) {
+    //                     $trans->supporter->expired = true;
+    //                     $trans->supporter->save();
+    //                 }
+    //                 break;
+    //         }
+    //     } else if ($webhook->isTypeOfRecurringPayment()) {
+    //         /**
+    //          * @var RecurringPaymentSubject
+    //         */
+    //         $subject = $webhook->getSubject();
+    //         $ref = $subject->getReference();
+    //         $sub = SupporterSubscription::find($ref);
+
+    //         assert(isset($sub), "Reference {$ref} does not exist on site. Fix manually.");
+
+    //         switch ($webhook->getType()) {
+    //             case RECURRING_PAYMENT_STARTED:
+    //             case RECURRING_PAYMENT_RENEWED:
+    //             case RECURRING_PAYMENT_CANCELLATION_ABORTED:
+    //                 $sub->update(['status' => 'active', 'next_payment_at' => $subject->getNextPaymentAt()]);
+    //                 break;
+    //             case RECURRING_PAYMENT_CANCELLATION_REQUESTED:
+    //                 $sub->update(['status' => 'cancelled', 'next_payment_at' => null]);
+    //                 break;
+    //         }
+    //     }
+    // }
 }

backend/app/Http/Controllers/SupporterPackageController.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\FilteredRequest;
+use App\Http\Resources\BaseResource;
+use App\Models\SupporterPackage;
+use App\Services\APIService;
+use Illuminate\Http\Request;
+
+class SupporterPackageController extends Controller
+{
+    public function __construct() {
+        $this->authorizeResource(SupporterPackage::class, 'supporter_package');
+    }
+
+    /**
+     * Display a listing of the resource.
+     */
+    public function index(FilteredRequest $request)
+    {
+        $val = $request->val();
+        return BaseResource::collectionResponse(SupporterPackage::queryGet($val, fn($q) => $q->orderBy('order')));
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request)
+    {
+        $val = $request->validate([
+            'name' => 'string|min:1',
+            'order' => 'int',
+            'enabled' => 'boolean',
+            'package_id' => "int|required",
+            'price' => 'int|required',
+            'duration_type' => 'in:mo,y,w,d',
+            'duration_number' => 'int|min:1|max:120',
+        ]);
+
+        return SupporterPackage::create($val);
+    }
+
+    /**
+     * Display the specified resource.
+     */
+    public function show(SupporterPackage $supporterPackage)
+    {
+        return $supporterPackage;
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, SupporterPackage $supporterPackage)
+    {
+        $val = $request->validate([
+            'name' => 'string|min:1|nullable',
+            'order' => 'int|nullable',
+            'enabled' => 'boolean|nullable',
+            'package_id' => "int|nullable",
+            'price' => 'int|nullable',
+            'duration_type' => 'in:mo,y,w,d|nullable',
+            'duration_number' => 'int|min:1|max:120|nullable',
+        ]);
+
+        $supporterPackage->update($val);
+        return $supporterPackage;
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy(SupporterPackage $supporterPackage)
+    {
+        $supporterPackage->delete();
+    }
+}

backend/app/Http/Middleware/UserAuth.php

@@ -43,15 +43,6 @@ public function handle(Request $request, Closure $next)
 
             // Update the last online every 5 minutes or so.
             if (isset($user)) {
-                $signer = new \NitroPaySponsor\Signer(env('NITRO_TOKEN'));
-
-                $user->nitroToken = $signer->sign([
-                    'siteId' => '92', // required
-                    'userId' => $user->id, // required
-                ]);
-
-                // \Log::info((array)$signer->getUserSubscription($user?->id));
-
                 if (!isset($user->last_online) || $user->last_online->diffInSeconds($now) > 60) {
                     $user->update([
                         'last_online' => $now,

backend/app/Http/Requests/GetModsRequest.php

@@ -53,6 +53,8 @@ public function rules()
             'categories.*' => 'integer|min:1|nullable',
             'block_tags' => 'array|max:10',
             'block_tags.*' => 'integer|min:1|nullable',
+            'exclude_game_ids' => 'array|max:10',
+            'exclude_game_ids.*' => 'integer|min:1|nullable',
             'user_id' => 'integer|nullable|min:1',
             'collab' => 'boolean|nullable',
             'including_ignored' => 'boolean|nullable',

backend/app/Models/Supporter.php

@@ -51,4 +51,8 @@ public function user(): BelongsTo
     {
         return $this->belongsTo(User::class)->without('supporter');
     }
+
+    public function supporterTransaction() {
+        return $this->hasOne(SupporterTransaction::class);
+    }
 }

backend/app/Models/SupporterPackage.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SupporterPackage extends Model
+{
+    protected $guarded = [];
+
+    public function getMorphClass(): string {
+        return 'supporter_package';
+    }
+}

backend/app/Models/SupporterSubscription.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SupporterSubscription extends Model
+{
+    protected $guarded = [];
+
+    public function supporter() {
+        return $this->belongsTo(Supporter::class);
+    }
+
+    public function user() {
+        return $this->hasOne(User::class);
+    }
+}

backend/app/Models/SupporterTransaction.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SupporterTransaction extends Model
+{
+    protected $guarded = [];
+
+    public function supporter() {
+        return $this->belongsTo(Supporter::class);
+    }
+
+    public function user() {
+        return $this->hasOne(User::class);
+    }
+}