From 2d1e085ca54a126c2021e4bb8b1f631804cbe8af Mon Sep 17 00:00:00 2001
From: GianC-Dev <gianegekck@gmail.com>
Date: Sat, 8 Aug 2020 15:30:51 +0300
Subject: [PATCH] Update | Beta 3.0.2

---
 .idea/workspace.xml                       | 113 ++++++++++++++++++++++
 README.md                                 |   2 +-
 example/Ourted.php                        |   4 +-
 src/Bot.php                               |  10 +-
 src/Model/EventListener/EventListener.php |  48 ++++-----
 src/Model/Message/Embed.php               |   1 -
 src/Utils/Functions.php                   |   9 +-
 src/Utils/Settings.php                    |   1 +
 8 files changed, 153 insertions(+), 35 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 69933c6..da9f65e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
         <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
         <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
       </path>
+<<<<<<< HEAD
       <path>
         <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
         <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
@@ -15,10 +16,13 @@
         <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
         <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
       </path>
+=======
+>>>>>>> 9f082f8... Update | Beta 3.0.2
     </expand>
     <select />
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="69a3b7fc-25d6-4c3a-bb18-c369aaea5bc2" name="Default Changelist" comment="">
       <change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/docs/index.rst" afterDir="false" />
@@ -44,12 +48,19 @@
       <change beforePath="$PROJECT_DIR$/src/Utils/Functions.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Utils/Functions.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/test/test.php" beforeDir="false" />
     </list>
+=======
+    <list default="true" id="69a3b7fc-25d6-4c3a-bb18-c369aaea5bc2" name="Default Changelist" comment="Update | Beta 3.0.2" />
+>>>>>>> 9f082f8... Update | Beta 3.0.2
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+<<<<<<< HEAD
   <component name="ComposerSettings" synchronizationState="SYNCHRONIZE">
+=======
+  <component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
+>>>>>>> 9f082f8... Update | Beta 3.0.2
     <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
     <execution />
   </component>
@@ -85,6 +96,10 @@
     </include_path>
   </component>
   <component name="ProjectId" id="1fmofNJRiFkG6iGtPIDOtZoo4aP" />
+<<<<<<< HEAD
+=======
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+>>>>>>> 9f082f8... Update | Beta 3.0.2
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
@@ -95,7 +110,11 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+<<<<<<< HEAD
     <property name="settings.editor.selected.configurable" value="web-ide.project.structure" />
+=======
+    <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
+>>>>>>> 9f082f8... Update | Beta 3.0.2
   </component>
   <component name="RunManager">
     <configuration name="test.php" type="PhpLocalRunConfigurationType" factoryName="PHP Console" temporary="true" path="$PROJECT_DIR$/test/test.php">
@@ -122,8 +141,50 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1596832730353</updated>
+<<<<<<< HEAD
       <workItem from="1596832731727" duration="6843000" />
     </task>
+=======
+      <workItem from="1596832731727" duration="8142000" />
+      <workItem from="1596880209106" duration="2444000" />
+    </task>
+    <task id="LOCAL-00001" summary="Update | Beta 3.0.0">
+      <created>1596878048570</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1596878048570</updated>
+    </task>
+    <task id="LOCAL-00002" summary="Update | Beta 3.0.1">
+      <created>1596880376311</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1596880376311</updated>
+    </task>
+    <task id="LOCAL-00003" summary="Update | Beta 3.0.1">
+      <created>1596880818695</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1596880818695</updated>
+    </task>
+    <task id="LOCAL-00004" summary="Update | Beta 3.0.2">
+      <created>1596887256318</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1596887256318</updated>
+    </task>
+    <task id="LOCAL-00005" summary="Update | Beta 3.0.2">
+      <created>1596887405691</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1596887405691</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
+>>>>>>> 9f082f8... Update | Beta 3.0.2
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -139,12 +200,23 @@
         </entry>
       </map>
     </option>
+<<<<<<< HEAD
+=======
+    <option name="oldMeFiltersMigrated" value="true" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="Update | Beta 3.0.0" />
+    <MESSAGE value="Update | Beta 3.0.1" />
+    <MESSAGE value="Update | Beta 3.0.2" />
+    <option name="LAST_COMMIT_MESSAGE" value="Update | Beta 3.0.2" />
+>>>>>>> 9f082f8... Update | Beta 3.0.2
   </component>
   <component name="WindowStateProjectService">
     <state x="484" y="95" key="#test.php" timestamp="1596833085378">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="484" y="95" key="#test.php/0.0.1536.824@0.0.1536.824" timestamp="1596833085378" />
+<<<<<<< HEAD
     <state width="746" height="143" key="GridCell.Tab.0.bottom" timestamp="1596877388386">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
@@ -161,14 +233,55 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="746" height="143" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1596877388386" />
+=======
+    <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1596879224435">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1596879224435" />
+    <state x="647" y="310" key="Github.ShareDialog" timestamp="1596880774134">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="647" y="310" key="Github.ShareDialog/0.0.1536.824@0.0.1536.824" timestamp="1596880774134" />
+    <state width="1493" height="143" key="GridCell.Tab.0.bottom" timestamp="1596887304370">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state width="1493" height="143" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1596887304370" />
+    <state width="1493" height="143" key="GridCell.Tab.0.center" timestamp="1596887304369">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state width="1493" height="143" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1596887304369" />
+    <state width="1493" height="143" key="GridCell.Tab.0.left" timestamp="1596887304368">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state width="1493" height="143" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1596887304368" />
+    <state width="1493" height="143" key="GridCell.Tab.0.right" timestamp="1596887304369">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state width="1493" height="143" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1596887304369" />
+>>>>>>> 9f082f8... Update | Beta 3.0.2
     <state x="604" y="336" key="NewPhpFileDialog" timestamp="1596875729112">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="604" y="336" key="NewPhpFileDialog/0.0.1536.824@0.0.1536.824" timestamp="1596875729112" />
+<<<<<<< HEAD
     <state x="277" y="57" key="SettingsEditor" timestamp="1596877488737">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="277" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1596877488737" />
+=======
+    <state x="277" y="57" key="SettingsEditor" timestamp="1596880794108">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="277" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1596880794108" />
+    <state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1596887280331">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1596887280331" />
+    <state x="499" y="201" key="git4idea.merge.GitPullDialog" timestamp="1596887597083">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="499" y="201" key="git4idea.merge.GitPullDialog/0.0.1536.824@0.0.1536.824" timestamp="1596887597083" />
+>>>>>>> 9f082f8... Update | Beta 3.0.2
     <state x="425" y="187" key="run.anything.popup" timestamp="1596876976112">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
diff --git a/README.md b/README.md
index 137ea80..62a1245 100644
--- 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
index 65a4ed6..f3e1c8f 100644
--- 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
index ee0a517..95a1c7f 100644
--- 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
index 25c1ad9..d0cfaae 100644
--- 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
index 2f66642..4e1cd0d 100644
--- 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");
     }
-
 }
\ No newline at end of file
diff --git a/src/Utils/Functions.php b/src/Utils/Functions.php
index b37622b..9b562d5 100644
--- 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
index 52402d1..0c294c1 100644
--- a/src/Utils/Settings.php
+++ b/src/Utils/Settings.php
@@ -1,5 +1,6 @@
 <?php
 
+
 namespace Ourted\Utils;
 
 use Ourted\Bot;