Codestyle fixes.

src/Alerts/Base.php

@@ -65,18 +65,25 @@ abstract class Base
     protected $cacheKey = 'notifications';
 
     /**
-     * The required method to handle the Alert.
-     *
-     * @return mixed
+     * Base constructor.
      */
-    abstract protected function getData(): Collection;
+    public function __construct()
+    {
+
+        $this->data = $this->getData();
+        $this->name = $this->getName();
+        $this->type = $this->getType();
+
+        $this->notifier = $this->getNotifier();
+
+    }
 
     /**
-     * The type of notification.
+     * The required method to handle the Alert.
      *
-     * @return string
+     * @return mixed
      */
-    abstract protected function getType(): string;
+    abstract protected function getData(): Collection;
 
     /**
      * The name of the alert. This is also the name
@@ -87,26 +94,11 @@ abstract protected function getType(): string;
     abstract protected function getName(): string;
 
     /**
-     * Fields in a collection row that make the alert
-     * unique.
+     * The type of notification.
      *
-     * @return array
-     */
-    abstract protected function getUniqueFields(): array;
-
-    /**
-     * Base constructor.
+     * @return string
      */
-    public function __construct()
-    {
-
-        $this->data = $this->getData();
-        $this->name = $this->getName();
-        $this->type = $this->getType();
-
-        $this->notifier = $this->getNotifier();
-
-    }
+    abstract protected function getType(): string;
 
     /**
      * Return the full class of the notifier from the config.
@@ -154,6 +146,57 @@ public function handle()
 
     }
 
+    /**
+     * @param $data
+     *
+     * @return bool
+     */
+    public function isOldNotification($data)
+    {
+
+        $hash = $this->getDataHash($data);
+
+        if (cache($this->cacheKey . $hash))
+            return true;
+
+        // Check the database.
+        $in_db = NotificationHistory::whereHash($hash)
+            ->first();
+
+        // If its in the db, add it to the cache
+        if ($in_db) {
+
+            Cache::forever($this->cacheKey . $hash, true);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param $data
+     *
+     * @return string
+     */
+    public function getDataHash($data)
+    {
+
+        $hashable = collect($data)
+            ->only($this->getUniqueFields())
+            ->implode(',');
+
+        return md5($this->type . $this->name . $hashable);
+    }
+
+    /**
+     * Fields in a collection row that make the alert
+     * unique.
+     *
+     * @return array
+     */
+    abstract protected function getUniqueFields(): array;
+
     /**
      * @return \Illuminate\Support\Collection
      */
@@ -219,49 +262,6 @@ public function affiliationOk($group, $data)
 
     }
 
-    /**
-     * @param $data
-     *
-     * @return string
-     */
-    public function getDataHash($data)
-    {
-
-        $hashable = collect($data)
-            ->only($this->getUniqueFields())
-            ->implode(',');
-
-        return md5($this->type . $this->name . $hashable);
-    }
-
-    /**
-     * @param $data
-     *
-     * @return bool
-     */
-    public function isOldNotification($data)
-    {
-
-        $hash = $this->getDataHash($data);
-
-        if (cache($this->cacheKey . $hash))
-            return true;
-
-        // Check the database.
-        $in_db = NotificationHistory::whereHash($hash)
-            ->first();
-
-        // If its in the db, add it to the cache
-        if ($in_db) {
-
-            Cache::forever($this->cacheKey . $hash, true);
-
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * @param $data
      */

src/Alerts/Char/NewMailMessage.php

@@ -29,29 +29,29 @@ class NewMailMessage extends Base
 {
 
     /**
-     * The required method to handle the Alert.
+     * The field to use from the data when trying
+     * to infer an affiliation.
      *
-     * @return mixed
+     * @return string
      */
-    protected function getData(): Collection
+    public function getAffiliationField()
     {
 
-        return MailMessage::with('body')
-            ->where('sentDate', '>', carbon('now')->subMonth())
-            ->get();
-
+        return 'characterID';
     }
 
     /**
-     * The field to use from the data when trying
-     * to infer an affiliation.
+     * The required method to handle the Alert.
      *
-     * @return string
+     * @return mixed
      */
-    public function getAffiliationField()
+    protected function getData(): Collection
     {
 
-        return 'characterID';
+        return MailMessage::with('body')
+            ->where('sentDate', '>', carbon('now')->subMonth())
+            ->get();
+
     }
 
     /**

src/Alerts/Corp/MemberApiState.php

@@ -35,6 +35,18 @@ class MemberApiState extends Base
 
     use Corporation, Members;
 
+    /**
+     * The field to use from the data when trying
+     * to infer an affiliation.
+     *
+     * @return string
+     */
+    public function getAffiliationField()
+    {
+
+        return 'corporation_id';
+    }
+
     /**
      * The required method to handle the Alert.
      *
@@ -60,18 +72,6 @@ protected function getData(): Collection
         return $members;
     }
 
-    /**
-     * The field to use from the data when trying
-     * to infer an affiliation.
-     *
-     * @return string
-     */
-    public function getAffiliationField()
-    {
-
-        return 'corporation_id';
-    }
-
     /**
      * The type of notification.
      *

src/Alerts/Corp/MemberInactivity.php

@@ -34,28 +34,28 @@ class MemberInactivity extends Base
 {
 
     /**
-     * The required method to handle the Alert.
+     * The field to use form the data when trying
+     * to infer an affiliation.
      *
-     * @return mixed
+     * @return string
      */
-    protected function getData(): Collection
+    public function getAffiliationField()
     {
 
-        return MemberTracking::where(
-            'logoffDateTime', '<', DB::raw('date_sub(NOW(), INTERVAL 3 MONTH)'))
-            ->get();
+        return 'corporationID';
     }
 
     /**
-     * The field to use form the data when trying
-     * to infer an affiliation.
+     * The required method to handle the Alert.
      *
-     * @return string
+     * @return mixed
      */
-    public function getAffiliationField()
+    protected function getData(): Collection
     {
 
-        return 'corporationID';
+        return MemberTracking::where(
+            'logoffDateTime', '<', DB::raw('date_sub(NOW(), INTERVAL 3 MONTH)'))
+            ->get();
     }
 
     /**

src/Alerts/Corp/StarbaseFuel.php

@@ -31,6 +31,18 @@ class StarbaseFuel extends Base
 
     use Starbases;
 
+    /**
+     * The field to use from the data when trying
+     * to infer an affiliation.
+     *
+     * @return string
+     */
+    public function getAffiliationField()
+    {
+
+        return 'corporation_id';
+    }
+
     /**
      * The required method to handle the Alert.
      *
@@ -79,18 +91,6 @@ function ($starbase) use ($corporation_id, &$low_feul) {
 
     }
 
-    /**
-     * The field to use from the data when trying
-     * to infer an affiliation.
-     *
-     * @return string
-     */
-    public function getAffiliationField()
-    {
-
-        return 'corporation_id';
-    }
-
     /**
      * The type of notification.
      *

src/Alerts/Corp/StarbaseStateChange.php

@@ -36,6 +36,18 @@ class StarbaseStateChange extends Base
 
     use Starbases, EveRepository;
 
+    /**
+     * The field to use from the data when trying
+     * to infer an affiliation.
+     *
+     * @return string
+     */
+    public function getAffiliationField()
+    {
+
+        return 'corporation_id';
+    }
+
     /**
      * The required method to handle the Alert.
      *
@@ -75,18 +87,6 @@ function ($starbase) use ($corporation_id, &$starbases) {
         return $starbases;
     }
 
-    /**
-     * The field to use from the data when trying
-     * to infer an affiliation.
-     *
-     * @return string
-     */
-    public function getAffiliationField()
-    {
-
-        return 'corporation_id';
-    }
-
     /**
      * The type of notification.
      *