Merge pull request #166 from untrobotics/URW-205-discord-attachments-fix

URW-205 Fix Discord bot not sending multiple attachments

Author: Kenneth-W-Chen

api/discord/bot.php

@@ -5,7 +5,7 @@ class DiscordBot {
 
 	protected static function send_api_request($URI, $method = 'GET', $content_type = "application/json", $data = null, $files = null) {
 		$ch = curl_init();
-		
+
 		$headers = array();
 		$headers[] = 'Authorization: Bot ' . static::AUTH_TOKEN;
 		$headers[] = 'Content-Type: ' . $content_type; //multipart/form-data';
@@ -41,18 +41,18 @@ protected static function send_api_request($URI, $method = 'GET', $content_type
 		if (curl_errno($ch)) {
 			throw new DiscordBotException("Error occurred when making API request: '" . curl_error($ch) . "'" . "(" . curl_errno($ch) . ")");
 		}
-		
+
 		$status_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-		
+
 		curl_close($ch);
-		
+
 		$response = new stdClass();
 		$response->result = json_decode($result);
 		$response->status_code = $status_code;
 
 		return $response;
 	}
-	
+
 	public static function send_message($message, $channel_id, $attachments = null) {
 	    if (is_string($message)) {
             $data = new stdClass(); // can't be bothered right now to make a class
@@ -63,13 +63,14 @@ public static function send_message($message, $channel_id, $attachments = null)
 
 		// Add files to array
 		$files = array();
+        $tmp_files = [];    // needed if more than 1 attachment to prevent gc for deleting the temp files
 		if ($attachments) {
 			foreach ($attachments as $k => $attachment) {
 				if(isset($attachment['bin']))	// Function caller passed the raw data to the arg
 				{
 					// Since we have the data, we need to create a tmpfile to store that data for the CURLFile
-					$file = tmpfile();
-					$path = stream_get_meta_data($file)['uri'];
+					$tmp_files[$k] = tmpfile();
+					$path = stream_get_meta_data($tmp_files[$k])['uri'];
 					file_put_contents($path,$attachment['bin']);
 					$file_type = $attachment['type'];
 					$file_mime = ext2mime($file_type);
@@ -83,8 +84,8 @@ public static function send_message($message, $channel_id, $attachments = null)
 				else	// We assume the attachment is an online file that we need to download
 				{	// sebastian only insane people put curly braces on the same line
 					//$content = file_get_contents($attachment['url']);
-					$file = tmpfile();
-					$path = stream_get_meta_data($file)['uri'];
+                    $tmp_files[$k] = tmpfile();
+                    $path = stream_get_meta_data($tmp_files[$k])['uri'];
 					$ch = curl_init();
 					curl_setopt($ch, CURLOPT_URL, $attachment['url']);
 					curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
@@ -108,18 +109,18 @@ public static function send_message($message, $channel_id, $attachments = null)
 			}
 		}
 		//error_log(var_export($files, true));
-		
+
 		return static::send_api_request("/channels/{$channel_id}/messages", 'POST', 'multipart/form-data', $data, $files);
 	}
-	
+
 	public static function add_user_role($guild_id, $user_id, $role_id) {
 		return static::send_api_request("/guilds/{$guild_id}/members/{$user_id}/roles/{$role_id}", 'PUT');
 	}
-	
+
 	public static function remove_user_role($guild_id, $user_id, $role_id) {
 		return static::send_api_request("/guilds/{$guild_id}/members/{$user_id}/roles/{$role_id}", 'DELETE');
 	}
-	
+
 	public static function type($channel_id) {
 		return static::send_api_request("/channels/{$channel_id}/typing", 'POST');
 	}
@@ -133,7 +134,7 @@ public static function hasHitRateLimit($result) {
         return $result->status_code == 429;
     }
 }
-								
+
 class DiscordBotException extends Exception {
 	public function __construct($message, $code = 0, Exception $previous = null) {
 		parent::__construct($message, $code, $previous);