Merge pull request #384 from Commandserver/dev

added application icon getters

include/dpp/application.h

@@ -119,6 +119,22 @@ class DPP_EXPORT application : public managed, public json_interface<application
 	 * @return A reference to self
 	 */
 	application& fill_from_json(nlohmann::json* j);
+
+	/**
+	 * @brief Get the applications cover image url if they have one, otherwise returns an empty string
+	 *
+	 * @param size The size of the cover image in pixels. It can be any power of two between 16 and 4096. if not specified, the default sized cover image is returned.
+	 * @return std::string cover image url or empty string
+	 */
+	std::string get_cover_image_url(uint16_t size = 0) const;
+
+	/**
+	 * @brief Get the applications icon url if they have one, otherwise returns an empty string
+	 *
+	 * @param size The size of the icon in pixels. It can be any power of two between 16 and 4096. if not specified, the default sized icon is returned.
+	 * @return std::string icon url or empty string
+	 */
+	std::string get_icon_url(uint16_t size = 0) const;
 };
 
 /** A group of applications.

src/dpp/application.cpp

@@ -23,6 +23,7 @@
 #include <dpp/snowflake.h>
 #include <dpp/managed.h>
 #include <dpp/nlohmann/json.hpp>
+#include <dpp/fmt-minimal.h>
 
 namespace dpp {
 
@@ -62,7 +63,7 @@ application& application::fill_from_json(nlohmann::json* j) {
 		json& t = (*j)["team"];
 		std::string i = string_not_null(&t, "icon");
 		if (!i.empty()) {
-			icon = i;
+			this->team.icon = i;
 		}
 		set_snowflake_not_null(&t, "id", this->team.id);
 		set_string_not_null(&t, "name", this->team.name);
@@ -79,5 +80,31 @@ application& application::fill_from_json(nlohmann::json* j) {
 	return *this;
 }
 
+std::string application::get_cover_image_url(uint16_t size) const {
+	if (!this->cover_image.to_string().empty()) {
+		return fmt::format("{}/app-icons/{}/{}.png{}",
+						   utility::cdn_host,
+						   this->id,
+						   this->cover_image.to_string(),
+						   utility::avatar_size(size)
+		);
+	} else {
+		return std::string();
+	}
+}
+
+std::string application::get_icon_url(uint16_t size) const {
+	if (!this->icon.to_string().empty()) {
+		return fmt::format("{}/app-icons/{}/{}.png{}",
+						   utility::cdn_host,
+						   this->id,
+						   this->icon.to_string(),
+						   utility::avatar_size(size)
+		);
+	} else {
+		return std::string();
+	}
+}
+
 };