Implemented requested changes

app/Http/Controllers/Settings/SubscriptionController.php

@@ -10,6 +10,7 @@
 use App\Models\Tier;
 use App\Services\SubscriptionService;
 use App\Services\SubscriptionUpgradeService;
+use App\Services\Users\EmailValidationService;
 use App\User;
 use Exception;
 use Illuminate\Http\Request;
@@ -22,14 +23,17 @@ class SubscriptionController extends Controller
 
     protected SubscriptionUpgradeService $subscriptionUpgrade;
 
+    protected EmailValidationService $emailValidation;
+
     /**
      * SubscriptionController constructor.
      */
-    public function __construct(SubscriptionService $service, SubscriptionUpgradeService $subscriptionUpgradeService)
+    public function __construct(SubscriptionService $service, SubscriptionUpgradeService $subscriptionUpgradeService, EmailValidationService $validationService)
     {
         $this->middleware(['auth', 'identity', 'subscriptions']);
         $this->subscription = $service;
         $this->subscriptionUpgrade = $subscriptionUpgradeService;
+        $this->emailValidation = $validationService;
     }
 
     public function index()
@@ -93,6 +97,8 @@ public function change(Request $request, Tier $tier)
         }
         $upgrade = $this->subscriptionUpgrade->user($user)->tier($tier)->upgradePrice($period);
         $currency = $user->currencySymbol();
+
+        $this->emailValidation->user($user)->requiresEmail();
 
         return view('settings.subscription.change', compact(
             'tier',

app/Models/Relations/UserRelations.php

@@ -21,6 +21,7 @@
 use App\Models\UserValidation;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 
 /**
  * Trait UserRelations
@@ -201,7 +202,7 @@ public function upvotes(): HasMany
         return $this->hasMany(FeatureVote::class);
     }
 
-    public function userValidation(): HasMany
+    public function userValidation(): HasOne
     {
         return $this->hasOne(UserValidation::class, 'user_id', 'id');
     }

app/Models/Scopes/UserScope.php

@@ -2,18 +2,11 @@
 
 namespace App\Models\Scopes;
 
-use Illuminate\Database\Eloquent\Builder;
-
 /**
  * Trait UserScope
  * @package App\Models\Scopes
  */
 trait UserScope
 {
-    /**
-     */
-    public function scopeValid(Builder $query, bool $valid = true): Builder
-    {
-        return $query->where(['is_valid' => $valid]);
-    }
+
 }

app/Models/UserValidation.php

@@ -5,10 +5,12 @@
 use App\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Prunable;
+use Illuminate\Database\Eloquent\Builder;
 
 /**
  * @property int $user_id
  * @property bool $is_valid
+ * @property User $user
  */
 class UserValidation extends Model
 {
@@ -20,6 +22,9 @@ class UserValidation extends Model
         'token'
     ];
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
     public function user()
     {
         return $this->belongsTo(User::class);
@@ -33,4 +38,11 @@ public function prunable()
     {
         return static::where('is_valid', false)->where('created_at', '<=', now()->subDays(1));
     }
+
+    /**
+     */
+    public function scopeValid(Builder $query, bool $valid = true): Builder
+    {
+        return $query->where(['is_valid' => $valid]);
+    }
 }

app/User.php

@@ -426,15 +426,15 @@ public function hasUnread(): bool
     public function isFrauding(): bool
     {
         // Fraud detection can be turned on or off
-        if (!config('subscription.fraud_detection')) {
+        if (config('subscription.fraud_detection')) {
             return false;
         }
         // Someone with a provider (twitter, fb) login is always considered safe
         if (!empty($this->provider)) {
             return false;
         }
 
-        $validation = $this->userValidation->valid()->first();
+        $validation = $this->userValidation()->valid()->first();
         if ($validation) {
             return false;
         }

lang/en/emails/subscriptions/validation.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'title'     => 'Kanka account email validation.',
+];

resources/views/settings/subscription/change.blade.php

@@ -6,11 +6,6 @@
 
     <x-grid type="1/1">
     @if (!$user->isFrauding())
-        @inject('emailService', 'App\Services\Users\EmailValidationService')
-        @php
-            /** @var \App\Services\Users\EmailValidationService $emailService */
-            $emailService->user($user)->requiresEmail();
-        @endphp
         <x-alert type="warning">
             {{ __('emails/validation.modal') }}
         </x-alert></div><?php return; ?>