Code Clean.

Author: vekien

.env.dist

@@ -5,7 +5,7 @@
 BOT_NAME=
 BOT_MENTION=
 BOT_TOKEN=
-BOT_USAGE_KEY=
+BOT_KEY=
 
 #
 # Ser Aymeric

config/services.yaml

@@ -23,3 +23,7 @@ services:
     App\Controller\:
         resource: '../src/Controller'
         tags: ['controller.service_arguments']
+
+    App\EventListener\RequestListener:
+        tags:
+            - { name: kernel.event_listener, event: kernel.request, method: onKernelRequest }

src/Command/MogCommand.php

@@ -10,11 +10,11 @@
 class RunCommand extends Command
 {
     /** @var MogNet */
-    private $mogNet;
+    private $mog;
 
-    public function __construct(MogNet $mogNet)
+    public function __construct(MogNet $mog)
     {
-        $this->mogNet = $mogNet;
+        $this->mog = $mog;
         parent::__construct();
     }
 
@@ -28,6 +28,6 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $output->writeln('<info>Mog Discord Bot</info>');
-        $this->mogNet->run();
+        $this->mog->run();
     }
 }

src/Command/RandomRole.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Controller;
+
+trait ControllerTrait
+{
+    /**
+     * Get a discord room from the content in the request
+     */
+    public function getChannelFromRequestContent(\stdClass $content)
+    {
+        $channel = $content->channel ?? null;
+
+        if ($channel === null) {
+            throw new \Exception('A channel must be provided in the request.');
+        }
+
+        return $channel;
+    }
+}

src/Command/RunCommand.php

@@ -2,59 +2,43 @@
 
 namespace App\Controller;
 
-use App\Service\Directory\Rooms;
+use App\Service\Api\Response;
 use App\Service\MogNet\Messages\Text;
-use App\Service\MogNet\MogRest;
+use App\Service\MogRest\MogRest;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 
 class MessageController extends AbstractController
 {
+    use ControllerTrait;
+
     /** @var MogRest */
     private $mog;
 
     public function __construct(MogRest $mog)
     {
         $this->mog = $mog;
     }
-    
-    /**
-     * @Route("/")
-     */
-    public function home()
-    {
-        return $this->json('Mog, The XIVAPI.com Discord Bot');
-    }
-    
+
     /**
      * @Route("/say")
      */
-    public function post(Request $request)
+    public function say(Request $request)
     {
-        if ($request->get('key') != getenv('BOT_USAGE_KEY')) {
-            throw new NotFoundHttpException();
-        }
-
-        $request = \GuzzleHttp\json_decode($request->getContent());
+        $content = json_decode($request->getContent());
 
-        if (!isset($request->message)) {
-            throw new NotFoundHttpException();
-        }
-
-        $message = trim($request->message);
-
-        if (empty($message)) {
-            return $this->json([ false, 'No message provided' ]);
-        }
+        // grab the discord channel from the request
+        $channel = $this->getChannelFromRequestContent($content);
 
         // grab feedback json
-        $message = new Text($message);
-        $room    = isset($request->room) ? Rooms::get($request->room) : Rooms::ADMIN_MOG;
+        $message = new Text($content->message ?? false);
 
         // post it to the chat
-        $this->mog->message($room, $message);
-        return $this->json([ true, 'Message sent successfully' ]);
+        $this->mog->sendMessage($channel, $message);
+
+        return $this->json(
+            (new Response(true, 'Message Sent'))->toArray()
+        );
     }
 }

src/Command/SerAymericCommand.php

@@ -2,9 +2,8 @@
 
 namespace App\Controller;
 
-use App\Service\MogNet\MogRest;
+use App\Service\MogRest\MogRest;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 
 class RoleController extends AbstractController
@@ -18,48 +17,4 @@ public function __construct(MogRest $mog)
     {
         $this->mog = $mog;
     }
-    /**
-     * @Route("/role/ArcaneDisgea")
-     */
-    public function post(Request $request)
-    {
-        return $this->json([
-            [
-                [
-                    [
-                        [
-                            [
-                                [
-                                    [
-                                        ['kill joy']
-                                    ]
-                                ]
-                            ]
-                        ]
-                    ]
-                ]
-            ]
-        ]);
-
-        $name = strip_tags(trim(substr($request->get('name'), 0, 64)));
-
-        if (strtolower($name) == 'example') {
-            return $this->json(0);
-        }
-
-        $this->mog->client()->guild->modifyGuildRole([
-            'guild.id'    => 474518001173921794,
-            'role.id'     => 516086224738451466,
-            'name'        => $name,
-            'mentionable' => true,
-            'hoist'       => true,
-        ]);
-
-        $this->mog->client()->channel->createMessage([
-            'channel.id'  => 474519195963490305,
-            'content'     => '<@&516086224738451466> Your role was set by some randomer on the internet to: '. $name,
-        ]);
-
-        return $this->json(1);
-    }
 }

src/Controller/ControllerTrait.php

@@ -2,35 +2,33 @@
 
 namespace App\Controller;
 
+use App\Service\Api\Response;
+use App\Service\SerAymeric\SerAymeric;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 
 class SerAymericController extends AbstractController
 {
+    /** @var SerAymeric */
+    private $serAymeric;
+
+    public function __construct(SerAymeric $serAymeric)
+    {
+        $this->serAymeric = $serAymeric;
+    }
+
     /**
-     * @Route("/say")
+     * @Route("/ser-aymeric/say")
      */
     public function post(Request $request)
     {
-        if ($request->get('key') != getenv('BOT_USAGE_KEY')) {
-            throw new NotFoundHttpException();
-        }
-
-        $request = \GuzzleHttp\json_decode($request->getContent());
-
-        if (!isset($request->message)) {
-            throw new NotFoundHttpException();
-        }
-
-        $message = trim($request->message);
-
-        if (empty($message)) {
-            return $this->json([ false, 'No message provided' ]);
-        }
-
+        $content = json_decode($request->getContent());
 
+        $this->serAymeric->sendDirectMessage(42667995159330816, $content->message);
 
+        return $this->json(
+            (new Response(true, 'Message Sent'))->toArray()
+        );
     }
 }