Update | Stable 1.0

Author: gncdev

.gitignore

@@ -1,3 +1,4 @@
 /vendor/
 /test/
 /docs/
+/atlas/

README.md

@@ -38,7 +38,7 @@ class Ourted extends Bot
         $dotenv = Dotenv::createImmutable(__DIR__);
         $dotenv->load();
         $this->token = $_ENV['BOT_TOKEN'];
-        parent::__construct($this->token, '!');
+        parent::__construct($this->token, '!'); /* 1: Bot Token, 2: Bot Prefix */
         $this->setBot();
     }
 
@@ -94,10 +94,10 @@ class Ourted extends Bot
     }
 }
 
-class EventListener extends \Ourted\Interfaces\EventListener
+class EventListener extends \Ourted\Model\EventListener\EventListener
 {
  # Guild
-    public function onGuildJoin($json, $bot)
+    public function onGuildCreate($json, $bot)
     {
 
     }
@@ -231,8 +231,8 @@ class Ourted extends Bot
 }
 class TestCommand extends Command{
 
-    public function execute($message, $bot){
-        $bot->channel->sendMessage("Command Used! Command: {$message->content}", $message->channel_id);
+    public function execute($message, $bot, $channel, $guild){
+        $bot->channel->sendMessage("Command Used! Command: {$message->content}", $channel);
     }
 }
 
@@ -243,6 +243,11 @@ Result:
 ---
 ![Example Command](assets/Command.PNG)
 
+
+addCommand() Parameters:
+1. Command Name
+2. a Closure to call command class
+
 ---
 
 Delete Message
@@ -290,6 +295,9 @@ new Ourted();
 ?>
 ````
 
+First wer get channel with getChannel() function. then delete messages with channel and message id.
+
+
 Delete Bulk Message
 ---
 
@@ -322,10 +330,7 @@ class Ourted extends Bot
 
         $ids = "";
         // Count Messages
-        foreach ($this->channel->getMessages($channel) as $key => $item) {
-            if($key == 99){
-                return;
-            }
+        foreach ($this->channel->getMessages($channel, 99) as $key => $item) {
             count($this->channel->getMessages($channel)) -1 == $key?
                 $ids .= "\"$item->id\"" : $ids.= "\"$item->id\",";
         }
@@ -341,6 +346,14 @@ new Ourted();
 ?>
 ````
 
+On **getMessages()** Function must be 2 param setted 1-100 between, integer.
+
+Paramaters:
+1. Ourted\Model\Channel\Channel.php Instance
+2. Integer 
+
+
+
 Add Role
 ---
 

composer.json

@@ -9,7 +9,8 @@
         "ext-json": "*",
         "react/react": "*",
         "react/event-loop": "*",
-      "ext-curl": "*"
+      "ext-curl": "*",
+      "ext-fileinfo": "*"
     },
     "license":      "GPL-3.0-or-later",
     "authors":      [
@@ -20,7 +21,8 @@
     ],
     "autoload": {
         "psr-4": {
-            "Ourted\\": "src/"
+            "Ourted\\": "src/",
+            "Atlas\\": "Atlas/src/"
         }
     }
 }

src/Bot.php

@@ -9,7 +9,8 @@
 use Ourted\Interfaces\Invite;
 use Ourted\Interfaces\Member;
 use Ourted\Interfaces\User;
-use Ourted\Model\Message\Embed;
+use Ourted\Interfaces\Webhook;
+use Ourted\Model\Channel\Embed;
 use Ourted\Utils\API;
 use Ourted\Utils\Settings;
 use Ratchet\Client\Connector;
@@ -20,6 +21,51 @@
 class Bot
 {
 
+
+    public $CREATE_INSTANT_INVITE = 0x00000001;
+    public $KICK_MEMBERS = 0x00000002;
+    public $BAN_MEMBERS = 0x00000004;
+    public $ADMINISTRATOR = 0x00000008;
+    public $MANAGE_CHANNELS = 0x00000010;
+    public $MANAGE_GUILD = 0x00000020;
+    public $ADD_REACTIONS = 0x00000040;
+    public $VIEW_AUDIT_LOG = 0x00000080;
+    public $PRIORITY_SPEAKER = 0x00000100;
+    public $STREAM = 0x00000200;
+    public $VIEW_CHANNEL = 0x00000400;
+    public $SEND_MESSAGES = 0x00000800;
+    public $SEND_TTS_MESSAGES = 0x00001000;
+    public $MANAGE_MESSAGES = 0x00002000;
+    public $EMBED_LINKS = 0x00004000;
+    public $ATTACH_FILES = 0x00008000;
+    public $READ_MESSAGE_HISTORY = 0x00010000;
+    public $MENTION_EVERYONE = 0x00020000;
+    public $USE_EXTERNAL_EMOJIS = 0x00040000;
+    public $VIEW_GUILD_INSIGHTS = 0x00080000;
+    public $CONNECT = 0x00100000;
+    public $SPEAK = 0x00200000;
+    public $MUTE_MEMBERS = 0x00400000;
+    public $DEAFEN_MEMBERS = 0x00800000;
+    public $MOVE_MEMBERS = 0x01000000;
+    public $USE_VAD = 0x02000000;
+    public $CHANGE_NICKNAME = 0x04000000;
+    public $MANAGE_NICKNAMES = 0x08000000;
+    public $MANAGE_ROLES = 0x10000000;
+    public $MANAGE_WEBHOOKS = 0x20000000;
+    public $MANAGE_EMOJIS = 0x40000000;
+
+    public $GUILD_TEXT = 0;
+    public $DM = 1;
+    public $GUILD_VOICE = 2;
+    public $GROUP_DM = 3;
+    public $GUILD_NEWS = 4;
+    public $GUILD_STORE = 5;
+
+    public $GAME_LISTEN = 2;
+    public $GAME_WATCHING = 1;
+    public $GAME_PLAYING = 0;
+
+
     /**
      * State
      * @var State
@@ -56,6 +102,12 @@ class Bot
     public $member;
     /** @var Invite */
     public $invite;
+    /** @var Webhook */
+    public $webhook;
+    /**
+     * @var mixed
+     */
+    public $session_id;
     /**
      * Default WSS URL (from the Discord API docs)
      * @var string
@@ -66,7 +118,6 @@ class Bot
      * @var WebSocket Instance
      */
     protected $connection;
-
     /**
      * @var bool
      */
@@ -112,6 +163,7 @@ public function __construct($botToken, $botPrefix, $wssUrl = null)
         $this->prefix = $botPrefix;
         $this->token = $botToken;
         $this->settings = new Settings($this);
+        $this->webhook = new Webhook($this);
         $this->channel = new Channel($this);
         $this->member = new Member($this);
         $this->invite = new Invite($this);
@@ -138,17 +190,26 @@ public function init()
 
             $conn->on('message', function (MessageInterface $msg) use ($conn, $state) {
                 $json = json_decode($msg);
+                if (isset($json->d->session_id)) {
+                    $this->session_id = $json->d->session_id;
+                }
                 $state->action($json, $this->loop);
             });
 
 
-            $conn->on('close', function ($code = null, $reason = null) {
+            $conn->on('close', function ($code = null, $reason = null) use ($conn) {
                 echo "\nConnection closed ({$code} - {$reason})\n";
-                if(!$this->reconnect) {
+                if (!$this->reconnect) {
                     die();
-                }else{
-                    $this->stop();
-                    $this->run();
+                } else {
+                    $conn->send(json_encode([
+                        "op" => 6,
+                        "d" => [
+                            "token" => $this->getBot()->token,
+                            "session_id" => $this->getBot()->session_id,
+                            "seq" => 1337
+                        ]
+                    ]));
                 }
             });
 
@@ -161,16 +222,27 @@ public function init()
         return null;
     }
 
+    public function getBot()
+    {
+        return $this;
+    }
+
     public function stop()
     {
         $this->loop->stop();
     }
 
+    public function run()
+    {
+
+        $this->loop->run();
+        echo "Connection Started!";
+    }
+
     /**
      * Add a new dispatch handler
      *
      * @param string $type Dispatch type
-     * @param string $callback_name Dispatch name
      * @param string|Callable $callback Callback to execute when dispatching action
      */
     public function addDispatch($type, $callback)
@@ -196,10 +268,17 @@ public function addCommand($command_name, $function)
         $function($this, $command_name);
     }
 
+    public function getImageData($image_path){
+        if(!file_exists($image_path) || str_ends_with($image_path, ("png" || "jpg" || "jpeg" | "PNG" || "JPG" || "JPEG"))) return "Fail";
+        $imageData = base64_encode(file_get_contents($image_path));
+        return 'data: '.mime_content_type($image_path).';base64,'.$imageData;
+    }
+
     /**
      * @param $title
-     * @param \Ourted\Model\Channel\Channel $channel
+     * @param Model\Channel\Channel $channel
      * @param string $description
+     * @return Embed
      */
     public function createEmbed($title, $channel, $description = "")
     {
@@ -219,13 +298,6 @@ public function addListeners(...$listener)
         }
     }
 
-    public function run()
-    {
-
-        $this->loop->run();
-        echo "Connection Started!";
-    }
-
     /**
      * Get Connection
      *
@@ -241,10 +313,5 @@ public function getToken()
         return $this->token;
     }
 
-    public function getBot()
-    {
-        return $this;
-    }
-
 
 }

src/Interfaces/Channel.php

@@ -3,7 +3,7 @@
 namespace Ourted\Interfaces;
 
 use Ourted\Bot;
-use Ourted\Model\Message\Message;
+use Ourted\Model\Channel\Message;
 
 class Channel{
 
@@ -67,12 +67,13 @@ public function deleteBulkMessage($message, $channel)
      *
      * @return bool|array
      * @var \Ourted\Model\Channel\Channel $channel Channel Instance
+     * @var int $limit
      */
 
-    public function getMessages($channel)
+    public function getMessages($channel, $limit = 50)
     {
         return json_decode($this->bot->api->init_curl_with_header(
-            "channels/{$channel->id}/messages",
+            "channels/{$channel->id}/messages?limit={$limit}",
             "", "GET"));
     }
 

src/Interfaces/Guild.php

@@ -4,7 +4,7 @@
 
 use Ourted\Bot;
 use Ourted\Model\Guild\Integration;
-use Ourted\Model\Role\Role;
+use Ourted\Model\Guild\Role;
 
 class Guild
 {
@@ -156,9 +156,34 @@ public function deleteRole($guild, $role_id)
      * @param bool
      * @return \Ourted\Model\Channel\Channel
      */
-    public function createChannel($guild, $channel_name, $type = 0, $topic = "", $bitrate = 0, $user_limit = 0, $rate_limit_per_user = 0, $position = 0, $parent_id = 0, $nsfw = false)
+    public function createChannel($guild, $channel_name, $type = 0, $topic = "", $bitrate = null, $user_limit = null, $rate_limit_per_user = null, $position = null, $parent_id = null)
     {
-        $result = json_decode($this->bot->api->init_curl_with_header("guilds/{$guild->id}/channels", "{\"name\": \"{$channel_name}\", \"type\": {$type}, \"topic\", \"{$topic}\", \"bitrate\":{$bitrate}, \"user_limit\": {$user_limit}, \"rate_limit_per_user\": {$rate_limit_per_user}, \"position\":{$position}, \"parent_id\": {$parent_id}, \"nsfw\": {$nsfw}}", "POST"));
+        $field = "";
+        $field .= "\"name\": \"$channel_name\"";
+        $field .= ",\"type\": $type";
+        $field .= ",\"topic\": \"{$topic}\"";
+        if (!is_null($bitrate)) {
+            if ($type == $this->bot->GUILD_VOICE) {
+                $field .= ",\"bitrate\":{$bitrate} ";
+            }
+        }
+        if (!is_null($user_limit)) {
+            if ($type == $this->bot->GUILD_VOICE) {
+                $field .= ",\"user_limit\": {$user_limit}";
+            }
+        }
+        if (!is_null($rate_limit_per_user)) {
+            $field .= ",\"rate_limit_per_user\": {$rate_limit_per_user}";
+        }
+        if (!is_null($position)) {
+            $field .= ",\"position\": {$position}";
+        }
+        if (!is_null($parent_id)) {
+            $field .= ",\"parent_id\": {$parent_id}";
+        }
+        $result = json_decode($this->bot->api->init_curl_with_header(
+            "guilds/{$guild->id}/channels", "
+            {{$field}}", "POST"));
         return new \Ourted\Model\Channel\Channel($this->bot, $result->id);
     }
 
@@ -167,6 +192,7 @@ public function createChannel($guild, $channel_name, $type = 0, $topic = "", $bi
      * @param \Ourted\Model\Guild\Guild $guild
      * @param \Ourted\Model\Channel\Channel
      * @param int
+     * @return \Ourted\Model\Channel\Channel
      */
     public function changeChannelPosition($guild, $channel, $position)
     {

src/Interfaces/Member.php

@@ -3,7 +3,7 @@
 namespace Ourted\Interfaces;
 
 use Ourted\Bot;
-use Ourted\Model\Role\Role;
+use Ourted\Model\Guild\Role;
 
 class Member
 {
@@ -47,6 +47,7 @@ public function setNickname($guild, $user, $nickname)
      * @param bool $mute
      * @param \Ourted\Model\User\User $user
      *
+     * @return mixed
      */
     public function setMute($guild, $user, $mute)
     {