Fixt Problem wenn Rolle nicht zurück kommt

HanashiDev · Jul 3, 2024 · a27fa30 · a27fa30
1 parent e9607bf
commit a27fa30
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/files/lib/system/discord/type/ChannelMultiSelectDiscordType.class.php b/files/lib/system/discord/type/ChannelMultiSelectDiscordType.class.php
@@ -2,6 +2,7 @@
 
 namespace wcf\system\discord\type;
 
+use Throwable;
 use wcf\data\discord\bot\DiscordBotList;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
@@ -54,10 +55,17 @@ public function getFormElement($value, $channelTypes = [])
             ];
         }
 
+        $realValue = [];
+        try {
+            $realValue = \unserialize($value);
+        } catch (Throwable $e) {
+            // do nothing
+        }
+
         WCF::getTPL()->assign([
             'bots' => $channels,
             'optionName' => $this->optionName,
-            'value' => \unserialize($value),
+            'value' => $realValue,
             'channelTypes' => $channelTypes,
         ]);
 

diff --git a/files/lib/system/discord/type/ChannelSelectDiscordType.class.php b/files/lib/system/discord/type/ChannelSelectDiscordType.class.php
@@ -2,7 +2,7 @@
 
 namespace wcf\system\discord\type;
 
-use UnexpectedValueException;
+use Throwable;
 use wcf\data\discord\bot\DiscordBotList;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
@@ -59,7 +59,7 @@ public function getFormElement($value, $channelTypes = [])
         $realValue = [];
         try {
             $realValue = \unserialize($value);
-        } catch (UnexpectedValueException $e) {
+        } catch (Throwable $e) {
             // do nothing
         }
 

diff --git a/files/lib/system/discord/type/RoleMultiSelectDiscordType.class.php b/files/lib/system/discord/type/RoleMultiSelectDiscordType.class.php
@@ -2,6 +2,7 @@
 
 namespace wcf\system\discord\type;
 
+use Throwable;
 use wcf\data\discord\bot\DiscordBotList;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
@@ -27,11 +28,11 @@ public function getFormElement($value)
         $roles = [];
         $guildRoles = $this->getGuildRoles();
         foreach ($this->getDiscordBotList() as $discordBot) {
-            $rolesTmp = [];
-            if (isset($guildRoles[$discordBot->botID])) {
-                $rolesTmp = $guildRoles[$discordBot->botID];
+            if (!isset($guildRoles[$discordBot->botID]['body'])) {
+                continue;
             }
-            $rolesTmp = $rolesTmp['body'];
+
+            $rolesTmp = $guildRoles[$discordBot->botID]['body'];
             if (!\is_array($rolesTmp)) {
                 $rolesTmp = [];
             }
@@ -44,10 +45,17 @@ public function getFormElement($value)
             ];
         }
 
+        $realValue = [];
+        try {
+            $realValue = \unserialize($value);
+        } catch (Throwable $e) {
+            // do nothing
+        }
+
         WCF::getTPL()->assign([
             'bots' => $roles,
             'optionName' => $this->optionName,
-            'value' => \unserialize($value),
+            'value' => $realValue,
         ]);
 
         return WCF::getTPL()->fetch('discordRoleMultiSelect');

diff --git a/package.xml b/package.xml
@@ -6,16 +6,16 @@
 		<packagename language="de">Discord-API</packagename>
 		<packagedescription>API to cummincate with Discord.</packagedescription>
 		<packagedescription language="de">API um mit Discord zu kommunizieren.</packagedescription>
-		<version>2.5.1</version>
-		<date>2022-10-21</date>
+		<version>2.5.2</version>
+		<date>2024-07-03</date>
 		<license>https://creativecommons.org/publicdomain/zero/1.0/deed.en</license>
 	</packageinformation>
 	<authorinformation>
 		<author>Hanashi Development</author>
 		<authorurl>https://hanashi.dev/</authorurl>
 	</authorinformation>
 	<requiredpackages>
-		<requiredpackage minversion="5.5.0">com.woltlab.wcf</requiredpackage>
+		<requiredpackage minversion="5.5.22">com.woltlab.wcf</requiredpackage>
 	</requiredpackages>
 	<excludedpackages>
 		<excludedpackage version="6.0.0 Alpha 1">com.woltlab.wcf</excludedpackage>
@@ -30,7 +30,7 @@
 		<instruction type="option"/>
 		<instruction type="script">acp/install_dev.hanashi.wsc.discord-api.php</instruction>
 	</instructions>
-	<instructions type="update" fromversion="2.5.0">
+	<instructions type="update" fromversion="2.5.1">
 		<instruction type="file"/>
 	</instructions>
 </package>