Update | Beta 3.0.2

gncdev · Aug 8, 2020 · 2d1e085 · 2d1e085
1 parent 5d7e025
commit 2d1e085
Show file tree

Hide file tree

Showing 8 changed files with 153 additions and 35 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -86,7 +86,7 @@ class Ourted extends Bot
     public function setBot()
     {
         // Ready Event Listener
-        $this->addListener(
+        $this->addListeners(
             "EventListener"
         );
         echo "Hello World\n";

diff --git a/example/Ourted.php b/example/Ourted.php
@@ -25,8 +25,8 @@ public function setBot()
         $func = $this->functions;
         $settings = $this->settings;
 
-        // Ready Event Listener
-        $this->addListener(
+        // Ready Event Listeners
+        $this->addListeners(
             "EventListener"
         );
 

diff --git a/src/Bot.php b/src/Bot.php
@@ -120,12 +120,14 @@ public function __construct($botToken, $botPrefix, $wssUrl = null)
     /**
      * Add a new dispatch handler
      *
-     * @param string $listener
+     * @param string ...$listener
      */
-    public function addListener($listener)
+    public function addListeners(...$listener)
     {
-        $this->listeners[] = $listener;
-        new $listener($this->getBot());
+        foreach ($listener as $item) {
+            $this->listeners[] = $item;
+            new $item($this->getBot());
+        }
     }
 
 

diff --git a/src/Model/EventListener/EventListener.php b/src/Model/EventListener/EventListener.php
@@ -29,6 +29,16 @@ abstract class EventListener
      */
     public $token;
 
+    private function generateRandomString($length = 10) {
+        $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        $charactersLength = strlen($characters);
+        $randomString = '';
+        for ($i = 0; $i < $length; $i++) {
+            $randomString .= $characters[rand(0, $charactersLength - 1)];
+        }
+        return $randomString;
+    }
+
     /**
      *
      * @var Bot $bot
@@ -38,53 +48,50 @@ public function __construct($bot)
         $this->bot = $bot;
         $this->token = $bot->getToken();
         $this->func = $bot->functions;
-        $bot->addDispatch('GUILD_CREATE','GUILD_CREATE', function ($json) {
+        $bot->addDispatch('GUILD_CREATE',$this->generateRandomString(), function ($json) {
             $this->onGuildJoin($json->d, $this->bot);
         });
-        $bot->addDispatch('GUILD_MEMBER_ADD','GUILD_MEMBER_ADD', function ($json) {
+        $bot->addDispatch('GUILD_MEMBER_ADD',$this->generateRandomString(), function ($json) {
             $this->onGuildMemberAdd($json->d, $this->bot);
         });
-        $bot->addDispatch('GUILD_MEMBER_UPDATE','GUILD_MEMBER_UPDATE', function ($json) {
+        $bot->addDispatch('GUILD_MEMBER_UPDATE',$this->generateRandomString(), function ($json) {
             $this->onGuildMemberUpdate($json->d, $this->bot);
         });
-        $bot->addDispatch('GUILD_MEMBER_DELETE','GUILD_MEMBER_DELETE', function ($json) {
+        $bot->addDispatch('GUILD_MEMBER_DELETE',$this->generateRandomString(), function ($json) {
             $this->onGuildMemberDelete($json->d, $this->bot);
         });
-        $bot->addDispatch('GUILD_UPDATE','GUILD_UPDATE', function ($json) {
+        $bot->addDispatch('GUILD_UPDATE',$this->generateRandomString(), function ($json) {
             $this->onGuildDelete($json->d, $this->bot);
         });
-        $bot->addDispatch('GUILD_DELETE','GUILD_DELETE', function ($json) {
+        $bot->addDispatch('GUILD_DELETE',$this->generateRandomString(), function ($json) {
             $this->onGuildUpdate($json->d, $this->bot);
         });
-        $bot->addDispatch('GUILD_ROLE_CREATE','GUILD_ROLE_CREATE', function ($json) {
+        $bot->addDispatch('GUILD_ROLE_CREATE',$this->generateRandomString(), function ($json) {
             $this->onGuildRoleCreate($json->d, $this->bot);
         });
-        $bot->addDispatch('GUILD_ROLE_UPDATE','GUILD_ROLE_UPDATE', function ($json) {
+        $bot->addDispatch('GUILD_ROLE_UPDATE',$this->generateRandomString(), function ($json) {
             $this->onGuildRoleUpdate($json->d, $this->bot);
         });
-        $bot->addDispatch('GUILD_ROLE_DELETE','GUILD_ROLE_DELETE', function ($json) {
+        $bot->addDispatch('GUILD_ROLE_DELETE',$this->generateRandomString(), function ($json) {
             $this->onGuildRoleDelete($json->d, $this->bot);
         });
-        $bot->addDispatch('MESSAGE_CREATE','MESSAGE_CREATEee', function ($json) {
+        $bot->addDispatch('MESSAGE_CREATE',$this->generateRandomString(), function ($json) {
             $this->onMessageCreate($json->d, $this->bot);
         });
-        $bot->addDispatch('MESSAGE_CREATE','COMMANDS', function ($json) {
-            $this->onCommand($json->d, $this->bot);
-        });
-        $bot->addDispatch('CHANNEL_CREATE','CHANNEL_CREATE', function ($json) {
+        $bot->addDispatch('CHANNEL_CREATE',$this->generateRandomString(), function ($json) {
             $this->onChannelCreate($json->d, $this->bot);
         });
-        $bot->addDispatch('CHANNEL_UPDATE','CHANNEL_UPDATE', function ($json) {
+        $bot->addDispatch('CHANNEL_UPDATE',$this->generateRandomString(), function ($json) {
             $this->onChannelUpdate($json->d, $this->bot);
         });
-        $bot->addDispatch('CHANNEL_DELETE','CHANNEL_DELETE', function ($json) {
+        $bot->addDispatch('CHANNEL_DELETE',$this->generateRandomString(), function ($json) {
             $this->onChannelDelete($json->d, $this->bot);
         });
-        $bot->addDispatch('CHANNEL_PINS_UPDATE','CHANNEL_PINS_UPDATE', function ($json) {
+        $bot->addDispatch('CHANNEL_PINS_UPDATE',$this->generateRandomString(), function ($json) {
             $this->onChannelPinsUpdate($json->d, $this->bot);
         });
 
-        $bot->addDispatch('READY','READY', function ($json) {
+        $bot->addDispatch('READY',$this->generateRandomString(), function ($json) {
             $this->onReady($json->d, $this->bot);
         });
     }
@@ -170,11 +177,6 @@ public function onMessageCreate($json, $bot)
 
     }
 
-    # Command
-    public function onCommand($json, $bot)
-    {
-
-    }
 
     # Bot
     public function onReady($json, $bot)

diff --git a/src/Model/Message/Embed.php b/src/Model/Message/Embed.php
@@ -101,5 +101,4 @@ function send_embed()
             "channels/{$this->embed['channel_id']}/messages",
             $headers, $field, "POST");
     }
-
 }
diff --git a/src/Utils/Functions.php b/src/Utils/Functions.php
@@ -1,5 +1,6 @@
 <?php
 
+
 namespace Ourted\Utils;
 
 use Ourted\Bot;
@@ -52,7 +53,7 @@ public function init_curl_with_header($url, $headers, $field, $tur = "POST")
     {
         $ch = curl_init();
 
-        curl_setopt($ch, CURLOPT_URL, "https://discord.com/api/v6/".$url);
+        curl_setopt($ch, CURLOPT_URL, "https://discord.com/api/v6/" . $url);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $tur);
         curl_setopt($ch, CURLOPT_POST, 1);
@@ -86,7 +87,7 @@ public function init_curl_with_header_print_r($url, $headers, $tur = "GET")
         $headers[] = 'X-RateLimit-Reset: 147017';
         $headers[] = 'X-RateLimit-Reset-After: 5';
         $headers[] = 'X-RateLimit-Bucket: abcd1234';
-        curl_setopt($ch, CURLOPT_URL, "https://discord.com/api/v6/".$url);
+        curl_setopt($ch, CURLOPT_URL, "https://discord.com/api/v6/" . $url);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $tur);
         curl_setopt($ch, CURLOPT_POST, 1);
@@ -167,7 +168,6 @@ public function deleteMessage($message)
     }
 
 
-
     /**
      * Get guilds
      *
@@ -185,7 +185,8 @@ public function get_guilds_properties()
             $headers, "", "GET");
     }
 
-    public function get_channel($channel_id){
+    public function get_channel($channel_id)
+    {
         return new \Ourted\Model\Channel\Channel($this->bot, $channel_id);
     }
 

diff --git a/src/Utils/Settings.php b/src/Utils/Settings.php
@@ -1,5 +1,6 @@
 <?php
 
+
 namespace Ourted\Utils;
 
 use Ourted\Bot;
-Original file line number
+Diff line change
@@ Expand Up / @@ -101,5 +101,4 @@ function send_embed() @@
                 "channels/{$this->embed['channel_id']}/messages",
                 $headers, $field, "POST");
         }
     }