11 files changed, 126 insertions, 17 deletions
diff --git a/Swiften/Queries/GenericRequest.h b/Swiften/Queries/GenericRequest.h
index b9cc6fc..b1b7f8a 100644
--- a/Swiften/Queries/GenericRequest.h
+++ b/Swiften/Queries/GenericRequest.h
@@ -8,5 +8,4 @@
 
 #include <Swiften/Base/boost_bsignals.h>
-
 #include <Swiften/Queries/Request.h>
 
@@ -24,4 +23,7 @@ namespace Swift {
 	class GenericRequest : public Request {
 		public:
+			typedef boost::shared_ptr<GenericRequest<PAYLOAD_TYPE> > ref;
+
+		public:
 			/**
 			 * Create a request suitable for client use.
@@ -63,5 +65,5 @@ namespace Swift {
 			}
 
-		protected:
+		public:
 			boost::shared_ptr<PAYLOAD_TYPE> getPayloadGeneric() const {
 				return boost::dynamic_pointer_cast<PAYLOAD_TYPE>(getPayload());
diff --git a/Swiften/Queries/GetResponder.h b/Swiften/Queries/GetResponder.h
index bca507a..213a52f 100644
--- a/Swiften/Queries/GetResponder.h
+++ b/Swiften/Queries/GetResponder.h
@@ -7,9 +7,10 @@
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Queries/Responder.h>
 
 namespace Swift {
 	template<typename T>
-	class GetResponder : public Responder<T> {
+	class SWIFTEN_API GetResponder : public Responder<T> {
 		public:
 			GetResponder(IQRouter* router) : Responder<T>(router) {}
diff --git a/Swiften/Queries/IQChannel.h b/Swiften/Queries/IQChannel.h
index 71a6dd4..c9da593 100644
--- a/Swiften/Queries/IQChannel.h
+++ b/Swiften/Queries/IQChannel.h
@@ -11,8 +11,9 @@
 
 #include <string>
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/IQ.h>
 
 namespace Swift {
-	class IQChannel {
+	class SWIFTEN_API IQChannel {
 		public:
 			virtual ~IQChannel();
diff --git a/Swiften/Queries/IQHandler.h b/Swiften/Queries/IQHandler.h
index c9af5ea..19e16a7 100644
--- a/Swiften/Queries/IQHandler.h
+++ b/Swiften/Queries/IQHandler.h
@@ -9,4 +9,5 @@
 #include <boost/shared_ptr.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/IQ.h>
 
@@ -14,5 +15,5 @@ namespace Swift {
 	class IQRouter;
 
-	class IQHandler {
+	class SWIFTEN_API IQHandler {
 		public:
 			virtual ~IQHandler();
diff --git a/Swiften/Queries/IQRouter.h b/Swiften/Queries/IQRouter.h
index de2822b..0655035 100644
--- a/Swiften/Queries/IQRouter.h
+++ b/Swiften/Queries/IQRouter.h
@@ -9,6 +9,7 @@
 #include <boost/shared_ptr.hpp>
 #include <vector>
-
 #include <string>
+
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/IQ.h>
 
@@ -17,5 +18,5 @@ namespace Swift {
 	class IQHandler;
 
-	class IQRouter {
+	class SWIFTEN_API IQRouter {
 		public:
 			IQRouter(IQChannel* channel);
diff --git a/Swiften/Queries/PubSubRequest.h b/Swiften/Queries/PubSubRequest.h
new file mode 100644
index 0000000..55bf9e3
--- /dev/null
+++ b/Swiften/Queries/PubSubRequest.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2013 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <boost/smart_ptr/make_shared.hpp>
+
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Queries/Request.h>
+#include <Swiften/Elements/ContainerPayload.h>
+#include <Swiften/PubSub/PubSubUtil.h>
+#include <Swiften/Elements/PubSub.h>
+#include <Swiften/Elements/PubSubOwnerPubSub.h>
+#include <Swiften/Elements/PubSubCreate.h>
+#include <Swiften/Elements/PubSubSubscribe.h>
+#include <Swiften/Elements/PubSubAffiliations.h>
+#include <Swiften/Elements/PubSubDefault.h>
+#include <Swiften/Elements/PubSubItems.h>
+#include <Swiften/Elements/PubSubPublish.h>
+#include <Swiften/Elements/PubSubRetract.h>
+#include <Swiften/Elements/PubSubSubscription.h>
+#include <Swiften/Elements/PubSubSubscriptions.h>
+#include <Swiften/Elements/PubSubUnsubscribe.h>
+#include <Swiften/Elements/PubSubOwnerAffiliations.h>
+#include <Swiften/Elements/PubSubOwnerConfigure.h>
+#include <Swiften/Elements/PubSubOwnerDefault.h>
+#include <Swiften/Elements/PubSubOwnerDelete.h>
+#include <Swiften/Elements/PubSubOwnerPurge.h>
+#include <Swiften/Elements/PubSubOwnerSubscriptions.h>
+
+namespace Swift {
+	namespace Detail {
+		template<typename T> 
+		struct PubSubPayloadTraits;
+
+#define SWIFTEN_PUBSUB_DECLARE_PAYLOAD_TRAITS(PAYLOAD, CONTAINER, RESPONSE) \
+		template<> struct PubSubPayloadTraits< PAYLOAD > { \
+			typedef CONTAINER ContainerType; \
+			typedef RESPONSE ResponseType; \
+		};
+
+		SWIFTEN_PUBSUB_FOREACH_PUBSUB_PAYLOAD_TYPE(
+				SWIFTEN_PUBSUB_DECLARE_PAYLOAD_TRAITS)
+	}
+
+	template<typename T>
+	class PubSubRequest : public Request {
+			typedef typename Detail::PubSubPayloadTraits<T>::ContainerType ContainerType;
+			typedef typename Detail::PubSubPayloadTraits<T>::ResponseType ResponseType;
+
+		public:
+			PubSubRequest(
+					IQ::Type type, 
+					const JID& receiver, 
+					boost::shared_ptr<T> payload, 
+					IQRouter* router) :
+						Request(type, receiver, router) {
+				boost::shared_ptr<ContainerType> wrapper = boost::make_shared<ContainerType>();
+				wrapper->setPayload(payload);
+				setPayload(wrapper);
+			}
+
+			PubSubRequest(
+					IQ::Type type,
+					const JID& sender,
+					const JID& receiver,
+					boost::shared_ptr<T> payload, 
+					IQRouter* router) :
+						Request(type, sender, receiver, router) {
+				boost::shared_ptr<ContainerType> wrapper = boost::make_shared<ContainerType>();
+				wrapper->setPayload(payload);
+				setPayload(wrapper);
+			}
+
+			virtual void handleResponse(
+					boost::shared_ptr<Payload> payload, ErrorPayload::ref error) {
+				boost::shared_ptr<ResponseType> result;
+				if (boost::shared_ptr<ContainerType> container = boost::dynamic_pointer_cast<ContainerType>(payload)) {
+					result = boost::dynamic_pointer_cast<ResponseType>(container->getPayload());
+				}
+				onResponse(result, error);
+			}
+
+		public:
+			boost::signal<void (boost::shared_ptr<ResponseType>, ErrorPayload::ref)> onResponse;
+	};
+}
diff --git a/Swiften/Queries/RawRequest.h b/Swiften/Queries/RawRequest.h
index e5b3a1d..efe0890 100644
--- a/Swiften/Queries/RawRequest.h
+++ b/Swiften/Queries/RawRequest.h
@@ -10,4 +10,5 @@
 #include <typeinfo>
 
+#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Queries/Request.h>
 #include <Swiften/Elements/RawXMLPayload.h>
@@ -34,5 +35,5 @@ namespace Swift {
 			virtual void handleResponse(boost::shared_ptr<Payload> payload, ErrorPayload::ref error) {
 				if (error) {
-					onResponse(ErrorSerializer().serializePayload(error));
+					onResponse(ErrorSerializer(&serializers).serializePayload(error));
 				}
 				else {
diff --git a/Swiften/Queries/Request.cpp b/Swiften/Queries/Request.cpp
index 422f36c..40c8f60 100644
--- a/Swiften/Queries/Request.cpp
+++ b/Swiften/Queries/Request.cpp
@@ -24,5 +24,5 @@ Request::Request(IQ::Type type, const JID& sender, const JID& receiver, IQRouter
 }
 
-void Request::send() {
+std::string Request::send() {
 	assert(payload_);
 	assert(!sent_);
@@ -44,4 +44,5 @@ void Request::send() {
 
 	router_->sendIQ(iq);
+	return id_;
 }
 
diff --git a/Swiften/Queries/Request.h b/Swiften/Queries/Request.h
index 668ed04..f17cc11 100644
--- a/Swiften/Queries/Request.h
+++ b/Swiften/Queries/Request.h
@@ -10,6 +10,7 @@
 #include <boost/optional.hpp>
 #include <boost/enable_shared_from_this.hpp>
-
 #include <string>
+
+#include <Swiften/Base/API.h>
 #include <Swiften/Queries/IQHandler.h>
 #include <Swiften/Elements/IQ.h>
@@ -22,7 +23,7 @@ namespace Swift {
 	 * An IQ get/set request query.
 	 */
-	class Request : public IQHandler, public boost::enable_shared_from_this<Request> {
+	class SWIFTEN_API Request : public IQHandler, public boost::enable_shared_from_this<Request> {
 		public:
-			void send();
+			std::string send();
 
 			const JID& getReceiver() const {
@@ -30,4 +31,13 @@ namespace Swift {
 			}
 
+			/**
+			 * Returns the ID of this request.
+			 * This will only be set after send() is called.
+			 */
+			const std::string& getID() const {
+				return id_;
+			}
+
+
 		protected:
 			/**
diff --git a/Swiften/Queries/Responder.h b/Swiften/Queries/Responder.h
index 2ba9c24..edcaa52 100644
--- a/Swiften/Queries/Responder.h
+++ b/Swiften/Queries/Responder.h
@@ -84,6 +84,6 @@ namespace Swift {
 			 * Convenience function for responding with an error.
 			 */
-			void sendError(const JID& to, const std::string& id, ErrorPayload::Condition condition, ErrorPayload::Type type) {
-				router_->sendIQ(IQ::createError(to, id, condition, type));
+			void sendError(const JID& to, const std::string& id, ErrorPayload::Condition condition, ErrorPayload::Type type, Payload::ref payload = Payload::ref()) {
+				router_->sendIQ(IQ::createError(to, id, condition, type, payload));
 			}
 
@@ -91,6 +91,6 @@ namespace Swift {
 			 * Convenience function for responding with an error from a specific from address.
 			 */
-			void sendError(const JID& to, const JID& from, const std::string& id, ErrorPayload::Condition condition, ErrorPayload::Type type) {
-				router_->sendIQ(IQ::createError(to, from, id, condition, type));
+			void sendError(const JID& to, const JID& from, const std::string& id, ErrorPayload::Condition condition, ErrorPayload::Type type, Payload::ref payload = Payload::ref()) {
+				router_->sendIQ(IQ::createError(to, from, id, condition, type, payload));
 			}
 
diff --git a/Swiften/Queries/Responders/SoftwareVersionResponder.h b/Swiften/Queries/Responders/SoftwareVersionResponder.h
index a2929df..4957c0f 100644
--- a/Swiften/Queries/Responders/SoftwareVersionResponder.h
+++ b/Swiften/Queries/Responders/SoftwareVersionResponder.h
@@ -7,4 +7,5 @@
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Queries/GetResponder.h>
 #include <Swiften/Elements/SoftwareVersion.h>
@@ -13,5 +14,5 @@ namespace Swift {
 	class IQRouter;
 
-	class SoftwareVersionResponder : public GetResponder<SoftwareVersion> {
+	class SWIFTEN_API SoftwareVersionResponder : public GetResponder<SoftwareVersion> {
 		public:
 			SoftwareVersionResponder(IQRouter* router);