fixed avatar bug

3ddelano · Aug 5, 2021 · 220388e · 220388e
1 parent ababa74
commit 220388e
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ Changelog
 This is a high-level changelog for each released versions of the plugin.
 For a more detailed list of past and incoming changes, see the commit history.
 
+Master
+- Fixed bug where bot crashes if no avatar is set
+- If bot gets ratelimited, it now waits until the message is sent
+
 1.0.1
 ------
 - Bot will try to reconnect every 5s if initially there is no internet

diff --git a/README.md b/README.md
@@ -1,14 +1,14 @@
 Discord.gd
 =========================================
-###### (Godot Plugin - Coming Soon on the Asset Library)
+###### (Get it from Godot Asset Library - https://godotengine.org/asset-library/asset/1010)
 
 
 ### A Godot plugin to interact with the Discord Bot API. Make Discord Bots in Godot!
 
 > 100% GDScript
 
 <br>
-<img alt="Godot3" src="https://img.shields.io/badge/-Godot 3.x-478CBF?style=for-the-badge&logo=godotengine&logoWidth=20&logoColor=white" />
+<img alt="Godot3" src="https://img.shields.io/badge/-Godot 3.3.x-478CBF?style=for-the-badge&logo=godotengine&logoWidth=20&logoColor=white" />
 
 Features
 --------------
@@ -41,7 +41,7 @@ Getting Started
 1. After activating the plugin. There will be a new DiscordBot node added to Godot.
 Click on any node in the scene tree of your scene for example `MyBot`:Node2D and add the DiscordBot as a child.
 
-2. Connect the various signals (`bot_ready`, `guild_create`, `message_create`, `message_delete`, etc) of the DiscordBot to the parent node
+2. Connect the various signals (`bot_ready`, `guild_create`, `message_create`, `message_delete`, etc) of the DiscordBot to the parent node, either through the GUI or in the script using the connect() function.
 
 3. Attach a script to the parent node.
 Example script on `MyBot` node
@@ -56,15 +56,13 @@ func _ready():
 	
 func _on_DiscordBot_bot_ready(bot: DiscordBot):
 	print('Logged in as ' + bot.user.username + '#' + bot.user.discriminator)
-	print('Listening on ' + bot.channels.size() + ' channels and ' + bot.guilds.size() ' guilds.')
+	print('Listening on ' + str(bot.channels.size()) + ' channels and ' + str(bot.guilds.size()) ' guilds.')
 
 ```
 
-Documentation
+[Documentation](https://github.com/3ddelano/discord.gd/wiki)
 ----------
 
-Check the [Wiki](https://github.com/3ddelano/discord.gd/wiki) Tab
-
 
 Contributing
 -----------
@@ -82,4 +80,4 @@ Thanks for your support :)
 <a href="https://www.buymeacoffee.com/3ddelano" target="_blank"><img height="41" width="174" src="https://cdn.buymeacoffee.com/buttons/v2/default-red.png" alt="Buy Me A Coffee" width="150" ></a>
 
 ### Support Server
-Join the Discord Server: [3ddelano Cafe](https://discord.gg/FZY9TqW)
+For doubts / help / bugs / problems / suggestions do join: [3ddelano Cafe](https://discord.gg/FZY9TqW)
diff --git a/addons/discord_gd/README.md b/addons/discord_gd/README.md
@@ -1,14 +1,14 @@
 Discord.gd
 =========================================
-###### (Godot Plugin - Coming Soon on the Asset Library)
+###### (Get it from Godot Asset Library - https://godotengine.org/asset-library/asset/1010)
 
 
 ### A Godot plugin to interact with the Discord Bot API. Make Discord Bots in Godot!
 
 > 100% GDScript
 
 <br>
-<img alt="Godot3" src="https://img.shields.io/badge/-Godot 3.x-478CBF?style=for-the-badge&logo=godotengine&logoWidth=20&logoColor=white" />
+<img alt="Godot3" src="https://img.shields.io/badge/-Godot 3.3.x-478CBF?style=for-the-badge&logo=godotengine&logoWidth=20&logoColor=white" />
 
 Features
 --------------
@@ -41,7 +41,7 @@ Getting Started
 1. After activating the plugin. There will be a new DiscordBot node added to Godot.
 Click on any node in the scene tree of your scene for example `MyBot`:Node2D and add the DiscordBot as a child.
 
-2. Connect the various signals (`bot_ready`, `guild_create`, `message_create`, `message_delete`, etc) of the DiscordBot to the parent node
+2. Connect the various signals (`bot_ready`, `guild_create`, `message_create`, `message_delete`, etc) of the DiscordBot to the parent node, either through the GUI or in the script using the connect() function.
 
 3. Attach a script to the parent node.
 Example script on `MyBot` node
@@ -56,15 +56,13 @@ func _ready():
 	
 func _on_DiscordBot_bot_ready(bot: DiscordBot):
 	print('Logged in as ' + bot.user.username + '#' + bot.user.discriminator)
-	print('Listening on ' + bot.channels.size() + ' channels and ' + bot.guilds.size() ' guilds.')
+	print('Listening on ' + str(bot.channels.size()) + ' channels and ' + str(bot.guilds.size()) ' guilds.')
 
 ```
 
-Documentation
+[Documentation](https://github.com/3ddelano/discord.gd/wiki)
 ----------
 
-Check the [Wiki](https://github.com/3ddelano/discord.gd/wiki) Tab
-
 
 Contributing
 -----------
@@ -82,4 +80,4 @@ Thanks for your support :)
 <a href="https://www.buymeacoffee.com/3ddelano" target="_blank"><img height="41" width="174" src="https://cdn.buymeacoffee.com/buttons/v2/default-red.png" alt="Buy Me A Coffee" width="150" ></a>
 
 ### Support Server
-Join the Discord Server: [3ddelano Cafe](https://discord.gg/FZY9TqW)
+For doubts / help / bugs / problems / suggestions do join: [3ddelano Cafe](https://discord.gg/FZY9TqW)
diff --git a/addons/discord_gd/classes/user.gd b/addons/discord_gd/classes/user.gd
@@ -73,12 +73,13 @@ func _init(_client, user):
 	assert(user.has('id'), 'User must have an id')
 	assert(user.has('username'), 'User must have a username')
 	assert(user.has('discriminator'), 'User must have a discriminator')
-	assert(user.has('avatar'), 'User must have a avatar')
+
 
 	id = user.id
 	username = user.username
 	discriminator = user.discriminator
-	avatar = user.avatar
+	if user.avatar:
+		avatar = user.avatar
 
 	# Optional
 

diff --git a/addons/discord_gd/discord.gd b/addons/discord_gd/discord.gd
@@ -469,6 +469,12 @@ func _send_raw_request(slug: String, payload: Dictionary, method = HTTPClient.ME
 
 		assert(not response.has('code'), 'Error sending request. See output window')
 
+
+		if response.has('retry_after'):
+			# We got ratelimited
+			yield(get_tree().create_timer(int(response.retry_after)), 'timeout')
+			response = yield(_send_raw_request(slug, payload, method), 'completed')
+
 		return response
 	else:
 		assert(false, 'Unable to upload file. Got empty response from server')
@@ -501,6 +507,11 @@ func _send_request(slug: String, payload: Dictionary, method = HTTPClient.METHOD
 	if method != HTTPClient.METHOD_DELETE:
 		assert(not response.has('code'), 'Error sending request. See output window')
 
+	if response.has('retry_after'):
+		# We got ratelimited
+		yield(get_tree().create_timer(int(response.retry_after)), 'timeout')
+		response = yield(_send_request(slug, payload, method), 'completed')
+
 	return response
 
 func _get_dm_channel(channel_id: String) -> Dictionary: