Merge branch 'dev' into 250824_Improve-compatibility

brainboxdotcc · Sep 1, 2024 · ec9f59f · ec9f59f
2 parents e7a895c + 45a4ae6
commit ec9f59f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/dpp/guild.cpp b/src/dpp/guild.cpp
@@ -217,7 +217,7 @@ void from_json(const nlohmann::json& j, guild_member& gm) {
 std::string guild_member::get_avatar_url(uint16_t size, const image_type format, bool prefer_animated) const {
 	if (this->guild_id && this->user_id && !this->avatar.to_string().empty()) {
 		return utility::cdn_endpoint_url_hash({ i_jpg, i_png, i_webp, i_gif },
-			"guilds/" + std::to_string(this->guild_id) + "/" + std::to_string(this->user_id), this->avatar.to_string(),
+			"guilds/" + std::to_string(this->guild_id) + "/users/" + std::to_string(this->user_id) + "/avatars", this->avatar.to_string(),
 			format, size, prefer_animated, has_animated_guild_avatar());
 	} else {
 		return std::string();

diff --git a/src/dpp/httpsclient.cpp b/src/dpp/httpsclient.cpp
@@ -284,7 +284,7 @@ bool https_client::handle_buffer(std::string &buffer)
 			case HTTPS_CONTENT:
 				body += buffer;
 				buffer.clear();
-				if (body.length() >= content_length) {
+				if (content_length == ULLONG_MAX || body.length() >= content_length) {
 					state = HTTPS_DONE;
 					this->close();
 					return false;