Improve achievements

app/Core/Subscribers/AchieveSubscriber.php → app/Domains/Bot/AchieveSubscriber.php

@@ -8,23 +8,23 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace Core\Subscribers;
+namespace Domains\Bot;
 
-use Domains\Room;
 use Domains\Achieve;
-use Illuminate\Support\Collection;
-use Illuminate\Contracts\Support\Jsonable;
+use Domains\Bot\Achievements\DocsAchieve;
+use Domains\Bot\Achievements\Karma100Achieve;
+use Domains\Bot\Achievements\Karma10Achieve;
+use Domains\Bot\Achievements\Karma500Achieve;
+use Domains\Bot\Achievements\Karma50Achieve;
+use Domains\Bot\Achievements\Thanks100Achieve;
+use Domains\Bot\Achievements\Thanks10Karma0Achieve;
+use Domains\Bot\Achievements\Thanks20Achieve;
+use Domains\Bot\Achievements\Thanks50Achieve;
+use Domains\Room;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Contracts\Support\Jsonable;
+use Illuminate\Support\Collection;
 use Interfaces\Gitter\Subscriber\SubscriberInterface;
-use Core\Subscribers\Achievements\Karma10Achieve;
-use Core\Subscribers\Achievements\Karma50Achieve;
-use Core\Subscribers\Achievements\Karma100Achieve;
-use Core\Subscribers\Achievements\Karma500Achieve;
-use Core\Subscribers\Achievements\Thanks20Achieve;
-use Core\Subscribers\Achievements\Thanks50Achieve;
-use Core\Subscribers\Achievements\Thanks100Achieve;
-use Core\Subscribers\Achievements\Thanks10Karma0Achieve;
-use Core\Subscribers\Achievements\DocsAchieve;
 
 /**
  * Class AchieveSubscriber
@@ -46,7 +46,7 @@ class AchieveSubscriber implements
         Thanks50Achieve::class,
         Thanks100Achieve::class,
         Thanks10Karma0Achieve::class,
-        DocsAchieve::class
+        DocsAchieve::class,
     ];
 
     /**
@@ -65,14 +65,6 @@ public function __construct()
         }
     }
 
-    /**
-     * @return array
-     */
-    public function getAchievementInstances(): array
-    {
-        return $this->instances;
-    }
-
     /**
      * Subscribe achievements
      */
@@ -93,11 +85,12 @@ public function handle()
     }
 
     /**
-     * @return Collection
+     * @param int $options
+     * @return string
      */
-    public function toCollection(): Collection
+    public function toJson($options = 0): string
     {
-        return new Collection($this->getAchievementInstances());
+        return json_encode($this->toArray(), $options);
     }
 
     /**
@@ -111,11 +104,18 @@ public function toArray(): array
     }
 
     /**
-     * @param int $options
-     * @return string
+     * @return Collection
      */
-    public function toJson($options = 0): string
+    public function toCollection(): Collection
     {
-        return json_encode($this->toArray(), $options);
+        return new Collection($this->getAchievementInstances());
+    }
+
+    /**
+     * @return array
+     */
+    public function getAchievementInstances(): array
+    {
+        return $this->instances;
     }
-}
+}

app/Core/Subscribers/Achievements/DocsAchieve.php → app/Domains/Bot/Achievements/DocsAchieve.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace Core\Subscribers\Achievements;
+namespace Domains\Bot\Achievements;
 
 use Domains\Karma;
 use Interfaces\Gitter\Achieve\AbstractAchieve;
@@ -40,4 +40,4 @@ public function handle()
     {
         // Only manual addition
     }
-}
+}

app/Core/Subscribers/Achievements/Karma100Achieve.php → app/Domains/Bot/Achievements/Karma100Achieve.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace Core\Subscribers\Achievements;
+namespace Domains\Bot\Achievements;
 
 use Domains\Karma;
 use Interfaces\Gitter\Achieve\AbstractAchieve;
@@ -46,4 +46,4 @@ public function handle()
             }
         });
     }
-}
+}

app/Core/Subscribers/Achievements/Karma10Achieve.php → app/Domains/Bot/Achievements/Karma10Achieve.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace Core\Subscribers\Achievements;
+namespace Domains\Bot\Achievements;
 
 use Domains\Karma;
 use Interfaces\Gitter\Achieve\AbstractAchieve;
@@ -47,4 +47,4 @@ public function handle()
             }
         });
     }
-}
+}

app/Core/Subscribers/Achievements/Karma500Achieve.php → app/Domains/Bot/Achievements/Karma500Achieve.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace Core\Subscribers\Achievements;
+namespace Domains\Bot\Achievements;
 
 use Domains\Karma;
 use Interfaces\Gitter\Achieve\AbstractAchieve;
@@ -46,4 +46,4 @@ public function handle()
             }
         });
     }
-}
+}

app/Core/Subscribers/Achievements/Karma50Achieve.php → app/Domains/Bot/Achievements/Karma50Achieve.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace Core\Subscribers\Achievements;
+namespace Domains\Bot\Achievements;
 
 use Domains\Karma;
 use Interfaces\Gitter\Achieve\AbstractAchieve;
@@ -46,4 +46,4 @@ public function handle()
             }
         });
     }
-}
+}

app/Core/Subscribers/Achievements/Thanks100Achieve.php → app/Domains/Bot/Achievements/Thanks100Achieve.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace Core\Subscribers\Achievements;
+namespace Domains\Bot\Achievements;
 
 use Domains\Karma;
 use Interfaces\Gitter\Achieve\AbstractAchieve;
@@ -46,4 +46,4 @@ public function handle()
             }
         });
     }
-}
+}

app/Core/Subscribers/Achievements/Thanks10Karma0Achieve.php → app/Domains/Bot/Achievements/Thanks10Karma0Achieve.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace Core\Subscribers\Achievements;
+namespace Domains\Bot\Achievements;
 
 use Domains\Karma;
 use Interfaces\Gitter\Achieve\AbstractAchieve;

app/Core/Subscribers/Achievements/Thanks20Achieve.php → app/Domains/Bot/Achievements/Thanks20Achieve.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace Core\Subscribers\Achievements;
+namespace Domains\Bot\Achievements;
 
 use Domains\Karma;
 use Interfaces\Gitter\Achieve\AbstractAchieve;
@@ -46,4 +46,4 @@ public function handle()
             }
         });
     }
-}
+}

app/Core/Subscribers/Achievements/Thanks50Achieve.php → app/Domains/Bot/Achievements/Thanks50Achieve.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace Core\Subscribers\Achievements;
+namespace Domains\Bot\Achievements;
 
 use Domains\Karma;
 use Interfaces\Gitter\Achieve\AbstractAchieve;
@@ -46,4 +46,4 @@ public function handle()
             }
         });
     }
-}
+}

app/Interfaces/Gitter/Achieve/AbstractAchieve.php

@@ -59,7 +59,7 @@ abstract class AbstractAchieve implements
      */
     public function __construct()
     {
-        $this->name = static::class;
+        $this->name = basename(static::class);
     }
 
     /**
@@ -109,4 +109,4 @@ public function toJson($options = 0): string
     {
         return json_encode($this->toArray(), $options);
     }
-}
+}

config/gitter.php

@@ -59,6 +59,6 @@
     // Subscribers
     'subscribers' => [
         // Подписывается на создание ачивки и отправляет сообщеньку в чат
-        Core\Subscribers\AchieveSubscriber::class,
+        Domains\Bot\AchieveSubscriber::class,
     ],
 ];