breaking: rewrote GetChannelPins

Author: Jaskowicz1

include/dpp/message.h

@@ -2334,7 +2334,7 @@ template <typename T> struct message_snapshot {
 	std::vector<T> messages;
 };
 
-	/**
+/**
  * @brief Represents messages sent and received on Discord
  */
 struct DPP_EXPORT message : public managed, json_interface<message> {
@@ -2998,11 +2998,88 @@ struct DPP_EXPORT message : public managed, json_interface<message> {
 	[[nodiscard]] bool has_poll() const noexcept;
 };
 
+/**
+ * @brief Represents a discord webhook
+ */
+class DPP_EXPORT message_pin : public json_interface<message_pin> {
+protected:
+	friend struct json_interface<message_pin>;
+
+	/**
+	 * @brief Fill in object from json data
+	 *
+	 * @param j JSON data
+	 * @return message_pin& Reference to self
+	 */
+	message_pin& fill_from_json_impl(nlohmann::json* j);
+
+	/** Build JSON from this object.
+	 * @return The JSON text of the message
+	 */
+	virtual json to_json() const;
+
+public:
+
+	message_pin();
+
+	message_pin(time_t _pinned_at, const message& _pinned_message);
+
+	/*
+	 * @brief Construct a new message_pin object
+	 * @param msg_pin message_pin to copy
+	 */
+	message_pin(const message_pin& msg_pin) = default;
+
+	/*
+	 * @brief Construct a new message_pin object
+	 * @param msg_pin message_pin to move
+	 */
+	message_pin(message_pin&& msg_pin) = default;
+
+	/**
+	 * @brief Destroy the message_pin object
+	 */
+	~message_pin() = default;
+
+	/**
+	 * @brief Copy a message_pin object
+	 *
+	 * @param msg_pin message_pin to copy
+	 * @return message_pin& Reference to self
+	 */
+	message_pin &operator=(const message_pin& msg_pin) = default;
+
+	/**
+	 * @brief Move a message_pin object
+	 *
+	 * @param msg_pin message_pin to move
+	 * @return message_pin& Reference to self
+	 */
+	message_pin &operator=(message_pin&& msg_pin) = default;
+
+public:
+
+	/**
+	 * @brief The time the message was pinned.
+	 */
+	time_t pinned_at;
+
+	/**
+	 * @brief The pinned message.
+	 */
+	message pinned_message;
+};
+
 /**
  * @brief A group of messages
  */
 typedef std::unordered_map<snowflake, message> message_map;
 
+/**
+ * @brief A group of pinned messages
+ */
+typedef std::unordered_map<snowflake, message_pin> message_pin_map;
+
 /**
  * @brief A group of stickers
  */

include/dpp/restresults.h

@@ -135,6 +135,7 @@ typedef std::variant<
 		confirmation,
 		message,
 		message_map,
+		message_pin_map,
 		user,
 		user_identified,
 		user_map,

src/dpp/cluster/message.cpp

@@ -153,7 +153,7 @@ void cluster::message_get_reactions(snowflake message_id, snowflake channel_id,
 
 
 void cluster::message_pin(snowflake channel_id, snowflake message_id, command_completion_event_t callback) {
-	rest_request<confirmation>(this, API_PATH "/channels", std::to_string(channel_id), "/messages/pins/" + std::to_string(message_id), m_put, "", std::move(callback));
+	rest_request<confirmation>(this, API_PATH "/channels", std::to_string(channel_id), "messages/pins/" + std::to_string(message_id), m_put, "", std::move(callback));
 }
 
 void cluster::messages_get(snowflake channel_id, snowflake around, snowflake before, snowflake after, uint64_t limit, command_completion_event_t callback) {
@@ -168,7 +168,7 @@ void cluster::messages_get(snowflake channel_id, snowflake around, snowflake bef
 
 
 void cluster::message_unpin(snowflake channel_id, snowflake message_id, command_completion_event_t callback) {
-	rest_request<confirmation>(this, API_PATH "/channels", std::to_string(channel_id), "/messages/pins/" + std::to_string(message_id), m_delete, "", std::move(callback));
+	rest_request<confirmation>(this, API_PATH "/channels", std::to_string(channel_id), "messages/pins/" + std::to_string(message_id), m_delete, "", std::move(callback));
 }
 
 
@@ -205,7 +205,26 @@ void cluster::poll_end(snowflake message_id, snowflake channel_id, command_compl
 
 
 void cluster::channel_pins_get(snowflake channel_id, command_completion_event_t callback) {
-	rest_request_list<message>(this, API_PATH "/channels", std::to_string(channel_id), "/messages/pins", m_get, "", std::move(callback));
+	/* Have to do it like this because this now returns more than just a list.
+	 * It's now a structure containing the pinned items in "items" and then a boolean called "has_more".
+	 */
+	this->post_rest_multipart(API_PATH "/channels", std::to_string(channel_id), "messages/pins", m_get, "", [this, callback](json &j, const http_request_completion_t& http) {
+		std::unordered_map<snowflake, dpp::message_pin> list;
+
+		confirmation_callback_t e(this, confirmation(), http);
+		if (!e.is_error()) {
+			for (auto & curr_item : j["items"]) {
+				dpp::message_pin pinned_msg{};
+				pinned_msg.pinned_at = ts_not_null(&curr_item, "pinned_at");
+				pinned_msg.pinned_message = message().fill_from_json(&curr_item["message"]);
+
+				list[pinned_msg.pinned_message.id] = pinned_msg;
+			}
+		}
+		if (callback) {
+			callback(confirmation_callback_t(this, list, http));
+		}
+	});
 }
 
 }

src/dpp/message.cpp

@@ -1783,5 +1783,27 @@ sticker& sticker::set_file_content(std::string_view fc) {
 	return *this;
 }
 
+message_pin::message_pin() : pinned_at(-1), pinned_message() {
+}
+
+message_pin::message_pin(time_t _pinned_at, const message& _pinned_message) : pinned_at(_pinned_at), pinned_message(_pinned_message) {
+}
+
+
+message_pin& message_pin::fill_from_json_impl(nlohmann::json *j) {
+	this->pinned_at = ts_not_null(j, "pinned_at");
+	json& j_message = (*j)["message"];
+	this->pinned_message = message().fill_from_json(&j_message);
+
+	return *this;
+}
 
+json message_pin::to_json() const {
+	json j;
+	j["pinned_at"] = pinned_at;
+	j["message"] = pinned_message.to_json();
+	return j;
 }
+
+
+}// namespace dpp