v3.0.3

Merge pull request #112 from DiscordBot-PMMP/development

Author: JaxkDev

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [3.0.3] - 2023-10-19
+
+### Fixed
+
+- Fix external client not closing socket correctly ([`029c621`](https://github.com/DiscordBot-PMMP/DiscordBot/commit/029c621b26fd919479e144784dca56efa980367f))
+
+### Removed
+
+- Removed hardcoded guild features list & assertions ([#111](https://github.com/DiscordBot-PMMP/DiscordBot/issues/111))
+
 ## [3.0.2] - 2023-09-04
 
 ### Changed
@@ -215,6 +225,7 @@ _**Breaking:** Plugin re-released as a central API._
 
 ❌ _This release was never published to public._
 
+[3.0.3]: https://github.com/DiscordBot-PMMP/DiscordBot/releases/tag/3.0.3
 [3.0.2]: https://github.com/DiscordBot-PMMP/DiscordBot/releases/tag/3.0.2
 [3.0.1]: https://github.com/DiscordBot-PMMP/DiscordBot/releases/tag/3.0.1
 [3.0.0]: https://github.com/DiscordBot-PMMP/DiscordBot/releases/tag/3.0.0

plugin.yml

@@ -1,5 +1,5 @@
 name: DiscordBot
-version: 3.0.2
+version: 3.0.3
 author: JaxkDev
 src-namespace-prefix: JaxkDev\DiscordBot
 main: JaxkDev\DiscordBot\Plugin\Main

src/Communication/Thread.php

@@ -48,10 +48,15 @@ public function run(): void{
         // Note, this does not affect outside thread.
         ini_set("date.timezone", "UTC");
 
-        if($this->config["type"] === "internal"){
-            new InternalClient($this);
-        }else{
-            new ExternalClient($this);
+        try{
+            if($this->config["type"] === "internal"){
+                new InternalClient($this);
+            }else{
+                new ExternalClient($this);
+            }
+        }catch(\Throwable){
+            $this->setStatus(ThreadStatus::STOPPED);
+            exit(1);
         }
     }
 

src/ExternalBot/Socket/Socket.php

@@ -70,6 +70,7 @@ public function open(): void{
     public function close(string $reason = "Unknown"): void{
         if(!$this->open){
             $this->logger->warning("Cannot close a non-open socket.");
+            return;
         }
         @socket_close($this->socket);
         $this->open = false;

src/Models/Guild/Guild.php

@@ -17,7 +17,6 @@
 use JaxkDev\DiscordBot\Models\Emoji;
 use JaxkDev\DiscordBot\Models\Sticker;
 use JaxkDev\DiscordBot\Plugin\Utils;
-use function in_array;
 
 /**
  * @implements BinarySerializable<Guild>
@@ -40,40 +39,6 @@ final class Guild implements BinarySerializable{
         "SUPPRESS_ROLE_SUBSCRIPTION_PURCHASE_NOTIFICATION_REPLIES" => (1 << 5)
     ];
 
-    /**
-     * @link https://discord.com/developers/docs/resources/guild#guild-object-guild-features
-     * @var string[]
-     */
-    public const FEATURES = [
-        "ANIMATED_BANNER",
-        "ANIMATED_ICON",
-        "APPLICATION_COMMAND_PERMISSIONS_V2",
-        "AUTO_MODERATION",
-        "BANNER",
-        "COMMUNITY",
-        "CREATOR_MONETIZABLE_PROVISIONAL",
-        "CREATOR_STORE_PAGE",
-        "DEVELOPER_SUPPORT_SERVER",
-        "DISCOVERABLE",
-        "FEATURABLE",
-        "INVITES_DISABLED",
-        "INVITE_SPLASH",
-        "MEMBER_VERIFICATION_GATE_ENABLED",
-        "MORE_STICKERS",
-        "NEWS",
-        "PARTNERED",
-        "PREVIEW_ENABLED",
-        "RAID_ALERTS_DISABLED",
-        "ROLE_ICONS",
-        "ROLE_SUBSCRIPTIONS_AVAILABLE_FOR_PURCHASE",
-        "ROLE_SUBSCRIPTIONS_ENABLED",
-        "TICKETED_EVENTS_ENABLED",
-        "VANITY_URL",
-        "VERIFIED",
-        "VIP_REGIONS",
-        "WELCOME_SCREEN_ENABLED"
-    ];
-
     /** Guild id */
     private string $id;
 
@@ -120,7 +85,7 @@ final class Guild implements BinarySerializable{
     private array $emojis;
 
     /**
-     * @link https://discord.com/developers/docs/resources/guild#guild-object-guild-features
+     * @link https://discord.com/developers/docs/resources/guild#guild-object-guild-features - NOTE, Does not contain all features.
      * @var string[]
      */
     private array $features;
@@ -176,7 +141,7 @@ final class Guild implements BinarySerializable{
     /** The NSFW level of the guild */
     private NsfwLevel $nsfw_level;
 
-    /*
+    /**
      * Custom guild stickers
      * @var Sticker[]
      */
@@ -395,11 +360,6 @@ public function getFeatures(): array{
 
     /** @param string[] $features */
     public function setFeatures(array $features): void{
-        foreach($features as $feature){
-            if(!in_array($feature, self::FEATURES, true)){
-                throw new \AssertionError("Feature '$feature' is invalid.");
-            }
-        }
         $this->features = $features;
     }